Clippy clean

derive/src/args.rs

@@ -590,31 +590,31 @@ pub struct Description {
 
 #[derive(Debug)]
 pub enum NewTypeName {
-    UseNewName(String),
-    UseRustName,
-    UseOriginalName,
+    New(String),
+    Rust,
+    Original,
 }
 
 impl Default for NewTypeName {
     fn default() -> Self {
-        Self::UseOriginalName
+        Self::Original
     }
 }
 
 impl FromMeta for NewTypeName {
     fn from_word() -> darling::Result<Self> {
-        Ok(Self::UseRustName)
+        Ok(Self::Rust)
     }
 
     fn from_string(value: &str) -> darling::Result<Self> {
-        Ok(Self::UseNewName(value.to_string()))
+        Ok(Self::New(value.to_string()))
     }
 
     fn from_bool(value: bool) -> darling::Result<Self> {
         if value {
-            Ok(Self::UseRustName)
+            Ok(Self::Rust)
         } else {
-            Ok(Self::UseOriginalName)
+            Ok(Self::Original)
         }
     }
 }

derive/src/complex_object.rs

@@ -102,7 +102,7 @@ pub fn generate(
                     .as_ref()
                     .map(|s| quote! {::std::option::Option::Some(#s)})
                     .unwrap_or_else(|| quote! {::std::option::Option::None});
-                let default = generate_default(&default, &default_with)?;
+                let default = generate_default(default, default_with)?;
                 let schema_default = default
                     .as_ref()
                     .map(|value| {
@@ -122,7 +122,7 @@ pub fn generate(
                     None => quote!(::std::option::Option::None),
                 };
 
-                let visible = visible_fn(&visible);
+                let visible = visible_fn(visible);
                 schema_args.push(quote! {
                     args.insert(#name, #crate_name::registry::MetaInputValue {
                         name: #name,
@@ -180,7 +180,7 @@ pub fn generate(
                                 .iter()
                                 .find(|(pat_ident, _, _)| pat_ident.ident == variable)
                             {
-                                let default = match generate_default(&default, &default_with)? {
+                                let default = match generate_default(default, default_with)? {
                                     Some(default) => {
                                         quote! { ::std::option::Option::Some(|| -> #ty { #default }) }
                                     }

derive/src/interface.rs

@@ -148,7 +148,7 @@ pub fn generate(interface_args: &args::Interface) -> GeneratorResult<TokenStream
         let (name, method_name) = if let Some(method) = method {
             (name.to_string(), Ident::new(method, Span::call_site()))
         } else {
-            let method_name = Ident::new(&name, Span::call_site());
+            let method_name = Ident::new(name, Span::call_site());
             (
                 interface_args
                     .rename_fields
@@ -198,7 +198,7 @@ pub fn generate(interface_args: &args::Interface) -> GeneratorResult<TokenStream
             decl_params.push(quote! { #ident: #ty });
             use_params.push(quote! { #ident });
 
-            let default = generate_default(&default, &default_with)?;
+            let default = generate_default(default, default_with)?;
             let get_default = match &default {
                 Some(default) => quote! { ::std::option::Option::Some(|| -> #ty { #default }) },
                 None => quote! { ::std::option::Option::None },
@@ -221,7 +221,7 @@ pub fn generate(interface_args: &args::Interface) -> GeneratorResult<TokenStream
                     }
                 })
                 .unwrap_or_else(|| quote! {::std::option::Option::None});
-            let visible = visible_fn(&visible);
+            let visible = visible_fn(visible);
             schema_args.push(quote! {
                 args.insert(#name, #crate_name::registry::MetaInputValue {
                     name: #name,
@@ -265,7 +265,7 @@ pub fn generate(interface_args: &args::Interface) -> GeneratorResult<TokenStream
             }
         });
 
-        let visible = visible_fn(&visible);
+        let visible = visible_fn(visible);
         schema_fields.push(quote! {
             fields.insert(::std::string::ToString::to_string(#name), #crate_name::registry::MetaField {
                 name: ::std::string::ToString::to_string(#name),

derive/src/newtype.rs

@@ -11,9 +11,9 @@ pub fn generate(newtype_args: &args::NewType) -> GeneratorResult<TokenStream> {
     let ident = &newtype_args.ident;
     let (impl_generics, ty_generics, where_clause) = newtype_args.generics.split_for_impl();
     let gql_typename = match &newtype_args.name {
-        NewTypeName::UseNewName(name) => Some(name.clone()),
-        NewTypeName::UseRustName => Some(RenameTarget::Type.rename(ident.to_string())),
-        NewTypeName::UseOriginalName => None,
+        NewTypeName::New(name) => Some(name.clone()),
+        NewTypeName::Rust => Some(RenameTarget::Type.rename(ident.to_string())),
+        NewTypeName::Original => None,
     };
     let desc = get_rustdoc(&newtype_args.attrs)?
         .map(|s| quote! { ::std::option::Option::Some(#s) })

derive/src/object.rs

@@ -241,7 +241,7 @@ pub fn generate(
                         .as_ref()
                         .map(|s| quote! {::std::option::Option::Some(#s)})
                         .unwrap_or_else(|| quote! {::std::option::Option::None});
-                    let default = generate_default(&default, &default_with)?;
+                    let default = generate_default(default, default_with)?;
                     let schema_default = default
                         .as_ref()
                         .map(|value| {
@@ -261,7 +261,7 @@ pub fn generate(
                         None => quote!(::std::option::Option::None),
                     };
 
-                    let visible = visible_fn(&visible);
+                    let visible = visible_fn(visible);
                     schema_args.push(quote! {
                         args.insert(#name, #crate_name::registry::MetaInputValue {
                             name: #name,
@@ -320,7 +320,7 @@ pub fn generate(
                                     .iter()
                                     .find(|(pat_ident, _, _)| pat_ident.ident == variable)
                                 {
-                                    let default = match generate_default(&default, &default_with)? {
+                                    let default = match generate_default(default, default_with)? {
                                         Some(default) => {
                                             quote! { ::std::option::Option::Some(|| -> #ty { #default }) }
                                         }

derive/src/simple_object.rs

@@ -97,7 +97,7 @@ pub fn generate(object_args: &args::SimpleObject) -> GeneratorResult<TokenStream
         });
 
         let guard = match &field.guard {
-            Some(meta) => generate_guards(&crate_name, &meta)?,
+            Some(meta) => generate_guards(&crate_name, meta)?,
             None => None,
         };
         let guard = guard.map(

derive/src/subscription.rs

@@ -165,7 +165,7 @@ pub fn generate(
                     .as_ref()
                     .map(|s| quote! {::std::option::Option::Some(#s)})
                     .unwrap_or_else(|| quote! {::std::option::Option::None});
-                let default = generate_default(&default, &default_with)?;
+                let default = generate_default(default, default_with)?;
 
                 let validator = match &validator {
                     Some(meta) => {
@@ -186,7 +186,7 @@ pub fn generate(
                     })
                     .unwrap_or_else(|| quote! {::std::option::Option::None});
 
-                let visible = visible_fn(&arg_visible);
+                let visible = visible_fn(arg_visible);
                 schema_args.push(quote! {
                     args.insert(#name, #crate_name::registry::MetaInputValue {
                         name: #name,
@@ -264,7 +264,7 @@ pub fn generate(
                                 .iter()
                                 .find(|(pat_ident, _, _)| pat_ident.ident == variable)
                             {
-                                let default = match generate_default(&default, &default_with)? {
+                                let default = match generate_default(default, default_with)? {
                                     Some(default) => {
                                         quote! { ::std::option::Option::Some(|| -> #ty { #default }) }
                                     }

derive/src/utils.rs

@@ -397,7 +397,7 @@ pub fn get_type_path_and_name(ty: &Type) -> GeneratorResult<(&Type, String)> {
                 .map(|s| s.ident.to_string())
                 .unwrap(),
         )),
-        Type::Group(TypeGroup { elem, .. }) => get_type_path_and_name(&elem),
+        Type::Group(TypeGroup { elem, .. }) => get_type_path_and_name(elem),
         Type::TraitObject(trait_object) => Ok((
             ty,
             trait_object

parser/src/lib.rs

@@ -113,7 +113,7 @@ impl Error {
 impl Display for Error {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         match self {
-            Self::Syntax { message, .. } => f.write_str(&message),
+            Self::Syntax { message, .. } => f.write_str(message),
             Self::MissingQueryRoot { .. } => f.write_str("schema definition is missing query root"),
             Self::MultipleRoots { root, .. } => {
                 write!(f, "multiple {} roots in schema definition", root)

parser/src/parse/executable.rs

@@ -402,26 +402,23 @@ mod tests {
     #[test]
     fn test_parser() {
         for entry in fs::read_dir("tests/executables").unwrap() {
-            if let Ok(entry) = entry {
-                eprintln!("Parsing file {}", entry.path().display());
-
-                GraphQLParser::parse(
-                    Rule::executable_document,
-                    &fs::read_to_string(entry.path()).unwrap(),
-                )
-                .unwrap();
-            }
+            let entry = entry.unwrap();
+            eprintln!("Parsing file {}", entry.path().display());
+
+            GraphQLParser::parse(
+                Rule::executable_document,
+                &fs::read_to_string(entry.path()).unwrap(),
+            )
+            .unwrap();
         }
     }
 
     #[test]
     fn test_parser_ast() {
         for entry in fs::read_dir("tests/executables").unwrap() {
-            if let Ok(entry) = entry {
-                eprintln!("Parsing and transforming file {}", entry.path().display());
-
-                parse_query(fs::read_to_string(entry.path()).unwrap()).unwrap();
-            }
+            let entry = entry.unwrap();
+            eprintln!("Parsing and transforming file {}", entry.path().display());
+            parse_query(fs::read_to_string(entry.path()).unwrap()).unwrap();
         }
     }
 

parser/src/parse/service.rs

@@ -403,22 +403,20 @@ mod tests {
     #[test]
     fn test_parser() {
         for entry in fs::read_dir("tests/services").unwrap() {
-            if let Ok(entry) = entry {
-                GraphQLParser::parse(
-                    Rule::service_document,
-                    &fs::read_to_string(entry.path()).unwrap(),
-                )
-                .unwrap();
-            }
+            let entry = entry.unwrap();
+            GraphQLParser::parse(
+                Rule::service_document,
+                &fs::read_to_string(entry.path()).unwrap(),
+            )
+            .unwrap();
         }
     }
 
     #[test]
     fn test_parser_ast() {
         for entry in fs::read_dir("tests/services").unwrap() {
-            if let Ok(entry) = entry {
-                parse_schema(fs::read_to_string(entry.path()).unwrap()).unwrap();
-            }
+            let entry = entry.unwrap();
+            parse_schema(fs::read_to_string(entry.path()).unwrap()).unwrap();
         }
     }
 }

tests/extension.rs

@@ -296,7 +296,7 @@ pub async fn test_extension_call_order() {
             })
             .finish();
         let mut stream = schema.execute_stream("subscription Abc { value }");
-        while let Some(_) = stream.next().await {}
+        while stream.next().await.is_some() {}
         let calls = calls.lock().await;
         assert_eq!(
             &*calls,

tests/input_object.rs

@@ -248,7 +248,7 @@ pub async fn test_inputobject_flatten_multiple() {
     }
 
     #[derive(InputObject, Debug, Eq, PartialEq)]
-    struct ABC {
+    struct Abc {
         #[graphql(flatten)]
         a: A,
 
@@ -260,21 +260,21 @@ pub async fn test_inputobject_flatten_multiple() {
     }
 
     assert_eq!(
-        ABC::parse(Some(value!({
+        Abc::parse(Some(value!({
            "a": 10,
            "b": 20,
            "c": 30,
         })))
         .unwrap(),
-        ABC {
+        Abc {
             a: A { a: 10 },
             b: B { b: 20 },
             c: C { c: 30 }
         }
     );
 
     assert_eq!(
-        ABC {
+        Abc {
             a: A { a: 10 },
             b: B { b: 20 },
             c: C { c: 30 }

tests/input_validators.rs

@@ -1817,7 +1817,7 @@ pub async fn test_custom_input_validator_with_extensions() {
             .execute(&field_query)
             .await
             .into_result()
-            .expect_err(&should_fail_msg),
+            .expect_err(should_fail_msg),
         vec![ServerError {
             message: field_error_msg.into(),
             locations: vec!(Pos {

tests/introspection_visible.rs

@@ -59,12 +59,7 @@ pub async fn test_type_visible() {
     )
     .unwrap();
 
-    assert!(resp
-        .schema
-        .types
-        .into_iter()
-        .find(|ty| ty.name == "MyObj")
-        .is_none());
+    assert!(!resp.schema.types.into_iter().any(|ty| ty.name == "MyObj"));
 }
 
 #[tokio::test]

tests/subscription_websocket_graphql_ws.rs

@@ -600,5 +600,5 @@ pub async fn test_stream_drop() {
         }
     }
 
-    assert_eq!(*dropped.lock().unwrap(), true);
+    assert!(*dropped.lock().unwrap());
 }