Merge branch 'master' into 1347-doc-description

Author: tyranron

juniper/src/integrations/serde.rs

@@ -5,7 +5,6 @@ use serde::{
     Deserialize, Serialize,
     de::{self, Deserializer, IntoDeserializer as _},
     ser::{SerializeMap as _, Serializer},
-    serde_if_integer128,
 };
 
 use crate::{
@@ -105,10 +104,8 @@ impl<'de, S: Deserialize<'de>> Deserialize<'de> for InputValue<S> {
                 S::deserialize(n.into_deserializer()).map(InputValue::Scalar)
             }
 
-            serde_if_integer128! {
-                fn visit_i128<E: de::Error>(self, n: i128) ->  Result<Self::Value, E> {
-                    S::deserialize(n.into_deserializer()).map(InputValue::Scalar)
-                }
+            fn visit_i128<E: de::Error>(self, n: i128) -> Result<Self::Value, E> {
+                S::deserialize(n.into_deserializer()).map(InputValue::Scalar)
             }
 
             fn visit_u8<E: de::Error>(self, n: u8) -> Result<Self::Value, E> {
@@ -127,10 +124,8 @@ impl<'de, S: Deserialize<'de>> Deserialize<'de> for InputValue<S> {
                 S::deserialize(n.into_deserializer()).map(InputValue::Scalar)
             }
 
-            serde_if_integer128! {
-                fn visit_u128<E: de::Error>(self, n: u128) ->  Result<Self::Value, E> {
-                    S::deserialize(n.into_deserializer()).map(InputValue::Scalar)
-                }
+            fn visit_u128<E: de::Error>(self, n: u128) -> Result<Self::Value, E> {
+                S::deserialize(n.into_deserializer()).map(InputValue::Scalar)
             }
 
             fn visit_f32<E: de::Error>(self, n: f32) -> Result<Self::Value, E> {

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

@@ -18,9 +18,9 @@ error[E0277]: the trait bound `ObjectA: IsInputType<__S>` is not satisfied
 error[E0277]: the trait bound `ObjectA: FromInputValue<__S>` is not satisfied
   --> fail/input-object/derive_incompatible_field_type.rs:10:12
    |
-8  | #[derive(GraphQLInputObject)]
+ 8 | #[derive(GraphQLInputObject)]
    |          ------------------ required by a bound introduced by this call
-9  | struct Object {
+ 9 | struct Object {
 10 |     field: ObjectA,
    |            ^^^^^^^ the trait `FromInputValue<__S>` is not implemented for `ObjectA`
    |

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

@@ -1,7 +1,7 @@
 error[E0391]: cycle detected when expanding type alias `Node1Value`
   --> fail/interface/struct/derive_cyclic_impl.rs:4:36
    |
-4  | #[graphql(impl = Node2Value, for = Node2Value)]
+ 4 | #[graphql(impl = Node2Value, for = Node2Value)]
    |                                    ^^^^^^^^^^
    |
 note: ...which requires expanding type alias `Node2Value`...
@@ -16,7 +16,7 @@ note: ...which requires expanding type alias `Node2Value`...
 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
    |
-3  | #[derive(GraphQLInterface)]
+ 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)

tests/codegen/fail/interface/trait/argument_non_input_type.stderr

@@ -18,9 +18,9 @@ error[E0277]: the trait bound `ObjA: IsInputType<__S>` is not satisfied
 error[E0277]: the trait bound `ObjA: FromInputValue<__S>` is not satisfied
   --> fail/interface/trait/argument_non_input_type.rs:10:23
    |
-8  | #[graphql_interface]
+ 8 | #[graphql_interface]
    | -------------------- required by a bound introduced by this call
-9  | trait Character {
+ 9 | trait Character {
 10 |     fn id(&self, obj: ObjA) -> &str;
    |                       ^^^^ the trait `FromInputValue<__S>` is not implemented for `ObjA`
    |