From 8e1ac9893c76659dcc1be421de0525fa178701ac Mon Sep 17 00:00:00 2001 From: Nipunn Koorapati Date: Mon, 26 Aug 2024 15:26:25 -0700 Subject: [PATCH] Round of cleanup of unused dependencies (#29193) Use cargo machete to find unused dependency arrows and remove them. GitOrigin-RevId: bcf57119bfe0c518f42698e6db6f16931df109d6 --- Cargo.lock | 81 +-------------------------------- Cargo.toml | 1 - crates/config_loader/Cargo.toml | 1 - crates/local_backend/Cargo.toml | 2 - crates/model/Cargo.toml | 7 --- crates/pb/Cargo.toml | 2 +- crates/storage/Cargo.toml | 1 - crates/text_search/Cargo.toml | 3 -- 8 files changed, 2 insertions(+), 96 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b6e2a31a..4aa0054a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -576,15 +576,6 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "backtrace-ext" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "537beee3be4a18fb023b570f80e3ae28003db9167a751266b259926e25539d50" -dependencies = [ - "backtrace", -] - [[package]] name = "base-62" version = "0.1.0" @@ -670,7 +661,7 @@ dependencies = [ "bitflags 2.6.0", "cexpr", "clang-sys", - "itertools 0.10.5", + "itertools 0.12.1", "lazy_static", "lazycell", "proc-macro2", @@ -1279,7 +1270,6 @@ dependencies = [ "common", "convex_macro", "futures", - "miette 7.2.0", "pb", "prost-reflect", "runtime", @@ -3608,12 +3598,6 @@ dependencies = [ "windows-sys 0.45.0", ] -[[package]] -name = "is_ci" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45" - [[package]] name = "is_sorted" version = "0.1.1" @@ -3962,10 +3946,8 @@ dependencies = [ "function_runner", "futures", "futures-async-stream", - "hex", "http 1.1.0", "http-body-util", - "hyper 1.3.1", "hyper-util", "isolate", "keybroker", @@ -4250,16 +4232,8 @@ version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4edc8853320c2a0dab800fbda86253c8938f6ea88510dc92c5f1ed20e794afc1" dependencies = [ - "backtrace", - "backtrace-ext", "cfg-if", "miette-derive 7.2.0", - "owo-colors", - "supports-color", - "supports-hyperlinks", - "supports-unicode", - "terminal_size", - "textwrap", "thiserror", "unicode-width", ] @@ -4414,7 +4388,6 @@ dependencies = [ "thiserror", "tokio", "tracing", - "uuid", "value", ] @@ -4942,12 +4915,6 @@ dependencies = [ "stable_deref_trait", ] -[[package]] -name = "owo-colors" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f" - [[package]] name = "p256" version = "0.11.1" @@ -7019,12 +6986,6 @@ dependencies = [ "serde", ] -[[package]] -name = "smawk" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" - [[package]] name = "smol_str" version = "0.2.2" @@ -7425,7 +7386,6 @@ dependencies = [ "futures-async-stream", "http 1.1.0", "http-body-util", - "hyper 1.3.1", "pb", "pin-project", "runtime", @@ -7518,27 +7478,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "supports-color" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9829b314621dfc575df4e409e79f9d6a66a3bd707ab73f23cb4aa3a854ac854f" -dependencies = [ - "is_ci", -] - -[[package]] -name = "supports-hyperlinks" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c0a1e5168041f5f3ff68ff7d95dcb9c8749df29f6e7e89ada40dd4c9de404ee" - -[[package]] -name = "supports-unicode" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7401a30af6cb5818bb64852270bb722533397edcfc7344954a38f420819ece2" - [[package]] name = "syn" version = "1.0.109" @@ -7858,24 +7797,12 @@ dependencies = [ "metrics", "minitrace", "proptest", - "proptest-derive", "sucds", "tantivy", "tantivy-common", "value", ] -[[package]] -name = "textwrap" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" -dependencies = [ - "smawk", - "unicode-linebreak", - "unicode-width", -] - [[package]] name = "thiserror" version = "1.0.59" @@ -8485,12 +8412,6 @@ version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" -[[package]] -name = "unicode-linebreak" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" - [[package]] name = "unicode-normalization" version = "0.1.22" diff --git a/Cargo.toml b/Cargo.toml index 91f32559..0d4acc08 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -68,7 +68,6 @@ jsonschema = "0.18" levenshtein_automata = "0.2.1" lru = "0.12.0" maplit = "1" -miette = "7.0" mime = "0.3" mime2ext = "0.1.52" minitrace = { version = "0.6", features = [ "enable" ] } diff --git a/crates/config_loader/Cargo.toml b/crates/config_loader/Cargo.toml index ae5c0ba3..a99541b2 100644 --- a/crates/config_loader/Cargo.toml +++ b/crates/config_loader/Cargo.toml @@ -9,7 +9,6 @@ license = "LicenseRef-FSL-1.1-Apache-2.0" anyhow = { workspace = true } common = { path = "../../crates/common" } futures = { workspace = true } -miette = { workspace = true, features = ["fancy"] } prost-reflect = { workspace = true } tokio = { workspace = true } tokio-stream = { workspace = true } diff --git a/crates/local_backend/Cargo.toml b/crates/local_backend/Cargo.toml index f106d2a0..bcd50fdb 100644 --- a/crates/local_backend/Cargo.toml +++ b/crates/local_backend/Cargo.toml @@ -27,10 +27,8 @@ file_storage = { path = "../file_storage" } function_runner = { path = "../function_runner" } futures = { workspace = true } futures-async-stream = { workspace = true } -hex = { workspace = true } http = { workspace = true } http-body-util = { workspace = true } -hyper = { workspace = true } hyper-util = { workspace = true } isolate = { path = "../../crates/isolate" } keybroker = { path = "../keybroker" } diff --git a/crates/model/Cargo.toml b/crates/model/Cargo.toml index f6bd4254..99e4b709 100644 --- a/crates/model/Cargo.toml +++ b/crates/model/Cargo.toml @@ -46,7 +46,6 @@ sync_types = { package = "convex_sync_types", path = "../convex/sync_types" } thiserror = { workspace = true } tokio = { workspace = true } tracing = { workspace = true } -uuid = { workspace = true } value = { path = "../value" } [dev-dependencies] @@ -79,9 +78,3 @@ testing = [ "storage/testing", "value/testing", ] - -[package.metadata.cargo-machete] -ignored = [ - # Used in a serde(with) clause - "serde_bytes", -] diff --git a/crates/pb/Cargo.toml b/crates/pb/Cargo.toml index b16c8ee2..ee581a1b 100644 --- a/crates/pb/Cargo.toml +++ b/crates/pb/Cargo.toml @@ -28,7 +28,7 @@ pb_build = { path = "../pb_build" } [package.metadata.cargo-machete] ignored = [ # Prost/Tonic required via tonic macro - "prost_types", + "prost-types", # Build dependencies not understood "pb_build", ] diff --git a/crates/storage/Cargo.toml b/crates/storage/Cargo.toml index c2ce104f..019beaed 100644 --- a/crates/storage/Cargo.toml +++ b/crates/storage/Cargo.toml @@ -23,7 +23,6 @@ futures = { workspace = true } futures-async-stream = { workspace = true } http = { workspace = true } http-body-util = { workspace = true } -hyper = { workspace = true } pb = { path = "../pb" } pin-project = { workspace = true } runtime = { path = "../runtime", optional = true } diff --git a/crates/text_search/Cargo.toml b/crates/text_search/Cargo.toml index 2e160420..2907f794 100644 --- a/crates/text_search/Cargo.toml +++ b/crates/text_search/Cargo.toml @@ -16,7 +16,6 @@ maplit = { workspace = true } metrics = { path = "../metrics" } minitrace = { workspace = true } proptest = { workspace = true, optional = true } -proptest-derive = { workspace = true, optional = true } sucds = { workspace = true } tantivy = { workspace = true } tantivy-common = { workspace = true } @@ -26,7 +25,6 @@ value = { path = "../value" } common = { path = "../common", features = ["testing"] } metrics = { path = "../metrics", features = ["testing"] } proptest = { workspace = true } -proptest-derive = { workspace = true } value = { path = "../value", features = ["testing"] } [features] @@ -34,6 +32,5 @@ testing = [ "common/testing", "metrics/testing", "proptest", - "proptest-derive", "value/testing" ]