Skip to content

Commit

Permalink
Remove a bunch of unused dependencies (#4482)
Browse files Browse the repository at this point in the history
I used `cargo machete` to find quite a few of these
(https://github.com/bnjbvr/cargo-machete) .

Notably this incurs a significant amount of false positives for the
`client/` crates using progenitor. I *think* this is because progenitor
provides a macro, and simply expects clients to have the necessary
dependencies on the crates being used (including: `chrono`, `futures`,
`regress`, `serde`, etc).
  • Loading branch information
smklein authored Nov 13, 2023
1 parent 85ac741 commit 6d73cf8
Show file tree
Hide file tree
Showing 28 changed files with 3 additions and 142 deletions.
72 changes: 1 addition & 71 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions clients/bootstrap-agent-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ edition = "2021"
license = "MPL-2.0"

[dependencies]
async-trait.workspace = true
chrono.workspace = true
omicron-common.workspace = true
progenitor.workspace = true
ipnetwork.workspace = true
Expand Down
2 changes: 0 additions & 2 deletions clients/dns-service-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,5 @@ progenitor.workspace = true
reqwest = { workspace = true, features = ["json", "rustls-tls", "stream"] }
schemars.workspace = true
serde.workspace = true
serde_json.workspace = true
slog.workspace = true
uuid.workspace = true
omicron-workspace-hack.workspace = true
3 changes: 0 additions & 3 deletions common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,15 @@ dropshot.workspace = true
futures.workspace = true
hex.workspace = true
http.workspace = true
hyper.workspace = true
ipnetwork.workspace = true
macaddr.workspace = true
lazy_static.workspace = true
proptest = { workspace = true, optional = true }
rand.workspace = true
reqwest = { workspace = true, features = ["rustls-tls", "stream"] }
ring.workspace = true
schemars = { workspace = true, features = ["chrono", "uuid1"] }
semver.workspace = true
serde.workspace = true
serde_derive.workspace = true
serde_human_bytes.workspace = true
serde_json.workspace = true
serde_with.workspace = true
Expand Down
1 change: 0 additions & 1 deletion dev-tools/omicron-dev/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ nexus-test-interface.workspace = true
omicron-common.workspace = true
omicron-nexus.workspace = true
omicron-test-utils.workspace = true
omicron-sled-agent.workspace = true
# See omicron-rpaths for more about the "pq-sys" dependency.
pq-sys = "*"
rcgen.workspace = true
Expand Down
1 change: 0 additions & 1 deletion dev-tools/thing-flinger/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ omicron-package.workspace = true
serde.workspace = true
serde_derive.workspace = true
thiserror.workspace = true
toml.workspace = true
omicron-workspace-hack.workspace = true

[[bin]]
Expand Down
4 changes: 0 additions & 4 deletions end-to-end-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ license = "MPL-2.0"
anyhow = { workspace = true, features = ["backtrace"] }
async-trait.workspace = true
base64.workspace = true
camino.workspace = true
chrono.workspace = true
futures.workspace = true
http.workspace = true
omicron-sled-agent.workspace = true
omicron-test-utils.workspace = true
Expand All @@ -19,9 +17,7 @@ rand.workspace = true
reqwest.workspace = true
russh = "0.39.0"
russh-keys = "0.38.0"
serde_json.workspace = true
tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
toml.workspace = true
trust-dns-resolver.workspace = true
uuid.workspace = true
omicron-workspace-hack.workspace = true
2 changes: 0 additions & 2 deletions gateway-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ license = "MPL-2.0"
anyhow.workspace = true
clap.workspace = true
futures.workspace = true
hex.workspace = true
omicron-common.workspace = true
libc.workspace = true
reqwest.workspace = true
serde.workspace = true
serde_json.workspace = true
Expand Down
4 changes: 0 additions & 4 deletions gateway/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ license = "MPL-2.0"

[dependencies]
anyhow.workspace = true
async-trait.workspace = true
base64.workspace = true
ciborium.workspace = true
clap.workspace = true
dropshot.workspace = true
futures.workspace = true
Expand All @@ -23,7 +21,6 @@ omicron-common.workspace = true
once_cell.workspace = true
schemars.workspace = true
serde.workspace = true
serde_human_bytes.workspace = true
signal-hook.workspace = true
signal-hook-tokio.workspace = true
slog.workspace = true
Expand All @@ -32,7 +29,6 @@ thiserror.workspace = true
tokio = { workspace = true, features = ["full"] }
tokio-stream.workspace = true
tokio-tungstenite.workspace = true
tokio-util.workspace = true
toml.workspace = true
uuid.workspace = true
omicron-workspace-hack.workspace = true
Expand Down
2 changes: 0 additions & 2 deletions installinator-artifactd/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,13 @@ license = "MPL-2.0"
[dependencies]
anyhow.workspace = true
async-trait.workspace = true
camino.workspace = true
clap.workspace = true
dropshot.workspace = true
hyper.workspace = true
schemars.workspace = true
serde.workspace = true
serde_json.workspace = true
slog.workspace = true
tokio.workspace = true
uuid.workspace = true

installinator-common.workspace = true
Expand Down
1 change: 0 additions & 1 deletion installinator-common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ license = "MPL-2.0"
anyhow.workspace = true
camino.workspace = true
illumos-utils.workspace = true
omicron-common.workspace = true
schemars.workspace = true
serde.workspace = true
serde_json.workspace = true
Expand Down
4 changes: 0 additions & 4 deletions installinator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,8 @@ installinator-common.workspace = true
ipcc-key-value.workspace = true
itertools.workspace = true
libc.workspace = true
once_cell.workspace = true
omicron-common.workspace = true
progenitor-client.workspace = true
reqwest.workspace = true
serde.workspace = true
sha2.workspace = true
sled-hardware.workspace = true
slog.workspace = true
Expand All @@ -38,7 +35,6 @@ smf.workspace = true
tempfile.workspace = true
thiserror.workspace = true
tokio = { workspace = true, features = ["full"] }
toml.workspace = true
tufaceous-lib.workspace = true
update-engine.workspace = true
uuid.workspace = true
Expand Down
1 change: 0 additions & 1 deletion internal-dns/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ omicron-common.workspace = true
reqwest = { workspace = true, features = ["rustls-tls", "stream"] }
slog.workspace = true
thiserror.workspace = true
trust-dns-proto.workspace = true
trust-dns-resolver.workspace = true
uuid.workspace = true
omicron-workspace-hack.workspace = true
Expand Down
8 changes: 0 additions & 8 deletions nexus/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,10 @@ anyhow.workspace = true
assert_matches.workspace = true
async-trait.workspace = true
base64.workspace = true
bb8.workspace = true
cancel-safe-futures.workspace = true
camino.workspace = true
clap.workspace = true
chrono.workspace = true
cookie.workspace = true
crucible-agent-client.workspace = true
crucible-pantry-client.workspace = true
dns-service-client.workspace = true
Expand All @@ -36,16 +34,12 @@ ipnetwork.workspace = true
lazy_static.workspace = true
macaddr.workspace = true
mime_guess.workspace = true
newtype_derive.workspace = true
# Not under "dev-dependencies"; these also need to be implemented for
# integration tests.
nexus-test-interface.workspace = true
num-integer.workspace = true
once_cell.workspace = true
openssl.workspace = true
openssl-sys.workspace = true
openssl-probe.workspace = true
oso.workspace = true
oximeter-client.workspace = true
oximeter-db.workspace = true
parse-display.workspace = true
Expand Down Expand Up @@ -75,11 +69,9 @@ tempfile.workspace = true
thiserror.workspace = true
tokio = { workspace = true, features = ["full"] }
tokio-postgres = { workspace = true, features = ["with-serde_json-1"] }
toml.workspace = true
tough.workspace = true
trust-dns-resolver.workspace = true
uuid.workspace = true
usdt.workspace = true

nexus-defaults.workspace = true
nexus-db-model.workspace = true
Expand Down
1 change: 0 additions & 1 deletion nexus/db-model/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ parse-display.workspace = true
pq-sys = "*"
rand.workspace = true
ref-cast.workspace = true
thiserror.workspace = true
schemars = { workspace = true, features = ["chrono", "uuid1"] }
semver.workspace = true
serde.workspace = true
Expand Down
10 changes: 0 additions & 10 deletions nexus/db-queries/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,18 @@ diesel-dtrace.workspace = true
dropshot.workspace = true
futures.workspace = true
headers.workspace = true
hex.workspace = true
http.workspace = true
hyper.workspace = true
ipnetwork.workspace = true
lazy_static.workspace = true
macaddr.workspace = true
newtype_derive.workspace = true
once_cell.workspace = true
openssl.workspace = true
openssl-sys.workspace = true
openssl-probe.workspace = true
oso.workspace = true
paste.workspace = true
# See omicron-rpaths for more about the "pq-sys" dependency.
pq-sys = "*"
rand.workspace = true
ref-cast.workspace = true
reqwest = { workspace = true, features = [ "json" ] }
ring.workspace = true
samael.workspace = true
serde.workspace = true
serde_json.workspace = true
Expand All @@ -51,14 +44,11 @@ static_assertions.workspace = true
steno.workspace = true
thiserror.workspace = true
tokio = { workspace = true, features = [ "full" ] }
tokio-postgres = { workspace = true, features = [ "with-serde_json-1" ] }
toml.workspace = true
uuid.workspace = true
usdt.workspace = true

authz-macros.workspace = true
db-macros.workspace = true
nexus-defaults.workspace = true
nexus-db-model.workspace = true
nexus-types.workspace = true
omicron-common.workspace = true
Expand Down
1 change: 0 additions & 1 deletion nexus/inventory/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ license = "MPL-2.0"
[dependencies]
anyhow.workspace = true
chrono.workspace = true
futures.workspace = true
gateway-client.workspace = true
gateway-messages.workspace = true
nexus-types.workspace = true
Expand Down
2 changes: 0 additions & 2 deletions nexus/test-interface/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ license = "MPL-2.0"

[dependencies]
async-trait.workspace = true
dropshot.workspace = true
internal-dns.workspace = true
nexus-types.workspace = true
omicron-common.workspace = true
slog.workspace = true
Expand Down
1 change: 0 additions & 1 deletion nexus/test-utils-macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ license = "MPL-2.0"
proc-macro = true

[dependencies]
proc-macro2.workspace = true
quote.workspace = true
syn = { workspace = true, features = [ "fold", "parsing" ] }
omicron-workspace-hack.workspace = true
4 changes: 0 additions & 4 deletions nexus/test-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,12 @@ omicron-passwords.workspace = true
omicron-sled-agent.workspace = true
omicron-test-utils.workspace = true
oximeter.workspace = true
oximeter-client.workspace = true
oximeter-collector.workspace = true
oximeter-producer.workspace = true
parse-display.workspace = true
serde.workspace = true
serde_json.workspace = true
serde_urlencoded.workspace = true
slog.workspace = true
tempfile.workspace = true
trust-dns-proto.workspace = true
trust-dns-resolver.workspace = true
uuid.workspace = true
omicron-workspace-hack.workspace = true
Expand Down
3 changes: 0 additions & 3 deletions nexus/types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@ anyhow.workspace = true
chrono.workspace = true
base64.workspace = true
futures.workspace = true
newtype_derive.workspace = true
openssl.workspace = true
openssl-sys.workspace = true
openssl-probe.workspace = true
parse-display.workspace = true
schemars = { workspace = true, features = ["chrono", "uuid1"] }
serde.workspace = true
Expand Down
1 change: 0 additions & 1 deletion oximeter/producer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ dropshot.workspace = true
nexus-client.workspace = true
omicron-common.workspace = true
oximeter.workspace = true
reqwest = { workspace = true, features = [ "json" ] }
schemars = { workspace = true, features = [ "uuid1", "bytes", "chrono" ] }
serde.workspace = true
slog.workspace = true
Expand Down
3 changes: 0 additions & 3 deletions package/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,13 @@ futures.workspace = true
hex.workspace = true
illumos-utils.workspace = true
indicatif.workspace = true
omicron-common.workspace = true
omicron-zone-package.workspace = true
petgraph.workspace = true
rayon.workspace = true
reqwest = { workspace = true, features = [ "rustls-tls" ] }
ring.workspace = true
semver.workspace = true
serde.workspace = true
serde_derive.workspace = true
sled-hardware.workspace = true
slog.workspace = true
slog-async.workspace = true
Expand All @@ -29,7 +27,6 @@ smf.workspace = true
strum.workspace = true
swrite.workspace = true
tar.workspace = true
tempfile.workspace = true
thiserror.workspace = true
tokio = { workspace = true, features = [ "full" ] }
toml.workspace = true
Expand Down
4 changes: 0 additions & 4 deletions sled-agent/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ license = "MPL-2.0"
anyhow.workspace = true
async-trait.workspace = true
base64.workspace = true
bincode.workspace = true
bootstore.workspace = true
bootstrap-agent-client.workspace = true
bytes.workspace = true
Expand Down Expand Up @@ -48,8 +47,6 @@ once_cell.workspace = true
oximeter.workspace = true
oximeter-instruments.workspace = true
oximeter-producer.workspace = true
percent-encoding.workspace = true
progenitor.workspace = true
propolis-client = { workspace = true, features = [ "generated-migration" ] }
propolis-server.workspace = true # Only used by the simulated sled agent
rand = { workspace = true, features = ["getrandom"] }
Expand All @@ -70,7 +67,6 @@ tar.workspace = true
thiserror.workspace = true
tofino.workspace = true
tokio = { workspace = true, features = [ "full" ] }
tokio-tungstenite.workspace = true
toml.workspace = true
usdt.workspace = true
uuid.workspace = true
Expand Down
1 change: 0 additions & 1 deletion test-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ camino.workspace = true
camino-tempfile.workspace = true
dropshot.workspace = true
filetime = { workspace = true, optional = true }
futures.workspace = true
headers.workspace = true
hex.workspace = true
http.workspace = true
Expand Down
1 change: 0 additions & 1 deletion wicket-dbg/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ camino.workspace = true
ciborium.workspace = true
clap.workspace = true
crossterm.workspace = true
ratatui.workspace = true
serde.workspace = true
slog.workspace = true
slog-async.workspace = true
Expand Down
Loading

0 comments on commit 6d73cf8

Please sign in to comment.