chore(cargo): downgrade to rust 1.85.0 and edition 2021

.github/workflows/ci.yml

@@ -13,15 +13,15 @@ jobs:
       - uses: actions/checkout@v6
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: nightly-2025-06-23
+          toolchain: nightly-2025-01-03
           components: rustfmt, miri, rust-src
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true
       - name: rustfmt (check)
-        run: cargo +nightly-2025-06-23 fmt --all -- --check
+        run: cargo +nightly-2025-01-03 fmt --all -- --check
       - name: miri (check)
-        run: cargo +nightly-2025-06-23 miri test --all-features --lib --bins --no-fail-fast --workspace --exclude wincode-fuzz
+        run: cargo +nightly-2025-01-03 miri test --all-features --lib --bins --no-fail-fast --workspace --exclude wincode-fuzz
 
   lint-test:
     name: clippy & tests (MSRV)
@@ -30,7 +30,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.89.0
+          toolchain: 1.85.0
           components: clippy
       - uses: Swatinem/rust-cache@v2
         with:

Cargo.toml

@@ -14,8 +14,8 @@ authors = ["Anza Maintainers <maintainers@anza.xyz>"]
 repository = "https://github.com/anza-xyz/wincode"
 homepage = "https://anza.xyz/"
 license = "Apache-2.0"
-edition = "2024"
-rust-version = "1.89.0"
+edition = "2021"
+rust-version = "1.85.0"
 
 [workspace.dependencies]
 quote = "1.0.45"

rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.89.0"
+channel = "1.85.0"

wincode-derive/src/assert_zero_copy.rs

@@ -1,6 +1,6 @@
 use {
-    crate::common::{SchemaArgs, StructRepr, get_crate_name},
-    darling::{Error, Result, ast::Data},
+    crate::common::{get_crate_name, SchemaArgs, StructRepr},
+    darling::{ast::Data, Error, Result},
     proc_macro2::TokenStream,
     quote::quote,
     std::borrow::Cow,

wincode-derive/src/common.rs

@@ -1,22 +1,23 @@
 use {
     darling::{
-        FromDeriveInput, FromField, FromMeta, FromVariant, Result,
         ast::{Data, Fields, NestedMeta, Style},
+        FromDeriveInput, FromField, FromMeta, FromVariant, Result,
     },
     proc_macro2::{Span, TokenStream},
-    quote::{ToTokens as _, quote},
+    quote::{quote, ToTokens as _},
     std::{
         borrow::Cow,
         collections::VecDeque,
         fmt::{self, Display},
     },
     syn::{
-        DeriveInput, Expr, ExprLit, GenericArgument, Generics, Ident, Lifetime, Lit, LitInt,
-        Member, Path, Type, TypeImplTrait, TypeParamBound, TypeReference, TypeTraitObject,
-        Visibility, parse_quote,
+        parse_quote,
         spanned::Spanned,
         visit::{self, Visit},
         visit_mut::{self, VisitMut},
+        DeriveInput, Expr, ExprLit, GenericArgument, Generics, Ident, Lifetime, Lit, LitInt,
+        Member, Path, Type, TypeImplTrait, TypeParamBound, TypeReference, TypeTraitObject,
+        Visibility,
     },
 };
 

wincode-derive/src/lib.rs

@@ -5,7 +5,7 @@
 //! Refer to the [`wincode`](https://docs.rs/wincode) crate for examples.
 use {
     proc_macro::TokenStream,
-    syn::{DeriveInput, parse_macro_input},
+    syn::{parse_macro_input, DeriveInput},
 };
 
 mod assert_zero_copy;

wincode-derive/src/schema_read.rs

@@ -2,21 +2,21 @@ use {
     crate::{
         assert_zero_copy::assert_zero_copy,
         common::{
-            Field, FieldsExt, SchemaArgs, StructRepr, TraitImpl, TypeExt, Variant, VariantsExt,
             default_tag_encoding, extract_repr, get_crate_name, get_src_dst,
-            get_src_dst_fully_qualified, suppress_unused_fields,
+            get_src_dst_fully_qualified, suppress_unused_fields, Field, FieldsExt, SchemaArgs,
+            StructRepr, TraitImpl, TypeExt, Variant, VariantsExt,
         },
         uninit_builder::impl_uninit_builder,
     },
     darling::{
-        Error, FromDeriveInput, Result,
         ast::{Data, Fields, Style},
+        Error, FromDeriveInput, Result,
     },
     proc_macro2::TokenStream,
     quote::{quote, quote_spanned},
     syn::{
-        DeriveInput, GenericParam, Generics, PredicateType, Token, Type, WhereClause,
-        WherePredicate, parse_quote, punctuated::Punctuated,
+        parse_quote, punctuated::Punctuated, DeriveInput, GenericParam, Generics, PredicateType,
+        Token, Type, WhereClause, WherePredicate,
     },
 };
 

wincode-derive/src/schema_write.rs

@@ -2,20 +2,20 @@ use {
     crate::{
         assert_zero_copy::assert_zero_copy,
         common::{
-            Field, FieldsExt, SchemaArgs, StructRepr, TraitImpl, Variant, VariantsExt,
             default_tag_encoding, extract_repr, get_crate_name, get_src_dst,
-            suppress_unused_fields,
+            suppress_unused_fields, Field, FieldsExt, SchemaArgs, StructRepr, TraitImpl, Variant,
+            VariantsExt,
         },
     },
     darling::{
-        Error, FromDeriveInput, Result,
         ast::{Data, Fields, Style},
+        Error, FromDeriveInput, Result,
     },
     proc_macro2::TokenStream,
     quote::quote,
     syn::{
-        DeriveInput, GenericParam, Generics, PredicateType, Token, Type, WherePredicate,
-        parse_quote, punctuated::Punctuated,
+        parse_quote, punctuated::Punctuated, DeriveInput, GenericParam, Generics, PredicateType,
+        Token, Type, WherePredicate,
     },
 };
 

wincode-derive/src/uninit_builder.rs

@@ -1,9 +1,9 @@
 use {
-    crate::common::{SchemaArgs, TypeExt, get_crate_name, get_src_dst_fully_qualified},
-    darling::{Error, FromDeriveInput, Result, ast::Data},
+    crate::common::{get_crate_name, get_src_dst_fully_qualified, SchemaArgs, TypeExt},
+    darling::{ast::Data, Error, FromDeriveInput, Result},
     proc_macro2::{Span, TokenStream},
     quote::{format_ident, quote},
-    syn::{DeriveInput, GenericParam, LitInt, Path, Type, parse_quote},
+    syn::{parse_quote, DeriveInput, GenericParam, LitInt, Path, Type},
 };
 
 pub(crate) fn impl_uninit_builder(args: &SchemaArgs, crate_name: &Path) -> Result<TokenStream> {

wincode/benches/benchmarks.rs

@@ -1,14 +1,14 @@
 use {
-    criterion::{BenchmarkId, Criterion, Throughput, criterion_group, criterion_main},
+    criterion::{criterion_group, criterion_main, BenchmarkId, Criterion, Throughput},
     rand::{Rng as _, SeedableRng},
     serde::{Deserialize, Serialize},
     std::{
         collections::{BTreeMap, BTreeSet, HashMap, LinkedList, VecDeque},
         hint::black_box,
     },
     wincode::{
-        SchemaRead, SchemaWrite, config::DefaultConfig, deserialize, serialize, serialize_into,
-        serialized_size,
+        config::DefaultConfig, deserialize, serialize, serialize_into, serialized_size, SchemaRead,
+        SchemaWrite,
     },
 };
 

wincode/src/config/mod.rs

@@ -42,13 +42,13 @@ pub struct Configuration<
 }
 
 impl<
-    const ZERO_COPY_ALIGN_CHECK: bool,
-    const PREALLOCATION_SIZE_LIMIT: usize,
-    LengthEncoding,
-    ByteOrder,
-    IntEncoding,
-    TagEncoding,
-> Clone
+        const ZERO_COPY_ALIGN_CHECK: bool,
+        const PREALLOCATION_SIZE_LIMIT: usize,
+        LengthEncoding,
+        ByteOrder,
+        IntEncoding,
+        TagEncoding,
+    > Clone
     for Configuration<
         ZERO_COPY_ALIGN_CHECK,
         PREALLOCATION_SIZE_LIMIT,
@@ -64,13 +64,13 @@ impl<
 }
 
 impl<
-    const ZERO_COPY_ALIGN_CHECK: bool,
-    const PREALLOCATION_SIZE_LIMIT: usize,
-    LengthEncoding,
-    ByteOrder,
-    IntEncoding,
-    TagEncoding,
-> Copy
+        const ZERO_COPY_ALIGN_CHECK: bool,
+        const PREALLOCATION_SIZE_LIMIT: usize,
+        LengthEncoding,
+        ByteOrder,
+        IntEncoding,
+        TagEncoding,
+    > Copy
     for Configuration<
         ZERO_COPY_ALIGN_CHECK,
         PREALLOCATION_SIZE_LIMIT,
@@ -122,13 +122,13 @@ impl Configuration {
 pub type DefaultConfig = Configuration;
 
 impl<
-    const ZERO_COPY_ALIGN_CHECK: bool,
-    const PREALLOCATION_SIZE_LIMIT: usize,
-    LengthEncoding,
-    ByteOrder,
-    IntEncoding,
-    TagEncoding,
->
+        const ZERO_COPY_ALIGN_CHECK: bool,
+        const PREALLOCATION_SIZE_LIMIT: usize,
+        LengthEncoding,
+        ByteOrder,
+        IntEncoding,
+        TagEncoding,
+    >
     Configuration<
         ZERO_COPY_ALIGN_CHECK,
         PREALLOCATION_SIZE_LIMIT,
@@ -391,13 +391,13 @@ pub trait ConfigCore: 'static + Sized {
 }
 
 impl<
-    const ZERO_COPY_ALIGN_CHECK: bool,
-    const PREALLOCATION_SIZE_LIMIT: usize,
-    LengthEncoding: 'static,
-    B,
-    I,
-    TagEncoding: 'static,
-> ConfigCore
+        const ZERO_COPY_ALIGN_CHECK: bool,
+        const PREALLOCATION_SIZE_LIMIT: usize,
+        LengthEncoding: 'static,
+        B,
+        I,
+        TagEncoding: 'static,
+    > ConfigCore
     for Configuration<
         ZERO_COPY_ALIGN_CHECK,
         PREALLOCATION_SIZE_LIMIT,
@@ -432,13 +432,14 @@ pub trait Config: ConfigCore {
 }
 
 impl<
-    const ZERO_COPY_ALIGN_CHECK: bool,
-    const PREALLOCATION_SIZE_LIMIT: usize,
-    LengthEncoding: 'static,
-    B,
-    I,
-    T,
-> Config for Configuration<ZERO_COPY_ALIGN_CHECK, PREALLOCATION_SIZE_LIMIT, LengthEncoding, B, I, T>
+        const ZERO_COPY_ALIGN_CHECK: bool,
+        const PREALLOCATION_SIZE_LIMIT: usize,
+        LengthEncoding: 'static,
+        B,
+        I,
+        T,
+    > Config
+    for Configuration<ZERO_COPY_ALIGN_CHECK, PREALLOCATION_SIZE_LIMIT, LengthEncoding, B, I, T>
 where
     LengthEncoding: SeqLen<Self>,
     T: TagEncoding<Self>,

wincode/src/config/serde.rs

@@ -3,9 +3,9 @@
 use alloc::vec::Vec;
 use {
     crate::{
-        ReadResult, SchemaRead, SchemaReadOwned, SchemaWrite, WriteResult,
         config::{Config, ConfigCore},
         io::{Reader, Writer},
+        ReadResult, SchemaRead, SchemaReadOwned, SchemaWrite, WriteResult,
     },
     core::mem::MaybeUninit,
 };

wincode/src/io/mod.rs

@@ -1,7 +1,7 @@
 //! [`Reader`] and [`Writer`] implementations.
 use {
     core::{
-        mem::{self, MaybeUninit, transmute},
+        mem::{self, transmute, MaybeUninit},
         ptr,
         slice::{from_raw_parts, from_raw_parts_mut},
     },

wincode/src/io/std_read.rs

@@ -1,6 +1,6 @@
 use {
-    crate::io::{ReadResult, Reader, read_size_limit},
-    core::mem::{MaybeUninit, transmute},
+    crate::io::{read_size_limit, ReadResult, Reader},
+    core::mem::{transmute, MaybeUninit},
     std::io::{self, BufReader, Read},
 };
 

wincode/src/io/std_write.rs

@@ -55,7 +55,7 @@ impl<W: Write + ?Sized> Writer for BufWriter<W> {
 mod tests {
     use {
         super::*,
-        crate::serde::{Serialize, serialize},
+        crate::serde::{serialize, Serialize},
     };
 
     const MAGIC: u64 = 0xdeadbeef_cafebabe;

wincode/src/len.rs

@@ -1,14 +1,14 @@
 //! Support for heterogenous sequence length encoding.
 use {
     crate::{
-        SchemaRead, SchemaWrite, TypeMeta,
         config::{ConfigCore, PREALLOCATION_SIZE_LIMIT_DISABLED},
         error::{
-            PreallocationError, ReadResult, WriteResult, pointer_sized_decode_error,
-            preallocation_size_limit, write_length_encoding_overflow,
+            pointer_sized_decode_error, preallocation_size_limit, write_length_encoding_overflow,
+            PreallocationError, ReadResult, WriteResult,
         },
         int_encoding::{ByteOrder, Endian},
         io::{Reader, Writer},
+        SchemaRead, SchemaWrite, TypeMeta,
     },
     core::{any::type_name, marker::PhantomData},
 };
@@ -386,8 +386,8 @@ pub mod short_vec {
     use {
         super::*,
         crate::{
+            error::{write_length_encoding_overflow, ReadError},
             SchemaReadContext,
-            error::{ReadError, write_length_encoding_overflow},
         },
         core::mem::MaybeUninit,
     };

wincode/src/schema/containers.rs

@@ -59,7 +59,7 @@
 #[cfg(all(feature = "alloc", target_has_atomic = "ptr"))]
 use alloc::sync::Arc as AllocArc;
 use {
-    crate::{TypeMeta, config::ConfigCore, error::ReadResult, io::Reader, schema::SchemaRead},
+    crate::{config::ConfigCore, error::ReadResult, io::Reader, schema::SchemaRead, TypeMeta},
     core::{
         mem::{self, MaybeUninit},
         ptr,
@@ -73,8 +73,8 @@ use {
         io::Writer,
         len::SeqLen,
         schema::{
-            SchemaReadContext, SchemaWrite, size_of_elem_iter, size_of_elem_slice, write_elem_iter,
-            write_elem_slice_prealloc_check,
+            size_of_elem_iter, size_of_elem_slice, write_elem_iter,
+            write_elem_slice_prealloc_check, SchemaReadContext, SchemaWrite,
         },
     },
     alloc::{boxed::Box as AllocBox, collections, rc::Rc as AllocRc, vec},

wincode/src/schema/external/bv.rs

@@ -1,10 +1,10 @@
 use {
     crate::{
-        ReadResult, SchemaRead, SchemaWrite, TypeMeta, WriteResult,
         config::Config,
         error::invalid_tag_encoding,
         io::{Reader, Writer},
         len::SeqLen,
+        ReadResult, SchemaRead, SchemaWrite, TypeMeta, WriteResult,
     },
     bv::{BitVec, Bits, BlockType},
     core::mem::MaybeUninit,

wincode/src/schema/external/bytes.rs

@@ -1,8 +1,8 @@
 use {
     crate::{
-        ReadResult, SchemaRead, SchemaWrite, WriteResult,
         config::Config,
         io::{Reader, Writer},
+        ReadResult, SchemaRead, SchemaWrite, WriteResult,
     },
     alloc::boxed::Box,
     bytes::{Bytes, BytesMut},

wincode/src/schema/external/ecow.rs

@@ -1,10 +1,10 @@
 use {
     crate::{
-        ReadResult, SchemaRead, SchemaWrite, WriteResult,
         config::Config,
         error::invalid_utf8_encoding,
         io::{BorrowKind, Reader, Writer},
         len::SeqLen,
+        ReadResult, SchemaRead, SchemaWrite, WriteResult,
     },
     alloc::vec::Vec,
     core::{mem::MaybeUninit, str},