Make Clippy happy for 1.78 Rust

Author: tyranron

juniper/src/schema/translate/graphql_parser.rs

@@ -40,9 +40,9 @@ impl<'a, T> SchemaTranslator<'a, graphql_parser::schema::Document<'a, T>>
 where
     T: Text<'a> + Default,
 {
-    fn translate_schema<S: 'a>(input: &'a SchemaType<S>) -> graphql_parser::schema::Document<'a, T>
+    fn translate_schema<S>(input: &'a SchemaType<S>) -> graphql_parser::schema::Document<'a, T>
     where
-        S: ScalarValue,
+        S: ScalarValue + 'a,
     {
         let mut doc = Document::default();
 
@@ -94,9 +94,9 @@ impl GraphQLParserTranslator {
         }
     }
 
-    fn translate_value<'a, S: 'a, T>(input: &'a InputValue<S>) -> ExternalValue<'a, T>
+    fn translate_value<'a, S, T>(input: &'a InputValue<S>) -> ExternalValue<'a, T>
     where
-        S: ScalarValue,
+        S: ScalarValue + 'a,
         T: Text<'a>,
     {
         match input {
@@ -250,9 +250,9 @@ impl GraphQLParserTranslator {
         }
     }
 
-    fn translate_field<'a, S: 'a, T>(input: &'a Field<S>) -> ExternalField<'a, T>
+    fn translate_field<'a, S, T>(input: &'a Field<S>) -> ExternalField<'a, T>
     where
-        S: ScalarValue,
+        S: ScalarValue + 'a,
         T: Text<'a>,
     {
         let arguments = input

juniper/src/schema/translate/mod.rs

@@ -1,5 +1,6 @@
 use crate::{ScalarValue, SchemaType};
 
+#[cfg_attr(not(feature = "schema-language"), allow(dead_code))]
 pub trait SchemaTranslator<'a, T> {
     fn translate_schema<S: 'a + ScalarValue>(s: &'a SchemaType<S>) -> T;
 }

juniper/src/validation/rules/mod.rs

@@ -35,9 +35,9 @@ use crate::{
 };
 
 #[doc(hidden)]
-pub fn visit_all_rules<'a, S: Debug>(ctx: &mut ValidatorContext<'a, S>, doc: &'a Document<S>)
+pub fn visit_all_rules<'a, S>(ctx: &mut ValidatorContext<'a, S>, doc: &'a Document<S>)
 where
-    S: ScalarValue,
+    S: Debug + ScalarValue,
 {
     // Some validators are depending on the results of other ones.
     // For example, validators checking fragments usually rely on the fact that

juniper/src/validation/rules/overlapping_fields_can_be_merged.rs

@@ -59,26 +59,26 @@ impl<K: Eq + Hash + Clone, V> OrderedMap<K, V> {
         }
     }
 
-    fn get<Q: ?Sized>(&self, k: &Q) -> Option<&V>
+    fn get<Q>(&self, k: &Q) -> Option<&V>
     where
         K: Borrow<Q>,
-        Q: Hash + Eq,
+        Q: Hash + Eq + ?Sized,
     {
         self.data.get(k)
     }
 
-    fn get_mut<Q: ?Sized>(&mut self, k: &Q) -> Option<&mut V>
+    fn get_mut<Q>(&mut self, k: &Q) -> Option<&mut V>
     where
         K: Borrow<Q>,
-        Q: Hash + Eq,
+        Q: Hash + Eq + ?Sized,
     {
         self.data.get_mut(k)
     }
 
-    fn contains_key<Q: ?Sized>(&self, k: &Q) -> bool
+    fn contains_key<Q>(&self, k: &Q) -> bool
     where
         K: Borrow<Q>,
-        Q: Hash + Eq,
+        Q: Hash + Eq + ?Sized,
     {
         self.data.contains_key(k)
     }

juniper_codegen/src/common/diagnostic.rs

@@ -342,12 +342,6 @@ mod polyfill {
         /// Behaves like [`Result::unwrap()`]: if `self` is [`Ok`] yield the contained value,
         /// otherwise abort macro execution.
         fn unwrap_or_abort(self) -> Self::Ok;
-
-        /// Behaves like [`Result::expect()`]: if `self` is [`Ok`] yield the contained value,
-        /// otherwise abort macro execution.
-        ///
-        /// If it aborts then resulting error message will be preceded with the provided `message`.
-        fn expect_or_abort(self, message: &str) -> Self::Ok;
     }
 
     impl<T, E: Into<Diagnostic>> ResultExt for Result<T, E> {
@@ -356,13 +350,5 @@ mod polyfill {
         fn unwrap_or_abort(self) -> T {
             self.unwrap_or_else(|e| e.into().abort())
         }
-
-        fn expect_or_abort(self, message: &str) -> T {
-            self.unwrap_or_else(|e| {
-                let mut d = e.into();
-                d.msg = format!("{message}: {}", d.msg);
-                d.abort()
-            })
-        }
     }
 }

juniper_codegen/src/common/parse/mod.rs

@@ -252,10 +252,6 @@ impl TypeExt for syn::Type {
 
 /// Extension of [`syn::Generics`] providing common function widely used by this crate for parsing.
 pub(crate) trait GenericsExt {
-    /// Removes all default types out of type parameters and const parameters in these
-    /// [`syn::Generics`].
-    fn remove_defaults(&mut self);
-
     /// Moves all trait and lifetime bounds of these [`syn::Generics`] to its [`syn::WhereClause`].
     fn move_bounds_to_where_clause(&mut self);
 
@@ -269,24 +265,6 @@ pub(crate) trait GenericsExt {
 }
 
 impl GenericsExt for syn::Generics {
-    fn remove_defaults(&mut self) {
-        use syn::GenericParam as P;
-
-        for p in &mut self.params {
-            match p {
-                P::Type(p) => {
-                    p.eq_token = None;
-                    p.default = None;
-                }
-                P::Lifetime(_) => {}
-                P::Const(p) => {
-                    p.eq_token = None;
-                    p.default = None;
-                }
-            }
-        }
-    }
-
     fn move_bounds_to_where_clause(&mut self) {
         use syn::GenericParam as P;
 

juniper_codegen/src/graphql_interface/mod.rs

@@ -401,7 +401,7 @@ impl Definition {
 
         let enum_gens = {
             let mut enum_gens = interface_gens.clone();
-            enum_gens.params = interface_gens_lifetimes.clone();
+            enum_gens.params.clone_from(&interface_gens_lifetimes);
             enum_gens.params.extend(variant_gens_pars.clone());
             enum_gens.params.extend(interface_gens_tys.clone());
             enum_gens

tests/codegen/fail/input-object/derive_incompatible_field_type.stderr

@@ -12,7 +12,7 @@ error[E0277]: the trait bound `ObjectA: IsInputType<__S>` is not satisfied
              <Box<T> as IsInputType<S>>
              <juniper::schema::model::DirectiveLocation as IsInputType<__S>>
              <Arc<T> as IsInputType<S>>
-             <Vec<T> as IsInputType<S>>
+             <TypeKind as IsInputType<__S>>
            and $N others
 
 error[E0277]: the trait bound `ObjectA: FromInputValue<__S>` is not satisfied
@@ -32,7 +32,7 @@ error[E0277]: the trait bound `ObjectA: FromInputValue<__S>` is not satisfied
              <Box<T> as FromInputValue<S>>
              <juniper::schema::model::DirectiveLocation as FromInputValue<__S>>
              <Arc<T> as FromInputValue<S>>
-             <Vec<T> as FromInputValue<S>>
+             <TypeKind as FromInputValue<__S>>
            and $N others
 note: required by a bound in `Registry::<'r, S>::arg`
   --> $WORKSPACE/juniper/src/executor/mod.rs
@@ -57,7 +57,7 @@ error[E0277]: the trait bound `ObjectA: FromInputValue<__S>` is not satisfied
             <Box<T> as FromInputValue<S>>
             <juniper::schema::model::DirectiveLocation as FromInputValue<__S>>
             <Arc<T> as FromInputValue<S>>
-            <Vec<T> as FromInputValue<S>>
+            <TypeKind as FromInputValue<__S>>
           and $N others
   = note: this error originates in the derive macro `GraphQLInputObject` (in Nightly builds, run with -Z macro-backtrace for more info)
 
@@ -75,6 +75,6 @@ error[E0277]: the trait bound `ObjectA: ToInputValue<_>` is not satisfied
             <Box<T> as ToInputValue<S>>
             <juniper::schema::model::DirectiveLocation as ToInputValue<__S>>
             <Arc<T> as ToInputValue<S>>
-            <Vec<T> as ToInputValue<S>>
+            <TypeKind as ToInputValue<__S>>
           and $N others
   = note: this error originates in the derive macro `GraphQLInputObject` (in Nightly builds, run with -Z macro-backtrace for more info)

tests/codegen/fail/interface/struct/attr_cyclic_impl.stderr

@@ -1,27 +1,22 @@
 error[E0391]: cycle detected when expanding type alias `Node1Value`
-  --> fail/interface/struct/attr_cyclic_impl.rs:3:46
-   |
-3  | #[graphql_interface(impl = Node2Value, for = Node2Value)]
-   |                                              ^^^^^^^^^^
-   |
+ --> fail/interface/struct/attr_cyclic_impl.rs:3:46
+  |
+3 | #[graphql_interface(impl = Node2Value, for = Node2Value)]
+  |                                              ^^^^^^^^^^
+  |
 note: ...which requires expanding type alias `Node2Value`...
-  --> fail/interface/struct/attr_cyclic_impl.rs:8:46
-   |
-8  | #[graphql_interface(impl = Node1Value, for = Node1Value)]
-   |                                              ^^^^^^^^^^
-   = note: ...which again requires expanding type alias `Node1Value`, completing the cycle
-   = note: type aliases cannot be recursive
-   = help: consider using a struct, enum, or union instead to break the cycle
-   = help: see <https://doc.rust-lang.org/reference/types.html#recursive-types> for more information
-note: cycle used when collecting item types in top-level module
-  --> fail/interface/struct/attr_cyclic_impl.rs:1:1
-   |
-1  | / use juniper::graphql_interface;
-2  | |
-3  | | #[graphql_interface(impl = Node2Value, for = Node2Value)]
-4  | | struct Node1 {
-...  |
-12 | |
-13 | | fn main() {}
-   | |____________^
-   = note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information
+ --> fail/interface/struct/attr_cyclic_impl.rs:8:46
+  |
+8 | #[graphql_interface(impl = Node1Value, for = Node1Value)]
+  |                                              ^^^^^^^^^^
+  = note: ...which again requires expanding type alias `Node1Value`, completing the cycle
+  = note: type aliases cannot be recursive
+  = help: consider using a struct, enum, or union instead to break the cycle
+  = help: see <https://doc.rust-lang.org/reference/types.html#recursive-types> for more information
+note: cycle used when computing type of `<impl at $DIR/fail/interface/struct/attr_cyclic_impl.rs:3:1: 3:58>`
+ --> fail/interface/struct/attr_cyclic_impl.rs:3:1
+  |
+3 | #[graphql_interface(impl = Node2Value, for = Node2Value)]
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  = note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information
+  = note: this error originates in the attribute macro `graphql_interface` (in Nightly builds, run with -Z macro-backtrace for more info)

tests/codegen/fail/interface/struct/derive_cyclic_impl.stderr

@@ -13,15 +13,10 @@ note: ...which requires expanding type alias `Node2Value`...
    = note: type aliases cannot be recursive
    = help: consider using a struct, enum, or union instead to break the cycle
    = help: see <https://doc.rust-lang.org/reference/types.html#recursive-types> for more information
-note: cycle used when collecting item types in top-level module
-  --> fail/interface/struct/derive_cyclic_impl.rs:1:1
+note: cycle used when computing type of `<impl at $DIR/fail/interface/struct/derive_cyclic_impl.rs:3:10: 3:26>`
+  --> fail/interface/struct/derive_cyclic_impl.rs:3:10
    |
-1  | / use juniper::GraphQLInterface;
-2  | |
-3  | | #[derive(GraphQLInterface)]
-4  | | #[graphql(impl = Node2Value, for = Node2Value)]
-...  |
-14 | |
-15 | | fn main() {}
-   | |____________^
+3  | #[derive(GraphQLInterface)]
+   |          ^^^^^^^^^^^^^^^^
    = note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information
+   = note: this error originates in the derive macro `GraphQLInterface` (in Nightly builds, run with -Z macro-backtrace for more info)