chore: bump to 1.85, edition 2024 (#1172)

Author: obmarg

.github/workflows/rust.yml

@@ -25,7 +25,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: dtolnay/rust-toolchain@1.80.0
+      - uses: dtolnay/rust-toolchain@1.85.0
         with:
           components: rustfmt
       - name: Check format
@@ -40,7 +40,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: dtolnay/rust-toolchain@1.80.0
+      - uses: dtolnay/rust-toolchain@1.85.0
         with:
           components: rustfmt
 

.gitignore

@@ -6,3 +6,4 @@
 .DS_Store
 
 .envrc
+.jj

Cargo.toml

@@ -32,12 +32,12 @@ default-members = [
 
 [workspace.package]
 authors = ["Graeme Coupar <graeme@turbofish.tech>"]
-edition = "2021"
+edition = "2024"
 homepage = "https://cynic-rs.dev"
 repository = "https://github.com/obmarg/cynic"
 license = "MPL-2.0"
 version = "3.12.0"
-rust-version = "1.80"
+rust-version = "1.85"
 
 [workspace.dependencies]
 darling = "0.20"

cynic-cli/src/introspect.rs

@@ -52,7 +52,9 @@ pub(crate) enum IntrospectError {
     GraphQlError,
     #[error(transparent)]
     HttpError(#[from] cynic::http::CynicReqwestError),
-    #[error("Couldn't parse a header from {0}.  Make sure you've passed a header of the form `Name: Value`")]
+    #[error(
+        "Couldn't parse a header from {0}.  Make sure you've passed a header of the form `Name: Value`"
+    )]
     MalformedHeaderArgument(String),
     #[error("Couldn't convert introspection result into schema: {0}")]
     SchemaError(cynic_introspection::SchemaError),

cynic-codegen/src/enum_derive/mod.rs

@@ -7,8 +7,8 @@ use crate::{
     error::Errors,
     idents::RenameAll,
     schema::{
-        types::{EnumType, EnumValue},
         Schema, Unvalidated,
+        types::{EnumType, EnumValue},
     },
 };
 

cynic-codegen/src/fragment_derive/arguments/mod.rs

@@ -11,7 +11,7 @@ use crate::{
 
 pub use self::{
     output::Output,
-    parsing::{arguments_from_field_attrs, CynicArguments, FieldArgument, FieldArgumentValue},
+    parsing::{CynicArguments, FieldArgument, FieldArgumentValue, arguments_from_field_attrs},
 };
 
 pub(super) use self::parsing::ArgumentLiteral;

cynic-codegen/src/fragment_derive/arguments/output.rs

@@ -1,4 +1,4 @@
-use quote::{format_ident, quote, ToTokens, TokenStreamExt};
+use quote::{ToTokens, TokenStreamExt, format_ident, quote};
 
 use crate::idents::to_pascal_case;
 

cynic-codegen/src/fragment_derive/arguments/parsing.rs

@@ -1,10 +1,10 @@
 use proc_macro2::Span;
 use syn::{
+    Ident, Result, Token,
     ext::IdentExt,
     parse::{Parse, ParseStream},
     punctuated::Punctuated,
     spanned::Spanned,
-    Ident, Result, Token,
 };
 
 pub fn arguments_from_field_attrs(

cynic-codegen/src/fragment_derive/arguments/tests.rs

@@ -2,7 +2,7 @@ use proc_macro2::Span;
 use rstest::rstest;
 use syn::parse_quote;
 
-use crate::schema::{types::Type, Schema, SchemaInput};
+use crate::schema::{Schema, SchemaInput, types::Type};
 
 use super::{analyse::analyse_field_arguments, parsing::CynicArguments};
 
@@ -55,14 +55,10 @@ fn test_analyse_errors_without_argument_struct() {
         parse_quote! { filters: $aVaraible, optionalFilters: $anotherVar };
     let literals = literals.arguments.into_iter().collect::<Vec<_>>();
 
-    insta::assert_debug_snapshot!(analyse_field_arguments(
-        &schema,
-        literals,
-        field,
-        None,
-        Span::call_site()
+    insta::assert_debug_snapshot!(
+        analyse_field_arguments(&schema, literals, field, None, Span::call_site())
+            .map(|o| o.arguments)
     )
-    .map(|o| o.arguments))
 }
 
 const SCHEMA: &str = r#"

cynic-codegen/src/fragment_derive/deserialize_impl.rs

@@ -76,7 +76,7 @@ impl quote::ToTokens for DeserializeImpl<'_> {
 
 impl quote::ToTokens for StandardDeserializeImpl<'_> {
     fn to_tokens(&self, tokens: &mut TokenStream) {
-        use quote::{quote, TokenStreamExt};
+        use quote::{TokenStreamExt, quote};
 
         let target_struct = &self.target_struct;
         let serialized_names = self
@@ -215,7 +215,7 @@ impl quote::ToTokens for StandardDeserializeImpl<'_> {
 
 impl quote::ToTokens for SpreadingDeserializeImpl<'_> {
     fn to_tokens(&self, tokens: &mut TokenStream) {
-        use quote::{quote, TokenStreamExt};
+        use quote::{TokenStreamExt, quote};
 
         let target_struct = &self.target_struct;