Upgrade derive_more crate from 0.99.18 to 1.0.0 version (#199)

- bump up MSRV to 1.75 Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Kai Ren <[email protected]>
instrumentisto · Aug 14, 2024 · f0bddf3 · f0bddf3
1 parent 17c0645
commit f0bddf3
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 30 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,7 +2,7 @@
 name = "baza"
 version = "0.2.0"
 edition = "2021"
-rust-version = "1.70"
+rust-version = "1.75"
 description = "Simply scalable files storage without much fuss."
 authors = ["Instrumentisto Team <[email protected]>"]
 license = "BlueOak-1.0.0"

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@ Baza
 ====
 
 [![CI](https://github.com/instrumentisto/baza/workflows/CI/badge.svg?branch=main "CI")](https://github.com/instrumentisto/baza/actions?query=workflow%3ACI+branch%3Amain)
-[![Rust 1.70+](https://img.shields.io/badge/rustc-1.70+-lightgray.svg "Rust 1.70+")](https://blog.rust-lang.org/2023/06/01/Rust-1.70.0.html)
+[![Rust 1.75+](https://img.shields.io/badge/rustc-1.75+-lightgray.svg "Rust 1.75+")](https://blog.rust-lang.org/2023/12/28/Rust-1.75.0.html)
 
 [Docker Hub](https://hub.docker.com/r/instrumentisto/baza)
 | [GitHub Container Registry](https://github.com/orgs/instrumentisto/packages/container/package/baza)

diff --git a/api/s3/Cargo.toml b/api/s3/Cargo.toml
@@ -2,14 +2,15 @@
 name = "baza-api-s3"
 version = "0.0.0"
 edition = "2021"
-rust-version = "1.70"
+rust-version = "1.75"
 description = "S3 HTTP API implementation of Baza."
 authors = ["Instrumentisto Team <[email protected]>"]
 license = "BlueOak-1.0.0"
 publish = false
 
 [dependencies]
 baza = { package = "baza-lib", path = "../../lib" }
+derive_more = { version = "1", features = ["display", "error", "from"] }
 hyper = "0.14"
 s3-server = "0.2"
 secrecy = "0.8"

diff --git a/api/s3/src/lib.rs b/api/s3/src/lib.rs
@@ -1,14 +1,12 @@
 //! S3 HTTP API implementation of Baza.
 
-// TODO: Remove on next `derive_more` major version upgrade.
-#![allow(clippy::uninlined_format_args)]
-
 use std::{
     convert::Infallible,
     fmt, io,
     net::{TcpListener, ToSocketAddrs},
 };
 
+use derive_more::{Display, Error, From};
 use hyper::{server::Server, service::make_service_fn};
 use s3_server::{
     dto,
@@ -19,11 +17,8 @@ use secrecy::{ExposeSecret as _, SecretString};
 use tokio_util::{compat::FuturesAsyncReadCompatExt as _, io::ReaderStream};
 
 use baza::{
-    async_trait,
-    derive_more::{Display, Error, From},
-    futures::future,
-    tracing, CreateFile, CreateSymlink, Exec, GetFile, ReadOnlyFile,
-    RelativePath,
+    async_trait, futures::future, tracing, CreateFile, CreateSymlink, Exec,
+    GetFile, ReadOnlyFile, RelativePath,
 };
 
 /// [`dto::PutObjectRequest::metadata`] key where [`CreateSymlink::src`] is
@@ -67,11 +62,11 @@ where
 #[derive(Debug, Display, Error, From)]
 pub enum RunHttpServerError {
     /// Failed to bind address.
-    #[display(fmt = "Failed to bind address: {}", _0)]
+    #[display("Failed to bind address: {_0}")]
     BindAddress(io::Error),
 
     /// [`hyper`] server failure.
-    #[display(fmt = "Hyper server failed: {}", _0)]
+    #[display("Hyper server failed: {_0}")]
     Hyper(hyper::Error),
 }
 

diff --git a/e2e/Cargo.toml b/e2e/Cargo.toml
@@ -2,7 +2,7 @@
 name = "baza-e2e"
 version = "0.0.0"
 edition = "2021"
-rust-version = "1.70"
+rust-version = "1.75"
 description = "E2E (end-to-end) tests of this project."
 authors = ["Instrumentisto Team <[email protected]>"]
 license = "BlueOak-1.0.0"

diff --git a/lib/Cargo.toml b/lib/Cargo.toml
@@ -2,7 +2,7 @@
 name = "baza-lib"
 version = "0.0.0"
 edition = "2021"
-rust-version = "1.70"
+rust-version = "1.75"
 description = "Actual Baza implementation as library."
 authors = ["Instrumentisto Team <[email protected]>"]
 license = "BlueOak-1.0.0"
@@ -11,7 +11,7 @@ publish = false
 [dependencies]
 async-fs = "2.1"
 async-trait = "0.1"
-derive_more = "0.99"
+derive_more = { version = "1", features = ["display", "error"] }
 futures = "0.3"
 tracerr = "0.3"
 tracing = "0.1"

diff --git a/lib/src/lib.rs b/lib/src/lib.rs
@@ -12,7 +12,6 @@ use tracerr::Traced;
 use uuid::Uuid;
 
 pub use async_trait::async_trait;
-pub use derive_more;
 pub use futures;
 pub use tracing;
 
@@ -264,7 +263,7 @@ impl TryFrom<String> for RelativePath {
 
 /// Error of parsing [`RelativePath`] from a [`String`].
 #[derive(Debug, Display, Error)]
-#[display(fmt = "Invalid `RelativePath` format")]
+#[display("Invalid `RelativePath` format")]
 pub struct InvalidRelativePathError;
 
 #[cfg(test)]