switch to edition 2024 and MSRV 1.85

wfraser · wfraser · commit 25f8753bf507 · 2026-02-08T15:54:16.000-08:00
diff --git a/.github/workflows/cargo-test.yml b/.github/workflows/cargo-test.yml
@@ -20,7 +20,7 @@ jobs:
 
       - name: Run rustfmt
         run: |
-          find . -path ./src/generated -prune -o -name '*.rs' -print | xargs rustup run nightly rustfmt --edition 2021 --check
+          find . -path ./src/generated -prune -o -name '*.rs' -print | xargs rustup run nightly rustfmt --edition 2024 --check
 
       - name: Set up Python
         uses: actions/setup-python@v6.1.0
@@ -39,10 +39,10 @@ jobs:
         run: if [[ ! -z `git status --porcelain=v1` ]]; then echo "::error::Workspace is dirty after running generator. Did you remember to check in the generated files?"; exit 1; fi
 
       - name: Install MSRV toolchain
-        run: rustup install 1.84.0 --profile minimal
+        run: rustup install 1.85.0 --profile minimal
 
       - name: Run cargo test
-        run: rustup run 1.84.0 cargo test --all-features
+        run: rustup run 1.85.0 cargo test --all-features
 
       - name: Run clippy
         run: rustup run nightly cargo clippy --all-targets --all-features -- --deny warnings
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,7 +2,7 @@
 name = "dropbox-sdk"
 version = "0.19.1"
 authors = ["Bill Fraser <wfraser@dropbox.com>"]
-edition = "2021"
+edition = "2024"
 description = "Rust bindings to the Dropbox API, generated by Stone from the official spec."
 categories = ["api-bindings"]
 keywords = ["dropbox", "sdk", "cloud", "storage"]
@@ -11,8 +11,8 @@ license = "Apache-2.0"
 readme = "README.md"
 
 # Keep this at least 1 year old.
-# 1.84 is required for the MSRV-aware dependency resolver
-rust-version = "1.84.0" # Jan 9, 2025
+# 1.85 is required for edition 2024
+rust-version = "1.85.0" # Feb 20, 2025
 
 [dependencies]
 async-lock = ">=3.3.0, <=3.4.1" # remove conditions once MSRV is 1.85
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,6 +1,7 @@
 # unreleased (v0.19.2)
 xxxx-yy-zz
-* MSRV raised to 1.84.0
+* MSRV raised to 1.85.0
+* Rust edition switched to 2024
 * reqwest (default async HTTP client impl) updated from version 0.12 to 0.13
 
 # v0.19.1
diff --git a/examples/large-file-upload.rs b/examples/large-file-upload.rs
@@ -4,9 +4,9 @@
 //! files that would not fit in a single HTTP request, including allowing the user to resume
 //! interrupted uploads, and uploading blocks in parallel.
 
+use dropbox_sdk::Error::Api;
 use dropbox_sdk::default_client::UserAuthDefaultClient;
 use dropbox_sdk::files;
-use dropbox_sdk::Error::Api;
 use std::collections::HashMap;
 use std::fs::File;
 use std::io::{Seek, SeekFrom};
diff --git a/src/async_client_trait.rs b/src/async_client_trait.rs
@@ -1,10 +1,10 @@
 //! Everything needed to implement your async HTTP client.
 
-pub use crate::client_trait_common::{HttpRequest, TeamSelect};
 use crate::Error;
+pub use crate::client_trait_common::{HttpRequest, TeamSelect};
 use bytes::Bytes;
 use futures::AsyncRead;
-use std::future::{ready, Future};
+use std::future::{Future, ready};
 use std::sync::Arc;
 
 /// The base HTTP asynchronous client trait.
diff --git a/src/client_helpers.rs b/src/client_helpers.rs
@@ -1,14 +1,14 @@
 // Copyright (c) 2019-2025 Dropbox, Inc.
 
+use crate::Error;
 use crate::async_client_trait::{HttpClient, HttpRequestResult, HttpRequestResultRaw};
 use crate::client_trait_common::{Endpoint, HttpRequest, ParamsType, Style, TeamSelect};
 use crate::types::auth::{AccessError, AuthError, RateLimitReason};
-use crate::Error;
 use bytes::Bytes;
 use futures::{AsyncRead, AsyncReadExt};
+use serde::Deserialize;
 use serde::de::DeserializeOwned;
 use serde::ser::Serialize;
-use serde::Deserialize;
 use std::error::Error as StdError;
 use std::io::ErrorKind;
 use std::sync::Arc;
@@ -355,9 +355,9 @@ where
 
 #[cfg(feature = "sync_routes")]
 mod sync_helpers {
+    use crate::Error;
     use crate::async_client_trait::{HttpRequestResult, SyncReadAdapter};
     use crate::client_trait as sync;
-    use crate::Error;
     use futures::{AsyncRead, FutureExt};
     use std::future::Future;
 
diff --git a/src/client_trait.rs b/src/client_trait.rs
@@ -2,8 +2,8 @@
 
 //! Everything needed to implement your HTTP client.
 
-pub use crate::client_trait_common::{HttpRequest, TeamSelect};
 use crate::Error;
+pub use crate::client_trait_common::{HttpRequest, TeamSelect};
 use std::io::Read;
 use std::sync::Arc;
 
diff --git a/src/default_async_client.rs b/src/default_async_client.rs
@@ -10,16 +10,16 @@
 //! This code (and its dependencies) are only built if you use the `default_async_client` Cargo
 //! feature.
 
+use crate::Error;
 use crate::async_client_trait::{
     AppAuthClient, HttpClient, HttpRequest, HttpRequestResultRaw, NoauthClient, TeamAuthClient,
     TeamSelect, UserAuthClient,
 };
 use crate::default_client_common::impl_set_path_root;
 use crate::oauth2::{Authorization, TokenCache};
-use crate::Error;
 use bytes::Bytes;
 use futures::{FutureExt, TryFutureExt, TryStreamExt};
-use std::future::{ready, Future};
+use std::future::{Future, ready};
 use std::str::FromStr;
 use std::sync::Arc;
 
diff --git a/src/default_client.rs b/src/default_client.rs
@@ -11,18 +11,18 @@
 //!
 //! This code (and its dependencies) are only built if you use the `default_client` Cargo feature.
 
+use crate::Error;
 use crate::client_trait::{
     AppAuthClient, HttpClient, HttpRequest, HttpRequestResultRaw, NoauthClient, TeamAuthClient,
     TeamSelect, UserAuthClient,
 };
 use crate::default_client_common::impl_set_path_root;
 use crate::oauth2::{Authorization, TokenCache};
-use crate::Error;
 use futures::FutureExt;
 use std::str::FromStr;
 use std::sync::Arc;
-use ureq::typestate::WithBody;
 use ureq::Agent;
+use ureq::typestate::WithBody;
 
 macro_rules! impl_update_token {
     ($self:ident) => {
diff --git a/src/oauth2.rs b/src/oauth2.rs
@@ -12,19 +12,19 @@
 //! [Dropbox OAuth Guide]: https://developers.dropbox.com/oauth-guide
 //! [OAuth types summary]: https://developers.dropbox.com/oauth-guide#summary
 
+use crate::Error;
 use crate::async_client_trait::NoauthClient;
 use crate::client_helpers::{parse_response, prepare_request};
 use crate::client_trait_common::{Endpoint, ParamsType, Style};
-use crate::Error;
 use async_lock::RwLock;
-use base64::engine::general_purpose::{URL_SAFE, URL_SAFE_NO_PAD};
 use base64::Engine;
+use base64::engine::general_purpose::{URL_SAFE, URL_SAFE_NO_PAD};
 use ring::rand::{SecureRandom, SystemRandom};
 use std::env;
 use std::io::{self, IsTerminal, Write};
 use std::sync::Arc;
-use url::form_urlencoded::Serializer as UrlEncoder;
 use url::Url;
+use url::form_urlencoded::Serializer as UrlEncoder;
 
 /// Which type of OAuth2 flow to use.
 #[derive(Debug, Clone)]
@@ -581,7 +581,7 @@ impl Authorization {
                     _ => {
                         return Err(Error::UnexpectedResponse(
                             "no access token in response!".to_owned(),
-                        ))
+                        ));
                     }
                 }
                 match map.remove("refresh_token") {
@@ -597,7 +597,7 @@ impl Authorization {
             _ => {
                 return Err(Error::UnexpectedResponse(
                     "response is not a JSON object".to_owned(),
-                ))
+                ));
             }
         }
 
diff --git a/tests/async_client_test.rs b/tests/async_client_test.rs
@@ -1,7 +1,7 @@
 use bytes::Bytes;
+use dropbox_sdk::Error;
 use dropbox_sdk::async_client_trait::*;
 use dropbox_sdk::async_routes::check;
-use dropbox_sdk::Error;
 use futures::io::Cursor;
 
 struct TestAsyncClient;
diff --git a/tests/benchmark.rs b/tests/benchmark.rs
@@ -40,29 +40,31 @@ fn fetch_files() {
             let path = file_path(i);
             let expected_bytes = file_bytes(i);
             let c = client.clone();
-            threadpool.execute(move || loop {
-                let arg = files::DownloadArg::new(path.clone());
-                match files::download(c.as_ref(), &arg, None, None) {
-                    Ok(result) => {
-                        let mut read_bytes = Vec::new();
-                        result
-                            .body
-                            .expect("result should have a body")
-                            .read_to_end(&mut read_bytes)
-                            .expect("read_to_end");
-                        assert_eq!(&read_bytes, &expected_bytes);
+            threadpool.execute(move || {
+                loop {
+                    let arg = files::DownloadArg::new(path.clone());
+                    match files::download(c.as_ref(), &arg, None, None) {
+                        Ok(result) => {
+                            let mut read_bytes = Vec::new();
+                            result
+                                .body
+                                .expect("result should have a body")
+                                .read_to_end(&mut read_bytes)
+                                .expect("read_to_end");
+                            assert_eq!(&read_bytes, &expected_bytes);
+                        }
+                        Err(dropbox_sdk::Error::RateLimited {
+                            retry_after_seconds,
+                            ..
+                        }) => {
+                            eprintln!("WARNING: rate-limited {} seconds", retry_after_seconds);
+                            thread::sleep(Duration::from_secs(retry_after_seconds as u64));
+                            continue;
+                        }
+                        Err(e) => panic!("{}: download failed: {:?}", path, e),
                     }
-                    Err(dropbox_sdk::Error::RateLimited {
-                        retry_after_seconds,
-                        ..
-                    }) => {
-                        eprintln!("WARNING: rate-limited {} seconds", retry_after_seconds);
-                        thread::sleep(Duration::from_secs(retry_after_seconds as u64));
-                        continue;
-                    }
-                    Err(e) => panic!("{}: download failed: {:?}", path, e),
+                    break;
                 }
-                break;
             });
         }
 
diff --git a/tests/common/mod.rs b/tests/common/mod.rs
@@ -1,6 +1,6 @@
+use dropbox_sdk::Error::Api;
 use dropbox_sdk::client_trait::UserAuthClient;
 use dropbox_sdk::files;
-use dropbox_sdk::Error::Api;
 use std::sync::Arc;
 use std::thread;
 use std::time::Duration;
diff --git a/tests/sync_client_test.rs b/tests/sync_client_test.rs
@@ -1,6 +1,6 @@
+use dropbox_sdk::Error;
 use dropbox_sdk::client_trait::*;
 use dropbox_sdk::sync_routes::check;
-use dropbox_sdk::Error;
 use std::io::Cursor;
 
 struct TestSyncClient;
