diff --git a/README.md b/README.md index a7946c0..995b8df 100644 --- a/README.md +++ b/README.md @@ -27,10 +27,8 @@ pub enum MyEnum { StructVariant { floats: Vec }, } -fn main() { - let schema = schema_for!(MyStruct); - println!("{}", serde_json::to_string_pretty(&schema).unwrap()); -} +let schema = schema_for!(MyStruct); +println!("{}", serde_json::to_string_pretty(&schema).unwrap()); ```
@@ -133,10 +131,8 @@ pub enum MyEnum { StructVariant { floats: Vec }, } -fn main() { - let schema = schema_for!(MyStruct); - println!("{}", serde_json::to_string_pretty(&schema).unwrap()); -} +let schema = schema_for!(MyStruct); +println!("{}", serde_json::to_string_pretty(&schema).unwrap()); ```
diff --git a/clippy.toml b/clippy.toml new file mode 100644 index 0000000..0a54853 --- /dev/null +++ b/clippy.toml @@ -0,0 +1 @@ +msrv = "1.36.0" diff --git a/schemars/src/gen.rs b/schemars/src/gen.rs index 5ef54b5..ba293e0 100644 --- a/schemars/src/gen.rs +++ b/schemars/src/gen.rs @@ -335,8 +335,8 @@ impl SchemaGenerator { #[doc(hidden)] pub fn apply_metadata(&self, schema: Schema, metadata: Option) -> Schema { match metadata { - None => return schema, - Some(ref metadata) if *metadata == Metadata::default() => return schema, + None => schema, + Some(ref metadata) if *metadata == Metadata::default() => schema, Some(metadata) => { let mut schema_obj = schema.into_object(); schema_obj.metadata = Some(Box::new(metadata)).merge(schema_obj.metadata); diff --git a/schemars/src/lib.rs b/schemars/src/lib.rs index bb189bb..907572b 100644 --- a/schemars/src/lib.rs +++ b/schemars/src/lib.rs @@ -22,10 +22,8 @@ pub enum MyEnum { StructVariant { floats: Vec }, } -fn main() { - let schema = schema_for!(MyStruct); - println!("{}", serde_json::to_string_pretty(&schema).unwrap()); -} +let schema = schema_for!(MyStruct); +println!("{}", serde_json::to_string_pretty(&schema).unwrap()); ```
@@ -128,10 +126,8 @@ pub enum MyEnum { StructVariant { floats: Vec }, } -fn main() { - let schema = schema_for!(MyStruct); - println!("{}", serde_json::to_string_pretty(&schema).unwrap()); -} +let schema = schema_for!(MyStruct); +println!("{}", serde_json::to_string_pretty(&schema).unwrap()); ```
diff --git a/schemars_derive/src/attr/doc.rs b/schemars_derive/src/attr/doc.rs index a1557ba..0827dc0 100644 --- a/schemars_derive/src/attr/doc.rs +++ b/schemars_derive/src/attr/doc.rs @@ -52,7 +52,7 @@ fn get_doc(attrs: &[Attribute]) -> Option { .iter() .flat_map(|a| a.split('\n')) .map(str::trim) - .skip_while(|s| *s == "") + .skip_while(|s| s.is_empty()) .collect::>(); if let Some(&"") = lines.last() { @@ -61,7 +61,7 @@ fn get_doc(attrs: &[Attribute]) -> Option { // Added for backward-compatibility, but perhaps we shouldn't do this // https://github.com/rust-lang/rust/issues/32088 - if lines.iter().all(|l| l.starts_with("*")) { + if lines.iter().all(|l| l.starts_with('*')) { for line in lines.iter_mut() { *line = line[1..].trim() } diff --git a/schemars_derive/src/metadata.rs b/schemars_derive/src/metadata.rs index 3f616ee..6bc415d 100644 --- a/schemars_derive/src/metadata.rs +++ b/schemars_derive/src/metadata.rs @@ -105,7 +105,7 @@ impl<'a> SchemaMetadata<'a> { } } -fn none_if_empty<'a>(s: &'a String) -> Option<&'a str> { +fn none_if_empty(s: &String) -> Option<&str> { if s.is_empty() { None } else { diff --git a/schemars_derive/src/schema_exprs.rs b/schemars_derive/src/schema_exprs.rs index 6dc532d..2ec3497 100644 --- a/schemars_derive/src/schema_exprs.rs +++ b/schemars_derive/src/schema_exprs.rs @@ -98,7 +98,7 @@ fn expr_for_external_tagged_enum<'a>( } let mut schemas = Vec::new(); - if unit_variants.len() > 0 { + if !unit_variants.is_empty() { schemas.push(unit_schema); }