Switch to 2024 Rust edition

- bump up MSRV to 1.85
- tune lints for 1.85 Rust

Author: tyranron

.github/workflows/ci.yml

@@ -145,25 +145,21 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        msrv: ["1.75.0"]
+        msrv: ["1.85.0"]
         crate:
           - juniper_codegen
           - juniper
           - juniper_subscriptions
           - juniper_graphql_ws
           - juniper_actix
           - juniper_axum
-          #- juniper_hyper
+          - juniper_hyper
           - juniper_rocket
           - juniper_warp
         os:
           - ubuntu
           - macOS
           - windows
-        include:
-          - { msrv: "1.79.0", crate: "juniper_hyper", os: "ubuntu" }
-          - { msrv: "1.79.0", crate: "juniper_hyper", os: "macOS" }
-          - { msrv: "1.79.0", crate: "juniper_hyper", os: "windows" }
     runs-on: ${{ matrix.os }}-latest
     steps:
       - uses: actions/checkout@v4

benches/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "juniper_benchmarks"
 version = "0.0.0"
-edition = "2021"
+edition = "2024"
 authors = ["Christoph Herzog <[email protected]>"]
 publish = false
 

benches/benches/benchmark.rs

@@ -1,4 +1,4 @@
-use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
+use criterion::{BenchmarkId, Criterion, criterion_group, criterion_main};
 
 use juniper::InputValue;
 use juniper_benchmarks as j;

benches/src/lib.rs

@@ -1,6 +1,6 @@
 use juniper::{
-    graphql_object, DefaultScalarValue, EmptyMutation, EmptySubscription, ExecutionError,
-    FieldError, GraphQLEnum, GraphQLObject, RootNode, Value, Variables,
+    DefaultScalarValue, EmptyMutation, EmptySubscription, ExecutionError, FieldError, GraphQLEnum,
+    GraphQLObject, RootNode, Value, Variables, graphql_object,
 };
 
 pub type QueryResult = Result<

book/book.toml

@@ -16,4 +16,4 @@ create-missing = false
 git_repository_url = "https://github.com/graphql-rust/juniper"
 
 [rust]
-edition = "2021"
+edition = "2024"

book/src/advanced/dataloader.md

@@ -15,7 +15,7 @@ Let's remake our [example of N+1 problem](n_plus_1.md), so it's solved by applyi
 # use std::{collections::HashMap, sync::Arc};
 # use anyhow::anyhow;
 # use dataloader::non_cached::Loader;
-# use juniper::{graphql_object, GraphQLObject};
+# use juniper::{GraphQLObject, graphql_object};
 #
 # type CultId = i32;
 # type UserId = i32;

book/src/advanced/implicit_and_explicit_null.md

@@ -55,7 +55,7 @@ The last two cases rely on being able to distinguish between [explicit and impli
 Unfortunately, plain `Option` is not capable to distinguish them. That's why in [Juniper], this can be done using the [`Nullable`] type:
 ```rust
 # extern crate juniper;
-use juniper::{graphql_object, FieldResult, GraphQLInputObject, Nullable};
+use juniper::{FieldResult, GraphQLInputObject, Nullable, graphql_object};
 
 #[derive(GraphQLInputObject)]
 struct UserPatchInput {

book/src/advanced/lookahead.md

@@ -8,7 +8,7 @@ In [GraphQL], look-ahead machinery allows us to introspect the currently [execut
 In [Juniper], it's represented by the [`Executor::look_ahead()`][20] method.
 ```rust
 # extern crate juniper;
-# use juniper::{graphql_object, Executor, GraphQLObject, ScalarValue};
+# use juniper::{Executor, GraphQLObject, ScalarValue, graphql_object};
 #
 # type UserId = i32;
 #

book/src/advanced/n_plus_1.md

@@ -7,7 +7,7 @@ A common issue with [GraphQL] server implementations is how the [resolvers][2] q
 # extern crate anyhow;
 # extern crate juniper;
 # use anyhow::anyhow;
-# use juniper::{graphql_object, GraphQLObject};
+# use juniper::{GraphQLObject, graphql_object};
 #
 # type CultId = i32;
 # type UserId = i32;

book/src/quickstart.md

@@ -33,8 +33,8 @@ For more advanced mappings, [Juniper] provides multiple macros to map your [Rust
 # use std::fmt::Display;
 #
 use juniper::{
-    graphql_object, EmptySubscription, FieldResult, GraphQLEnum,
-    GraphQLInputObject, GraphQLObject, ScalarValue,
+    EmptySubscription, FieldResult, GraphQLEnum, GraphQLInputObject, 
+    GraphQLObject, ScalarValue, graphql_object,
 };
 #
 # struct DatabasePool;
@@ -162,8 +162,8 @@ To actually serve the [schema], see the guides for our various [server integrati
 # // Only needed due to 2018 edition because the macro is not accessible.
 # #[macro_use] extern crate juniper;
 use juniper::{
-    graphql_object, graphql_value, EmptyMutation, EmptySubscription, 
-    GraphQLEnum, Variables, 
+    EmptyMutation, EmptySubscription, GraphQLEnum, Variables,
+    graphql_object, graphql_value,
 };
 
 #[derive(GraphQLEnum, Clone, Copy)]