Merge branch 'master' into whamcloud

tyranron · tyranron · commit c370ed633ddc · 2025-01-13T18:54:56.000+02:00
# Conflicts:
#	juniper/Cargo.toml
diff --git a/juniper/Cargo.toml b/juniper/Cargo.toml
@@ -53,7 +53,7 @@ fnv = "1.0.5"
 futures = { version = "0.3.22", features = ["alloc"], default-features = false }
 graphql-parser = { version = "0.4", optional = true }
 indexmap = { version = "2.0", features = ["serde"] }
-jiff = { version = "0.1.16", features = ["std"], default-features = false, optional = true }
+jiff = { version = "0.1.19", features = ["std"], default-features = false, optional = true }
 juniper_codegen = { version = "0.16.0", path = "../juniper_codegen" }
 rust_decimal = { version = "1.20", default-features = false, optional = true }
 ryu = { version = "1.0", optional = true }
@@ -78,7 +78,7 @@ void = { version = "1.0.2", optional = true }
 [dev-dependencies]
 bencher = "0.1.2"
 chrono = { version = "0.4.30", features = ["alloc"], default-features = false }
-jiff = { version = "0.1", features = ["tzdb-bundle-always"], default-features = false }
+jiff = { version = "0.1.19", features = ["tzdb-bundle-always"], default-features = false }
 pretty_assertions = "1.0.0"
 serde_json = "1.0.18"
 serial_test = "3.0"
diff --git a/juniper/src/integrations/jiff.rs b/juniper/src/integrations/jiff.rs
@@ -1280,9 +1280,9 @@ mod duration_test {
                     .minutes(1)
                     .seconds(1)
                     .milliseconds(100),
-                graphql_input_value!("P1y1m1dT1h1m1.1s"),
+                graphql_input_value!("P1Y1M1DT1H1M1.1S"),
             ),
-            ((-5).days(), graphql_input_value!("-P5d")),
+            ((-5).days(), graphql_input_value!("-P5D")),
         ] {
             let actual: InputValue = val.to_input_value();
 
@@ -1674,7 +1674,7 @@ mod integration_test {
                     "zonedDateTime": "2014-11-28T12:00:09.05-05:00[America/New_York]",
                     "timeZone": "Asia/Tokyo",
                     "utcOffset": "+10:00",
-                    "duration": "P1y1m1dT1h1m1.1s",
+                    "duration": "P1Y1M1DT1H1M1.1S",
                 }),
                 vec![],
             )),
diff --git a/juniper/src/macros/reflect.rs b/juniper/src/macros/reflect.rs
@@ -417,13 +417,13 @@ pub const fn fnv1a128(str: Name) -> u128 {
 /// Length __in bytes__ of the [`format_type!`] macro result.
 #[must_use]
 pub const fn type_len_with_wrapped_val(ty: Type, val: WrappedValue) -> usize {
-    let mut len = ty.as_bytes().len() + "!".as_bytes().len(); // Type!
+    let mut len = ty.len() + "!".len(); // Type!
 
     let mut curr = val;
     while curr % 10 != 0 {
         match curr % 10 {
-            2 => len -= "!".as_bytes().len(),   // remove !
-            3 => len += "[]!".as_bytes().len(), // [Type]!
+            2 => len -= "!".len(),   // remove !
+            3 => len += "[]!".len(), // [Type]!
             _ => {}
         }
         curr /= 10;
diff --git a/tests/codegen/fail/interface/struct/attr_missing_field.stderr b/tests/codegen/fail/interface/struct/attr_missing_field.stderr
@@ -28,12 +28,14 @@ error[E0277]: the trait bound `ObjA: reflect::Field<__S, 11301463986558097276003
 11 |     id: String,
    |     ^^ the trait `reflect::Field<__S, 11301463986558097276003903130001171064>` is not implemented for `ObjA`
    |
-   = help: the trait `reflect::Field<__S, 140650918148392961738240285796466530725>` is implemented for `ObjA`
+   = help: the trait `Field<__S, 11301463986558097276003903130001171064>` is not implemented for `ObjA`
+           but trait `Field<__S, 140650918148392961738240285796466530725>` is implemented for it
 
 error[E0277]: the trait bound `ObjA: AsyncField<__S, 11301463986558097276003903130001171064>` is not satisfied
   --> fail/interface/struct/attr_missing_field.rs:11:5
    |
 11 |     id: String,
    |     ^^ the trait `AsyncField<__S, 11301463986558097276003903130001171064>` is not implemented for `ObjA`
    |
-   = help: the trait `AsyncField<__S, 140650918148392961738240285796466530725>` is implemented for `ObjA`
+   = help: the trait `AsyncField<__S, 11301463986558097276003903130001171064>` is not implemented for `ObjA`
+           but trait `AsyncField<__S, 140650918148392961738240285796466530725>` is implemented for it
diff --git a/tests/codegen/fail/interface/struct/derive_missing_field.stderr b/tests/codegen/fail/interface/struct/derive_missing_field.stderr
@@ -28,12 +28,14 @@ error[E0277]: the trait bound `ObjA: reflect::Field<__S, 11301463986558097276003
 12 |     id: String,
    |     ^^ the trait `reflect::Field<__S, 11301463986558097276003903130001171064>` is not implemented for `ObjA`
    |
-   = help: the trait `reflect::Field<__S, 140650918148392961738240285796466530725>` is implemented for `ObjA`
+   = help: the trait `Field<__S, 11301463986558097276003903130001171064>` is not implemented for `ObjA`
+           but trait `Field<__S, 140650918148392961738240285796466530725>` is implemented for it
 
 error[E0277]: the trait bound `ObjA: AsyncField<__S, 11301463986558097276003903130001171064>` is not satisfied
   --> fail/interface/struct/derive_missing_field.rs:12:5
    |
 12 |     id: String,
    |     ^^ the trait `AsyncField<__S, 11301463986558097276003903130001171064>` is not implemented for `ObjA`
    |
-   = help: the trait `AsyncField<__S, 140650918148392961738240285796466530725>` is implemented for `ObjA`
+   = help: the trait `AsyncField<__S, 11301463986558097276003903130001171064>` is not implemented for `ObjA`
+           but trait `AsyncField<__S, 140650918148392961738240285796466530725>` is implemented for it
diff --git a/tests/codegen/fail/interface/trait/argument_wrong_default_array.stderr b/tests/codegen/fail/interface/trait/argument_wrong_default_array.stderr
@@ -2,7 +2,7 @@ error[E0277]: the trait bound `[bool; 2]: From<[bool; 3]>` is not satisfied
  --> fail/interface/trait/argument_wrong_default_array.rs:3:1
   |
 3 | #[graphql_interface]
-  | ^^^^^^^^^^^^^^^^^^^^ the trait `From<[bool; 3]>` is not implemented for `[bool; 2]`, which is required by `[bool; 3]: Into<_>`
+  | ^^^^^^^^^^^^^^^^^^^^ the trait `From<[bool; 3]>` is not implemented for `[bool; 2]`
   |
   = help: the following other types implement trait `From<T>`:
             `[T; 10]` implements `From<(T, T, T, T, T, T, T, T, T, T)>`
diff --git a/tests/codegen/fail/interface/trait/missing_field.stderr b/tests/codegen/fail/interface/trait/missing_field.stderr
@@ -28,12 +28,14 @@ error[E0277]: the trait bound `ObjA: reflect::Field<__S, 11301463986558097276003
 11 |     fn id(&self) -> &str;
    |        ^^ the trait `reflect::Field<__S, 11301463986558097276003903130001171064>` is not implemented for `ObjA`
    |
-   = help: the trait `reflect::Field<__S, 140650918148392961738240285796466530725>` is implemented for `ObjA`
+   = help: the trait `Field<__S, 11301463986558097276003903130001171064>` is not implemented for `ObjA`
+           but trait `Field<__S, 140650918148392961738240285796466530725>` is implemented for it
 
 error[E0277]: the trait bound `ObjA: AsyncField<__S, 11301463986558097276003903130001171064>` is not satisfied
   --> fail/interface/trait/missing_field.rs:11:8
    |
 11 |     fn id(&self) -> &str;
    |        ^^ the trait `AsyncField<__S, 11301463986558097276003903130001171064>` is not implemented for `ObjA`
    |
-   = help: the trait `AsyncField<__S, 140650918148392961738240285796466530725>` is implemented for `ObjA`
+   = help: the trait `AsyncField<__S, 11301463986558097276003903130001171064>` is not implemented for `ObjA`
+           but trait `AsyncField<__S, 140650918148392961738240285796466530725>` is implemented for it
diff --git a/tests/codegen/fail/object/argument_wrong_default_array.stderr b/tests/codegen/fail/object/argument_wrong_default_array.stderr
@@ -2,7 +2,7 @@ error[E0277]: the trait bound `[bool; 2]: From<[bool; 3]>` is not satisfied
  --> fail/object/argument_wrong_default_array.rs:5:1
   |
 5 | #[graphql_object]
-  | ^^^^^^^^^^^^^^^^^ the trait `From<[bool; 3]>` is not implemented for `[bool; 2]`, which is required by `[bool; 3]: Into<_>`
+  | ^^^^^^^^^^^^^^^^^ the trait `From<[bool; 3]>` is not implemented for `[bool; 2]`
   |
   = help: the following other types implement trait `From<T>`:
             `[T; 10]` implements `From<(T, T, T, T, T, T, T, T, T, T)>`
diff --git a/tests/codegen/fail/subscription/argument_wrong_default_array.stderr b/tests/codegen/fail/subscription/argument_wrong_default_array.stderr
@@ -2,7 +2,7 @@ error[E0277]: the trait bound `[bool; 2]: From<[bool; 3]>` is not satisfied
   --> fail/subscription/argument_wrong_default_array.rs:10:1
    |
 10 | #[graphql_subscription]
-   | ^^^^^^^^^^^^^^^^^^^^^^^ the trait `From<[bool; 3]>` is not implemented for `[bool; 2]`, which is required by `[bool; 3]: Into<_>`
+   | ^^^^^^^^^^^^^^^^^^^^^^^ the trait `From<[bool; 3]>` is not implemented for `[bool; 2]`
    |
    = help: the following other types implement trait `From<T>`:
              `[T; 10]` implements `From<(T, T, T, T, T, T, T, T, T, T)>`
diff --git a/tests/integration/tests/codegen_object_attr.rs b/tests/integration/tests/codegen_object_attr.rs
@@ -617,6 +617,7 @@ mod generic_lifetime_async {
         home_planet: &'p str,
     }
 
+    #[allow(clippy::needless_lifetimes)] // required by codegen
     #[graphql_object]
     impl<'p> Human<'p, i32> {
         async fn id(&self) -> i32 {
@@ -628,6 +629,7 @@ mod generic_lifetime_async {
         }
     }
 
+    #[allow(clippy::needless_lifetimes)] // required by codegen
     #[graphql_object(name = "HumanString")]
     impl<'id, 'p> Human<'p, &'id str> {
         async fn id(&self) -> &str {
@@ -724,6 +726,7 @@ mod nested_generic_lifetime_async {
         primary_function: &'p str,
     }
 
+    #[allow(clippy::needless_lifetimes)] // required by codegen
     #[graphql_object]
     impl<'p> Droid<'p, i32> {
         async fn id(&self) -> i32 {
@@ -735,6 +738,7 @@ mod nested_generic_lifetime_async {
         }
     }
 
+    #[allow(clippy::needless_lifetimes)] // required by codegen
     #[graphql_object(name = "DroidString")]
     impl<'id, 'p> Droid<'p, &'id str> {
         async fn id(&self) -> &str {
@@ -751,6 +755,7 @@ mod nested_generic_lifetime_async {
         home_planet: &'p str,
     }
 
+    #[allow(clippy::needless_lifetimes)] // required by codegen
     #[graphql_object]
     impl<'p> Human<'p, i32> {
         async fn id(&self) -> i32 {
@@ -769,6 +774,7 @@ mod nested_generic_lifetime_async {
         }
     }
 
+    #[allow(clippy::needless_lifetimes)] // required by codegen
     #[graphql_object(name = "HumanString")]
     impl<'id, 'p> Human<'p, &'id str> {
         async fn id(&self) -> &str {
diff --git a/tests/integration/tests/codegen_subscription_attr.rs b/tests/integration/tests/codegen_subscription_attr.rs
@@ -729,6 +729,7 @@ mod generic_lifetime {
         home_planet: &'p str,
     }
 
+    #[allow(clippy::needless_lifetimes)] // required by codegen
     #[graphql_subscription]
     impl<'p> Human<'p, i32> {
         async fn id(&self) -> Stream<'static, i32> {
@@ -741,6 +742,7 @@ mod generic_lifetime {
         }
     }
 
+    #[allow(clippy::needless_lifetimes)] // required by codegen
     #[graphql_subscription(name = "HumanString")]
     impl<'id, 'p> Human<'p, &'id str> {
         // TODO: Make it work with `Stream<'_, &str>`.
@@ -1539,6 +1541,7 @@ mod explicit_custom_context {
     #[graphql_subscription(context = CustomContext)]
     impl Human {
         // TODO: Make work for `Stream<'c, prelude::String>`.
+        #[allow(clippy::needless_lifetimes)] // required by codegen
         async fn id<'c>(&self, context: &'c CustomContext) -> Stream<'static, prelude::String> {
             prelude::Box::pin(stream::once(future::ready(context.0.clone())))
         }
@@ -1628,6 +1631,7 @@ mod inferred_custom_context_from_field {
     #[graphql_subscription]
     impl Human {
         // TODO: Make work for `Stream<'c, prelude::String>`.
+        #[allow(clippy::needless_lifetimes)] // required by codegen
         async fn id<'c>(&self, context: &'c CustomContext) -> Stream<'static, prelude::String> {
             prelude::Box::pin(stream::once(future::ready(context.0.clone())))
         }
@@ -1704,6 +1708,7 @@ mod executor {
     #[graphql_subscription(scalar = S: ScalarValue)]
     impl Human {
         // TODO: Make work for `Stream<'e, &'e str>`.
+        #[allow(clippy::needless_lifetimes)] // required by codegen
         async fn id<'e, S>(
             &self,
             executor: &'e Executor<'_, '_, (), S>,
@@ -1725,6 +1730,7 @@ mod executor {
         }
 
         // TODO: Make work for `Stream<'e, &'e str>`.
+        #[allow(clippy::needless_lifetimes)] // required by codegen
         async fn info2<'e, S>(
             _executor: &'e Executor<'_, '_, (), S>,
         ) -> Stream<'static, &'static str> {

Original file line number	Diff line number	Diff line change
@@ -28,12 +28,14 @@ error[E0277]: the trait bound `ObjA: reflect::Field<__S, 11301463986558097276003
`28`	`28`	`11 \| id: String,`
`29`	`29`	\| ^^ the trait `reflect::Field<__S, 11301463986558097276003903130001171064>` is not implemented for `ObjA`
`30`	`30`	`\|`
`31`		- = help: the trait `reflect::Field<__S, 140650918148392961738240285796466530725>` is implemented for `ObjA`
	`31`	+ = help: the trait `Field<__S, 11301463986558097276003903130001171064>` is not implemented for `ObjA`
	`32`	+ but trait `Field<__S, 140650918148392961738240285796466530725>` is implemented for it
`32`	`33`
`33`	`34`	error[E0277]: the trait bound `ObjA: AsyncField<__S, 11301463986558097276003903130001171064>` is not satisfied
`34`	`35`	`--> fail/interface/struct/attr_missing_field.rs:11:5`
`35`	`36`	`\|`
`36`	`37`	`11 \| id: String,`
`37`	`38`	\| ^^ the trait `AsyncField<__S, 11301463986558097276003903130001171064>` is not implemented for `ObjA`
`38`	`39`	`\|`
`39`		- = help: the trait `AsyncField<__S, 140650918148392961738240285796466530725>` is implemented for `ObjA`
	`40`	+ = help: the trait `AsyncField<__S, 11301463986558097276003903130001171064>` is not implemented for `ObjA`
	`41`	+ but trait `AsyncField<__S, 140650918148392961738240285796466530725>` is implemented for it
Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error[E0277]: the trait bound `[bool; 2]: From<[bool; 3]>` is not satisfied
`2`	`2`	`--> fail/interface/trait/argument_wrong_default_array.rs:3:1`
`3`	`3`	`\|`
`4`	`4`	`3 \| #[graphql_interface]`
`5`		- \| ^^^^^^^^^^^^^^^^^^^^ the trait `From<[bool; 3]>` is not implemented for `[bool; 2]`, which is required by `[bool; 3]: Into<_>`
	`5`	+ \| ^^^^^^^^^^^^^^^^^^^^ the trait `From<[bool; 3]>` is not implemented for `[bool; 2]`
`6`	`6`	`\|`
`7`	`7`	= help: the following other types implement trait `From<T>`:
`8`	`8`	`[T; 10]` implements `From<(T, T, T, T, T, T, T, T, T, T)>`
Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error[E0277]: the trait bound `[bool; 2]: From<[bool; 3]>` is not satisfied
`2`	`2`	`--> fail/object/argument_wrong_default_array.rs:5:1`
`3`	`3`	`\|`
`4`	`4`	`5 \| #[graphql_object]`
`5`		- \| ^^^^^^^^^^^^^^^^^ the trait `From<[bool; 3]>` is not implemented for `[bool; 2]`, which is required by `[bool; 3]: Into<_>`
	`5`	+ \| ^^^^^^^^^^^^^^^^^ the trait `From<[bool; 3]>` is not implemented for `[bool; 2]`
`6`	`6`	`\|`
`7`	`7`	= help: the following other types implement trait `From<T>`:
`8`	`8`	`[T; 10]` implements `From<(T, T, T, T, T, T, T, T, T, T)>`
Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error[E0277]: the trait bound `[bool; 2]: From<[bool; 3]>` is not satisfied
`2`	`2`	`--> fail/subscription/argument_wrong_default_array.rs:10:1`
`3`	`3`	`\|`
`4`	`4`	`10 \| #[graphql_subscription]`
`5`		- \| ^^^^^^^^^^^^^^^^^^^^^^^ the trait `From<[bool; 3]>` is not implemented for `[bool; 2]`, which is required by `[bool; 3]: Into<_>`
	`5`	+ \| ^^^^^^^^^^^^^^^^^^^^^^^ the trait `From<[bool; 3]>` is not implemented for `[bool; 2]`
`6`	`6`	`\|`
`7`	`7`	= help: the following other types implement trait `From<T>`:
`8`	`8`	`[T; 10]` implements `From<(T, T, T, T, T, T, T, T, T, T)>`
Original file line number	Diff line number	Diff line change
`@@ -617,6 +617,7 @@ mod generic_lifetime_async {`
`617`	`617`	`home_planet: &'p str,`
`618`	`618`	`}`
`619`	`619`
	`620`	`+ #[allow(clippy::needless_lifetimes)] // required by codegen`
`620`	`621`	`#[graphql_object]`
`621`	`622`	`impl<'p> Human<'p, i32> {`
`622`	`623`	`async fn id(&self) -> i32 {`
`@@ -628,6 +629,7 @@ mod generic_lifetime_async {`
`628`	`629`	`}`
`629`	`630`	`}`
`630`	`631`
	`632`	`+ #[allow(clippy::needless_lifetimes)] // required by codegen`
`631`	`633`	`#[graphql_object(name = "HumanString")]`
`632`	`634`	`impl<'id, 'p> Human<'p, &'id str> {`
`633`	`635`	`async fn id(&self) -> &str {`
`@@ -724,6 +726,7 @@ mod nested_generic_lifetime_async {`
`724`	`726`	`primary_function: &'p str,`
`725`	`727`	`}`
`726`	`728`
	`729`	`+ #[allow(clippy::needless_lifetimes)] // required by codegen`
`727`	`730`	`#[graphql_object]`
`728`	`731`	`impl<'p> Droid<'p, i32> {`
`729`	`732`	`async fn id(&self) -> i32 {`
`@@ -735,6 +738,7 @@ mod nested_generic_lifetime_async {`
`735`	`738`	`}`
`736`	`739`	`}`
`737`	`740`
	`741`	`+ #[allow(clippy::needless_lifetimes)] // required by codegen`
`738`	`742`	`#[graphql_object(name = "DroidString")]`
`739`	`743`	`impl<'id, 'p> Droid<'p, &'id str> {`
`740`	`744`	`async fn id(&self) -> &str {`
`@@ -751,6 +755,7 @@ mod nested_generic_lifetime_async {`
`751`	`755`	`home_planet: &'p str,`
`752`	`756`	`}`
`753`	`757`
	`758`	`+ #[allow(clippy::needless_lifetimes)] // required by codegen`
`754`	`759`	`#[graphql_object]`
`755`	`760`	`impl<'p> Human<'p, i32> {`
`756`	`761`	`async fn id(&self) -> i32 {`
`@@ -769,6 +774,7 @@ mod nested_generic_lifetime_async {`
`769`	`774`	`}`
`770`	`775`	`}`
`771`	`776`
	`777`	`+ #[allow(clippy::needless_lifetimes)] // required by codegen`
`772`	`778`	`#[graphql_object(name = "HumanString")]`
`773`	`779`	`impl<'id, 'p> Human<'p, &'id str> {`
`774`	`780`	`async fn id(&self) -> &str {`