Run cargo fmt

README.md

@@ -22,11 +22,9 @@ pub struct MyStruct {
 }
 
 #[derive(JsonSchema)]
-pub enum MyEnum {    
+pub enum MyEnum {
     StringNewType(String),
-    StructVariant {
+    StructVariant { floats: Vec<f32> },
-        floats: Vec<f32>,
-    }
 }
 
 fn main() {
@@ -131,11 +129,9 @@ pub struct MyStruct {
 
 #[derive(Deserialize, Serialize, JsonSchema)]
 #[serde(untagged)]
-pub enum MyEnum {    
+pub enum MyEnum {
     StringNewType(String),
-    StructVariant {
+    StructVariant { floats: Vec<f32> },
-        floats: Vec<f32>,
-    }
 }
 
 fn main() {

docs/_includes/examples/custom_serialization.rs

@@ -38,7 +38,9 @@ mod as_string {
         D: Deserializer<'de>,
     {
         let string = String::deserialize(deserializer)?;
-        string.parse().map_err(|_| D::Error::custom("Input was not valid"))
+        string
+            .parse()
+            .map_err(|_| D::Error::custom("Input was not valid"))
     }
 }
 

docs/_includes/examples/doc_comments.rs

@@ -16,7 +16,7 @@ pub struct MyStruct {
 
 /// # My Amazing Enum
 #[derive(JsonSchema)]
-pub enum MyEnum {    
+pub enum MyEnum {
     /// A wrapper around a `String`
     StringNewType(String),
     /// A struct-like enum variant which contains
@@ -24,7 +24,7 @@ pub enum MyEnum {
     StructVariant {
         /// The floats themselves
         floats: Vec<f32>,
-    }
+    },
 }
 
 fn main() {

docs/_includes/examples/main.rs

@@ -8,11 +8,9 @@ pub struct MyStruct {
 }
 
 #[derive(JsonSchema)]
-pub enum MyEnum {    
+pub enum MyEnum {
     StringNewType(String),
-    StructVariant {
+    StructVariant { floats: Vec<f32> },
-        floats: Vec<f32>,
-    }
 }
 
 fn main() {

docs/_includes/examples/remote_derive.rs

@@ -1,6 +1,6 @@
 // Pretend that this is somebody else's crate, not a module.
 mod other_crate {
-    // Neither Schemars nor the other crate provides a JsonSchema impl  
+    // Neither Schemars nor the other crate provides a JsonSchema impl
     // for this struct.
     pub struct Duration {
         pub secs: i64,

docs/_includes/examples/schemars_attrs.rs

@@ -14,11 +14,9 @@ pub struct MyStruct {
 
 #[derive(Deserialize, Serialize, JsonSchema)]
 #[schemars(untagged)]
-pub enum MyEnum {    
+pub enum MyEnum {
     StringNewType(String),
-    StructVariant {
+    StructVariant { floats: Vec<f32> },
-        floats: Vec<f32>,
-    }
 }
 
 fn main() {

docs/_includes/examples/serde_attrs.rs

@@ -13,11 +13,9 @@ pub struct MyStruct {
 
 #[derive(Deserialize, Serialize, JsonSchema)]
 #[serde(untagged)]
-pub enum MyEnum {    
+pub enum MyEnum {
     StringNewType(String),
-    StructVariant {
+    StructVariant { floats: Vec<f32> },
-        floats: Vec<f32>,
-    }
 }
 
 fn main() {

schemars/examples/custom_serialization.rs

@@ -38,7 +38,9 @@ mod as_string {
         D: Deserializer<'de>,
     {
         let string = String::deserialize(deserializer)?;
-        string.parse().map_err(|_| D::Error::custom("Input was not valid"))
+        string
+            .parse()
+            .map_err(|_| D::Error::custom("Input was not valid"))
     }
 }
 

schemars/examples/doc_comments.rs

@@ -16,7 +16,7 @@ pub struct MyStruct {
 
 /// # My Amazing Enum
 #[derive(JsonSchema)]
-pub enum MyEnum {    
+pub enum MyEnum {
     /// A wrapper around a `String`
     StringNewType(String),
     /// A struct-like enum variant which contains
@@ -24,7 +24,7 @@ pub enum MyEnum {
     StructVariant {
         /// The floats themselves
         floats: Vec<f32>,
-    }
+    },
 }
 
 fn main() {

schemars/examples/main.rs

@@ -8,11 +8,9 @@ pub struct MyStruct {
 }
 
 #[derive(JsonSchema)]
-pub enum MyEnum {    
+pub enum MyEnum {
     StringNewType(String),
-    StructVariant {
+    StructVariant { floats: Vec<f32> },
-        floats: Vec<f32>,
-    }
 }
 
 fn main() {

schemars/examples/remote_derive.rs

@@ -1,6 +1,6 @@
 // Pretend that this is somebody else's crate, not a module.
 mod other_crate {
-    // Neither Schemars nor the other crate provides a JsonSchema impl  
+    // Neither Schemars nor the other crate provides a JsonSchema impl
     // for this struct.
     pub struct Duration {
         pub secs: i64,

schemars/examples/schemars_attrs.rs

@@ -14,11 +14,9 @@ pub struct MyStruct {
 
 #[derive(Deserialize, Serialize, JsonSchema)]
 #[schemars(untagged)]
-pub enum MyEnum {    
+pub enum MyEnum {
     StringNewType(String),
-    StructVariant {
+    StructVariant { floats: Vec<f32> },
-        floats: Vec<f32>,
-    }
 }
 
 fn main() {

schemars/examples/serde_attrs.rs

@@ -13,11 +13,9 @@ pub struct MyStruct {
 
 #[derive(Deserialize, Serialize, JsonSchema)]
 #[serde(untagged)]
-pub enum MyEnum {    
+pub enum MyEnum {
     StringNewType(String),
-    StructVariant {
+    StructVariant { floats: Vec<f32> },
-        floats: Vec<f32>,
-    }
 }
 
 fn main() {

schemars/src/gen.rs

@@ -192,7 +192,7 @@ impl SchemaGenerator {
     /// assert_eq!(extensible_schema, extensible_schema2);
     /// ```
     pub fn make_extensible(&self, schema: SchemaObject) -> SchemaObject {
-        if schema.is_ref() && !self.settings().allow_ref_siblings{
+        if schema.is_ref() && !self.settings().allow_ref_siblings {
             SchemaObject {
                 subschemas: Some(Box::new(SubschemaValidation {
                     all_of: Some(vec![schema.into()]),

schemars/src/json_schema_impls/arrayvec.rs

@@ -15,7 +15,11 @@ where
     no_ref_schema!();
 
     fn schema_name() -> String {
-        format!("Array_up_to_size_{}_of_{}", A::CAPACITY, A::Item::schema_name())
+        format!(
+            "Array_up_to_size_{}_of_{}",
+            A::CAPACITY,
+            A::Item::schema_name()
+        )
     }
 
     fn json_schema(gen: &mut SchemaGenerator) -> Schema {

schemars/src/json_schema_impls/maps.rs

@@ -69,8 +69,7 @@ mod tests {
 
     #[test]
     fn schema_for_map_any_value_no_bool_schema() {
-        let settings =
+        let settings = SchemaSettings::default().with(|s| s.bool_schemas = BoolSchemas::Disabled);
-            SchemaSettings::default().with(|s| s.bool_schemas = BoolSchemas::Disabled);
         let schema = custom_schema_object_for::<BTreeMap<String, serde_json::Value>>(settings);
         assert_eq!(
             schema.instance_type,

schemars/src/json_schema_impls/mod.rs

@@ -32,22 +32,18 @@ macro_rules! forward_impl {
 }
 
 mod array;
+#[cfg(feature = "arrayvec")]
+mod arrayvec;
 #[cfg(std_atomic)]
 mod atomic;
 #[cfg(feature = "chrono")]
 mod chrono;
-#[cfg(feature = "indexmap")]
+mod core;
-mod indexmap;
 #[cfg(feature = "either")]
 mod either;
-#[cfg(feature = "uuid")]
-mod uuid;
-#[cfg(feature = "smallvec")]
-mod smallvec;
-#[cfg(feature = "arrayvec")]
-mod arrayvec;
-mod core;
 mod ffi;
+#[cfg(feature = "indexmap")]
+mod indexmap;
 mod maps;
 #[cfg(num_nonzero_signed)]
 mod nonzero_signed;
@@ -55,6 +51,10 @@ mod nonzero_unsigned;
 mod primitives;
 mod sequences;
 mod serdejson;
+#[cfg(feature = "smallvec")]
+mod smallvec;
 mod time;
 mod tuple;
+#[cfg(feature = "uuid")]
+mod uuid;
 mod wrapper;

schemars/src/lib.rs

@@ -16,11 +16,9 @@ pub struct MyStruct {
 }
 
 #[derive(JsonSchema)]
-pub enum MyEnum {    
+pub enum MyEnum {
     StringNewType(String),
-    StructVariant {
+    StructVariant { floats: Vec<f32> },
-        floats: Vec<f32>,
-    }
 }
 
 fn main() {
@@ -125,11 +123,9 @@ pub struct MyStruct {
 
 #[derive(Deserialize, Serialize, JsonSchema)]
 #[serde(untagged)]
-pub enum MyEnum {    
+pub enum MyEnum {
     StringNewType(String),
-    StructVariant {
+    StructVariant { floats: Vec<f32> },
-        floats: Vec<f32>,
-    }
 }
 
 fn main() {

schemars/tests/arrayvec.rs

@@ -4,10 +4,10 @@ use util::*;
 
 #[test]
 fn arrayvec() -> TestResult {
-    test_default_generated_schema::<ArrayVec::<[i32; 16]>>("arrayvec")
+    test_default_generated_schema::<ArrayVec<[i32; 16]>>("arrayvec")
 }
 
 #[test]
 fn arrayvec_string() -> TestResult {
-    test_default_generated_schema::<ArrayString::<[u8; 16]>>("arrayvec_string")
+    test_default_generated_schema::<ArrayString<[u8; 16]>>("arrayvec_string")
 }

schemars/tests/remote_derive_generic.rs

@@ -1,9 +1,9 @@
 mod util;
 
 use schemars::JsonSchema;
-use serde::{Serialize};
+use serde::Serialize;
-use util::*;
 use std::collections::{HashMap, HashSet};
+use util::*;
 
 enum Or<A, B> {
     #[allow(dead_code)]

schemars/tests/uuid.rs

@@ -1,6 +1,6 @@
 mod util;
-use uuid::Uuid;
 use util::*;
+use uuid::Uuid;
 
 #[test]
 fn uuid() -> TestResult {

schemars_derive/src/lib.rs

@@ -53,7 +53,7 @@ pub fn derive_json_schema(input: proc_macro::TokenStream) -> proc_macro::TokenSt
             }
         }
     }
-    
+
     let schema_name = if type_params.is_empty() {
         quote! {
             #schema_base_name.to_owned()
@@ -135,7 +135,7 @@ fn schema_for_enum(variants: &[Variant], cattrs: &serde_attr::Container) -> Toke
 }
 
 fn schema_for_external_tagged_enum<'a>(
-    variants: impl Iterator<Item = &'a Variant<'a>>
+    variants: impl Iterator<Item = &'a Variant<'a>>,
 ) -> TokenStream {
     let (unit_variants, complex_variants): (Vec<_>, Vec<_>) =
         variants.partition(|v| is_unit_variant(v));
@@ -241,9 +241,7 @@ fn schema_for_internal_tagged_enum<'a>(
     })
 }
 
-fn schema_for_untagged_enum<'a>(
+fn schema_for_untagged_enum<'a>(variants: impl Iterator<Item = &'a Variant<'a>>) -> TokenStream {
-    variants: impl Iterator<Item = &'a Variant<'a>>
-) -> TokenStream {
     let schemas = variants.map(|variant| {
         let schema_expr = schema_for_untagged_enum_variant(variant);
         set_metadata_on_schema_from_docs(schema_expr, &variant.original.attrs)
@@ -257,9 +255,7 @@ fn schema_for_untagged_enum<'a>(
     })
 }
 
-fn schema_for_untagged_enum_variant(
+fn schema_for_untagged_enum_variant(variant: &Variant) -> TokenStream {
-    variant: &Variant
-) -> TokenStream {
     match variant.style {
         Style::Unit => schema_for_unit_struct(),
         Style::Newtype => schema_for_newtype_struct(&variant.fields[0]),