Upgrade to derive_more 1.0.0

Summary: Update to the latest version. See https://fb.workplace.com/groups/rust.language/posts/26766695309619064 for details. Reviewed By: zertosh, lmvasquezg Differential Revision: D61759196 fbshipit-source-id: b9e0588f15782023604cac02b31f7eb5f442d1fc
facebook · Aug 25, 2024 · d4b7b8a · d4b7b8a
1 parent 36bfc63
commit d4b7b8a
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 7 deletions.
diff --git a/eden/mononoke/bookmarks/Cargo.toml b/eden/mononoke/bookmarks/Cargo.toml
@@ -13,7 +13,7 @@ async-trait = "0.1.71"
 bookmarks_types = { version = "0.1.0", path = "bookmarks_types" }
 clap = { version = "4.5.11", features = ["derive", "env", "string", "unicode", "wrap_help"] }
 context = { version = "0.1.0", path = "../server/context" }
-derive_more = "0.99.17"
+derive_more = { version = "1.0.0", features = ["full"] }
 facet = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
 futures = { version = "0.3.30", features = ["async-await", "compat"] }
 justknobs = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }

diff --git a/eden/mononoke/bookmarks/TARGETS b/eden/mononoke/bookmarks/TARGETS
@@ -20,7 +20,7 @@ rust_library(
         "fbsource//third-party/rust:anyhow",
         "fbsource//third-party/rust:async-trait",
         "fbsource//third-party/rust:clap",
-        "fbsource//third-party/rust:derive_more",
+        "fbsource//third-party/rust:derive_more-1",
         "fbsource//third-party/rust:futures",
         "fbsource//third-party/rust:thiserror",
         ":bookmarks_types",

diff --git a/eden/mononoke/metaconfig/TARGETS b/eden/mononoke/metaconfig/TARGETS
@@ -11,7 +11,7 @@ rust_library(
         "fbsource//third-party/rust:anyhow",
         "fbsource//third-party/rust:ascii",
         "fbsource//third-party/rust:clap",
-        "fbsource//third-party/rust:derive_more",
+        "fbsource//third-party/rust:derive_more-1",
         "fbsource//third-party/rust:mysql_common",
         "fbsource//third-party/rust:regex",
         "fbsource//third-party/rust:rusoto_core",

diff --git a/eden/mononoke/metaconfig/types/Cargo.toml b/eden/mononoke/metaconfig/types/Cargo.toml
@@ -12,7 +12,7 @@ anyhow = "1.0.75"
 ascii = "1.0"
 bookmarks_types = { version = "0.1.0", path = "../../bookmarks/bookmarks_types" }
 clap = { version = "4.5.11", features = ["derive", "env", "string", "unicode", "wrap_help"] }
-derive_more = "0.99.17"
+derive_more = { version = "1.0.0", features = ["full"] }
 facet = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
 mononoke_types = { version = "0.1.0", path = "../../mononoke_types" }
 mysql_common = { version = "0.29.0", features = ["chrono", "default"] }

diff --git a/eden/mononoke/walker/Cargo.toml b/eden/mononoke/walker/Cargo.toml
@@ -32,7 +32,7 @@ commit_graph = { version = "0.1.0", path = "../repo_attributes/commit_graph/comm
 context = { version = "0.1.0", path = "../server/context" }
 dashmap = { version = "5.5.3", features = ["rayon", "serde"] }
 deleted_manifest = { version = "0.1.0", path = "../derived_data/deleted_manifest" }
-derive_more = "0.99.17"
+derive_more = { version = "1.0.0", features = ["full"] }
 derived_data_manager = { version = "0.1.0", path = "../derived_data/manager" }
 executor_lib = { version = "0.1.0", path = "../cmdlib/sharding" }
 facet = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }

diff --git a/eden/mononoke/walker/TARGETS b/eden/mononoke/walker/TARGETS
@@ -23,7 +23,7 @@ rust_binary(
         "fbsource//third-party/rust:bytes",
         "fbsource//third-party/rust:clap",
         "fbsource//third-party/rust:dashmap",
-        "fbsource//third-party/rust:derive_more",
+        "fbsource//third-party/rust:derive_more-1",
         "fbsource//third-party/rust:filetime",
         "fbsource//third-party/rust:futures",
         "fbsource//third-party/rust:hex",

diff --git a/eden/mononoke/walker/src/detail/progress.rs b/eden/mononoke/walker/src/detail/progress.rs
@@ -7,7 +7,6 @@
 
 use std::collections::HashMap;
 use std::collections::HashSet;
-use std::ops::Add;
 use std::sync::Arc;
 use std::sync::Mutex;
 use std::time::Duration;