From 922ee45d78b4afb0b2682c71e0b41b14170c98b8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 31 Aug 2024 13:11:58 +0200 Subject: [PATCH] Bump derive_more from 0.99.18 to 1.0.0 (#1138) Bumps derive_more from 0.99.18 to 1.0.0. --- Cargo.lock | 33 +++++++-------------------------- bench/Cargo.toml | 2 +- bench/src/args/simple.rs | 8 ++++---- integration/Cargo.toml | 2 +- integration/src/test_server.rs | 12 ++++++------ server/Cargo.toml | 2 +- server/src/archiver/mod.rs | 4 ++-- 7 files changed, 22 insertions(+), 41 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 961bfb91d..a5032d1cd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -708,7 +708,7 @@ dependencies = [ "async-trait", "clap", "colored", - "derive_more 0.99.18", + "derive_more", "figlet-rs", "futures", "human_format", @@ -1207,12 +1207,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - [[package]] name = "convert_case" version = "0.6.0" @@ -1433,19 +1427,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "derive_more" -version = "0.99.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" -dependencies = [ - "convert_case 0.4.0", - "proc-macro2", - "quote", - "rustc_version", - "syn 2.0.75", -] - [[package]] name = "derive_more" version = "1.0.0" @@ -1461,7 +1442,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ - "convert_case 0.6.0", + "convert_case", "proc-macro2", "quote", "syn 2.0.75", @@ -2300,10 +2281,10 @@ dependencies = [ "chrono", "clap", "comfy-table", - "convert_case 0.6.0", + "convert_case", "crc32fast", "dashmap", - "derive_more 1.0.0", + "derive_more", "dirs", "fast-async-mutex", "flume", @@ -2428,7 +2409,7 @@ dependencies = [ "assert_cmd", "async-trait", "bytes", - "derive_more 0.99.18", + "derive_more", "futures", "humantime", "iggy", @@ -4317,7 +4298,7 @@ dependencies = [ "clap", "console-subscriber", "dashmap", - "derive_more 0.99.18", + "derive_more", "figlet-rs", "figment", "flume", @@ -4498,7 +4479,7 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cf47a76b3a01cafdeebf4feeb2691f28398a4ac028e6dd33fd61ed04306950c" dependencies = [ - "convert_case 0.6.0", + "convert_case", "proc-macro-error", "proc-macro2", "quote", diff --git a/bench/Cargo.toml b/bench/Cargo.toml index 5cdb79181..2f699128d 100644 --- a/bench/Cargo.toml +++ b/bench/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" async-trait = "0.1.80" clap = { version = "4.5.4", features = ["derive"] } colored = "2.0.4" -derive_more = "0.99.18" +derive_more = "1.0.0" figlet-rs = "0.1.5" futures = "0.3.30" human_format = "1.1.0" diff --git a/bench/src/args/simple.rs b/bench/src/args/simple.rs index 2a46ec300..c004ef203 100644 --- a/bench/src/args/simple.rs +++ b/bench/src/args/simple.rs @@ -2,12 +2,12 @@ use derive_more::Display; #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Display)] pub enum BenchmarkKind { - #[display(fmt = "send messages")] + #[display("send messages")] Send, - #[display(fmt = "poll messages")] + #[display("poll messages")] Poll, - #[display(fmt = "send and poll messages")] + #[display("send and poll messages")] SendAndPoll, - #[display(fmt = "consumer group poll")] + #[display("consumer group poll")] ConsumerGroupPoll, } diff --git a/integration/Cargo.toml b/integration/Cargo.toml index af59057fd..6ce001be2 100644 --- a/integration/Cargo.toml +++ b/integration/Cargo.toml @@ -8,7 +8,7 @@ ahash = { version = "0.8.11", features = ["serde"] } assert_cmd = "2.0.14" async-trait = "0.1.80" bytes = "1.6.0" -derive_more = "0.99.18" +derive_more = "1.0.0" futures = "0.3.30" humantime = "2.1.0" iggy = { path = "../sdk", features = ["iggy-cli"] } diff --git a/integration/src/test_server.rs b/integration/src/test_server.rs index 697e6470c..adbf1c888 100644 --- a/integration/src/test_server.rs +++ b/integration/src/test_server.rs @@ -43,25 +43,25 @@ pub trait ClientFactory: Sync + Send { #[derive(Debug, Clone, Copy, PartialEq, Display)] pub enum Transport { - #[display(fmt = "http")] + #[display("http")] Http, - #[display(fmt = "quic")] + #[display("quic")] Quic, - #[display(fmt = "tcp")] + #[display("tcp")] Tcp, } #[derive(Display, Debug)] enum ServerProtocolAddr { - #[display(fmt = "RAW_TCP:{_0}")] + #[display("RAW_TCP:{_0}")] RawTcp(SocketAddr), - #[display(fmt = "HTTP_TCP:{_0}")] + #[display("HTTP_TCP:{_0}")] HttpTcp(SocketAddr), - #[display(fmt = "QUIC_UDP:{_0}")] + #[display("QUIC_UDP:{_0}")] QuicUdp(SocketAddr), } diff --git a/server/Cargo.toml b/server/Cargo.toml index d374a368c..615e60245 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -24,7 +24,7 @@ bytes = "1.6.0" clap = { version = "4.5.4", features = ["derive"] } console-subscriber = { version = "0.2.0", optional = true } dashmap = "6.0.1" -derive_more = "0.99.18" +derive_more = "1.0.0" figlet-rs = "0.1.5" figment = { version = "0.10.18", features = ["json", "toml", "env"] } flume = "0.11.0" diff --git a/server/src/archiver/mod.rs b/server/src/archiver/mod.rs index d301b451e..96dba7de2 100644 --- a/server/src/archiver/mod.rs +++ b/server/src/archiver/mod.rs @@ -12,9 +12,9 @@ use std::str::FromStr; #[serde(rename_all = "lowercase")] pub enum ArchiverKind { #[default] - #[display(fmt = "disk")] + #[display("disk")] Disk, - #[display(fmt = "s3")] + #[display("s3")] S3, }