Merge #234

234: Remove redundant semicolons r=jonasbb a=jonasbb Fixes nightly clippy lint Co-authored-by: Jonas Bushart <jonas@bushart.org>
jonasbb · Jan 4, 2021 · 99e451f · 99e451f
2 parents a6228ea + 271ee27
commit 99e451f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/src/de/impls.rs b/src/de/impls.rs
@@ -290,7 +290,7 @@ macro_rules! tuple_impl {
 
                         Ok(($($t.into_inner(),)+))
                     }
-                };
+                }
 
                 deserializer.deserialize_tuple(
                     $len,
@@ -355,7 +355,7 @@ macro_rules! array_impl {
                             },
                         )*])
                     }
-                };
+                }
 
                 deserializer.deserialize_tuple(
                     $len,
@@ -650,7 +650,7 @@ where
             // like integer or string, the deserializer sees a list or map.
             Error(IgnoredAny),
             _JustAMarkerForTheLifetime(PhantomData<&'a u32>),
-        };
+        }
 
         Ok(match Deserialize::deserialize(deserializer) {
             Ok(GoodOrError::<T, TAs>::Good(res)) => res.into_inner(),

diff --git a/src/rust.rs b/src/rust.rs
@@ -566,7 +566,7 @@ pub mod sets_duplicate_value_is_error {
         struct SeqVisitor<T, V> {
             marker: PhantomData<T>,
             set_item_type: PhantomData<V>,
-        };
+        }
 
         impl<'de, T, V> Visitor<'de> for SeqVisitor<T, V>
         where
@@ -670,7 +670,7 @@ pub mod maps_duplicate_key_is_error {
             marker: PhantomData<T>,
             map_key_type: PhantomData<K>,
             map_value_type: PhantomData<V>,
-        };
+        }
 
         impl<'de, T, K, V> Visitor<'de> for MapVisitor<T, K, V>
         where
@@ -739,7 +739,7 @@ pub mod sets_first_value_wins {
         struct SeqVisitor<T, V> {
             marker: PhantomData<T>,
             set_item_type: PhantomData<V>,
-        };
+        }
 
         impl<'de, T, V> Visitor<'de> for SeqVisitor<T, V>
         where
@@ -808,7 +808,7 @@ pub mod sets_last_value_wins {
         struct SeqVisitor<T, V> {
             marker: PhantomData<T>,
             set_item_type: PhantomData<V>,
-        };
+        }
 
         impl<'de, T, V> Visitor<'de> for SeqVisitor<T, V>
         where
@@ -911,7 +911,7 @@ pub mod maps_first_key_wins {
             marker: PhantomData<T>,
             map_key_type: PhantomData<K>,
             map_value_type: PhantomData<V>,
-        };
+        }
 
         impl<'de, T, K, V> Visitor<'de> for MapVisitor<T, K, V>
         where
@@ -1714,7 +1714,7 @@ pub mod default_on_error {
             // This is necessary to make this work, when instead of having a direct value
             // like integer or string, the deserializer sees a list or map.
             Error(serde::de::IgnoredAny),
-        };
+        }
 
         Ok(match Deserialize::deserialize(deserializer) {
             Ok(GoodOrError::Good(res)) => res,

diff --git a/tests/json.rs b/tests/json.rs
@@ -12,7 +12,7 @@ fn test_nested_json() {
     struct Struct {
         #[serde_as(as = "JsonString")]
         value: Nested,
-    };
+    }
 
     #[serde_as]
     #[derive(Debug, Serialize, Deserialize, PartialEq)]

diff --git a/tests/serde_as.rs b/tests/serde_as.rs
@@ -48,7 +48,7 @@ fn test_option() {
     struct Struct {
         #[serde_as(as = "_")]
         value: Option<u32>,
-    };
+    }
     check_error_deserialization::<Struct>(
         r#"{}"#,
         expect![[r#"missing field `value` at line 1 column 2"#]],
@@ -535,7 +535,7 @@ fn test_default_on_error() {
     struct Struct2 {
         #[serde_as(as = "DefaultOnError<Vec<DisplayFromStr>>")]
         value: Vec<u32>,
-    };
+    }
     check_deserialization(Struct2 { value: vec![] }, r#"{"value":}"#);
 
     #[serde_as]