Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed dependencies that cargo-machete claimed were unnecessary #21995

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Removed dependencies that cargo-machete claimed were unnecessary #21995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
161 changes: 9 additions & 152 deletions src/rust/engine/Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions src/rust/engine/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,9 @@ async-trait = { workspace = true }
protos = { path = "protos" }
bytes = { workspace = true }
cache = { path = "cache" }
concrete_time = { path = "concrete_time" }
crossbeam-channel = { workspace = true }
deepsize = { workspace = true, features = ["internment", "smallvec"] }
dep_inference = { path = "dep_inference" }
derivative = { workspace = true }
async-oncecell = { workspace = true }
docker = { path = "process_execution/docker" }
fnv = { workspace = true }
fs = { path = "fs" }
Expand Down Expand Up @@ -86,7 +83,6 @@ time = { workspace = true }
tokio = { workspace = true, features = ["macros", "rt", "rt-multi-thread"] }
tokio-retry2 = { workspace = true }
tokio-util = { workspace = true, features = ["io"] }
tryfuture = { path = "tryfuture" }
ui = { path = "ui" }
url = { workspace = true }
watch = { path = "watch" }
Expand Down
1 change: 0 additions & 1 deletion src/rust/engine/async_value/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ authors = ["Pants Build <[email protected]>"]
publish = false

[dependencies]
futures = { workspace = true }
tokio = { workspace = true, features = ["macros", "sync"] }

[dev-dependencies]
Expand Down
4 changes: 3 additions & 1 deletion src/rust/engine/concrete_time/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@ publish = false
[dependencies]
deepsize = { workspace = true }
log = { workspace = true }
prost = { workspace = true }
prost-types = { workspace = true }
serde = { workspace = true }
serde_derive = { workspace = true }

[lints]
workspace = true

[package.metadata.cargo-machete]
ignored = ["serde"]
3 changes: 3 additions & 0 deletions src/rust/engine/dep_inference/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,6 @@ regex = { workspace = true }

[lints]
workspace = true

[package.metadata.cargo-machete]
ignored = ["serde"]
3 changes: 0 additions & 3 deletions src/rust/engine/fs/brfs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ publish = false

[dependencies]
clap = { workspace = true }
dirs-next = { workspace = true }
env_logger = { workspace = true }
errno = { workspace = true }
fuser = { workspace = true }
futures = { workspace = true }
grpc_util = { path = "../../grpc_util" }
Expand All @@ -23,7 +21,6 @@ task_executor = { path = "../../task_executor" }
time = { workspace = true }
tokio = { workspace = true, features = ["rt-multi-thread", "macros", "signal"] }
tokio-stream = { workspace = true, features = ["signal"] }
workunit_store = { path = "../../workunit_store" }

[dev-dependencies]
bytes = { workspace = true }
Expand Down
4 changes: 3 additions & 1 deletion src/rust/engine/fs/fs_util/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ hashing = { path = "../../hashing" }
log = { workspace = true }
parking_lot = { workspace = true }
prost = { workspace = true }
rand = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
serde_derive = { workspace = true }
Expand All @@ -28,3 +27,6 @@ workunit_store = { path = "../../workunit_store" }

[lints]
workspace = true

[package.metadata.cargo-machete]
ignored = ["prost", "serde"]
18 changes: 3 additions & 15 deletions src/rust/engine/fs/store/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,44 +5,29 @@ authors = ["Daniel Wagner-Hall <[email protected]>"]
edition = "2021"

[dependencies]
async-stream = { workspace = true }
async-trait = { workspace = true }
protos = { path = "../../protos" }
bytes = { workspace = true }
concrete_time = { path = "../../concrete_time" }
async-oncecell = { workspace = true }
deepsize = { workspace = true }
fs = { path = ".." }
fs-set-times = { workspace = true }
futures = { workspace = true }
glob = { workspace = true }
grpc_util = { path = "../../grpc_util" }
hashing = { path = "../../hashing" }
http = { workspace = true }
http-body = { workspace = true }
indexmap = { workspace = true }
itertools = { workspace = true }
lmdb-rkv = { workspace = true }
log = { workspace = true }
madvise = { workspace = true }
parking_lot = { workspace = true }
prost = { workspace = true }
prost-types = { workspace = true }
remote_provider = { path = "../../remote_provider" }
serde = { workspace = true }
serde_derive = { workspace = true }
sharded_lmdb = { path = "../../sharded_lmdb" }
task_executor = { path = "../../task_executor" }
tempfile = { workspace = true }
tokio-rustls = { workspace = true }
tokio = { workspace = true, features = ["fs"] }
tokio-util = { workspace = true, features = ["io"] }
tonic = { workspace = true, features = ["transport", "codegen", "tls", "tls-roots", "prost"] }
tower-service = { workspace = true }
tryfuture = { path = "../../tryfuture" }
uuid = { workspace = true, features = ["v4"] }
workunit_store = { path = "../../workunit_store" }
opendal = { workspace = true }

[dev-dependencies]
criterion = { workspace = true }
Expand All @@ -59,3 +44,6 @@ harness = false

[lints]
workspace = true

[package.metadata.cargo-machete]
ignored = ["serde"]
6 changes: 0 additions & 6 deletions src/rust/engine/grpc_util/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,12 @@ bytes = { workspace = true }
either = { workspace = true }
futures = { workspace = true }
http = { workspace = true }
http-body = { workspace = true }
http-body-util = { workspace = true }
hyper = { workspace = true }
hyper-rustls = { workspace = true, features = ["http2"] }
hyper-util = { workspace = true }
itertools = { workspace = true }
lazy_static = { workspace = true }
log = { workspace = true }
pin-project = { workspace = true }
pin-project-lite = { workspace = true }
prost = { workspace = true }
rand = { workspace = true }
rustls = { workspace = true, features = ["logging"] }
Expand All @@ -29,12 +25,10 @@ rustls-pemfile = { workspace = true }
tokio = { workspace = true, features = ["net", "process", "rt-multi-thread", "sync", "time"] }
tokio-rustls = { workspace = true }
tokio-stream = { workspace = true }
tokio-util = { workspace = true, features = ["codec"] }
tonic = { workspace = true, features = ["transport", "codegen", "tls", "tls-roots", "prost"] }
tower = { workspace = true, features = ["limit", "timeout"] }
tower-layer = { workspace = true }
tower-service = { workspace = true }
webpki = { workspace = true }
workunit_store = { path = "../workunit_store" }

[dev-dependencies]
Expand Down
2 changes: 0 additions & 2 deletions src/rust/engine/logging/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ num_enum = { workspace = true }
parking_lot = { workspace = true }
regex = { workspace = true }
stdio = { path = "../stdio" }
tokio = { version = "1.32" }
uuid = { workspace = true, features = ["v4"] }

[build-dependencies]
cargo_metadata = "0.19"
Expand Down
11 changes: 3 additions & 8 deletions src/rust/engine/process_execution/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,8 @@ authors = ["Pants Build <[email protected]>"]
publish = false

[dependencies]
async-stream = { workspace = true }
async-trait = { workspace = true }
async-lock = { workspace = true }
async-oncecell = { workspace = true }
walkdir = { workspace = true }
protos = { path = "../protos" }
bytes = { workspace = true }
cache = { path = "../cache" }
Expand All @@ -24,14 +21,12 @@ libc = { workspace = true }
log = { workspace = true }
nails = { workspace = true }
nix = { workspace = true }
sha2 = { workspace = true }
shell-quote = { workspace = true }
store = { path = "../fs/store" }
task_executor = { path = "../task_executor" }
tempfile = { workspace = true }
concrete_time = { path = "../concrete_time" }
tokio = { workspace = true, features = ["net", "process", "rt-multi-thread", "sync", "time"] }
tokio-rustls = { workspace = true }
tokio-util = { workspace = true, features = ["codec"] }
uname = { workspace = true }
uuid = { workspace = true, features = ["v4"] }
Expand All @@ -42,14 +37,11 @@ parking_lot = { workspace = true }
itertools = { workspace = true }
serde = { workspace = true }
bincode = { workspace = true }
once_cell = { workspace = true }
rand = { workspace = true }
prost = { workspace = true }
prost-types = { workspace = true }
shlex = { workspace = true }
strum = { workspace = true }
strum_macros = { workspace = true }
tonic = { workspace = true, features = ["transport", "codegen", "tls", "tls-roots", "prost"] }
tryfuture = { path = "../tryfuture" }

[dev-dependencies]
Expand All @@ -64,3 +56,6 @@ tokio = { workspace = true, features = ["macros"] }

[lints]
workspace = true

[package.metadata.cargo-machete]
ignored = ["strum"]
3 changes: 0 additions & 3 deletions src/rust/engine/process_execution/docker/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ publish = false
[dependencies]
async-stream = { workspace = true }
async-trait = { workspace = true }
async-lock = { workspace = true }
bollard = { workspace = true }
docker_credential = { workspace = true }
fs = { path = "../../fs" }
Expand All @@ -18,8 +17,6 @@ nails = { workspace = true }
store = { path = "../../fs/store" }
task_executor = { path = "../../task_executor" }
tokio = { workspace = true, features = ["net", "process", "rt-multi-thread", "sync", "time"] }
tokio-rustls = { workspace = true }
tokio-util = { workspace = true, features = ["codec"] }
workunit_store = { path = "../../workunit_store" }
parking_lot = { workspace = true }
async-oncecell = { workspace = true }
Expand Down
3 changes: 0 additions & 3 deletions src/rust/engine/process_execution/pe_nailgun/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ authors = ["Pants Build <[email protected]>"]
publish = false

[dependencies]
async-stream = { workspace = true }
async-trait = { workspace = true }
async-lock = { workspace = true }
futures = { workspace = true }
Expand All @@ -15,8 +14,6 @@ nails = { workspace = true }
store = { path = "../../fs/store" }
task_executor = { path = "../../task_executor" }
tokio = { workspace = true, features = ["net", "process", "rt-multi-thread", "sync", "time"] }
tokio-rustls = { workspace = true }
tokio-util = { workspace = true, features = ["codec"] }
workunit_store = { path = "../../workunit_store" }
itertools = { workspace = true }
process_execution = { path = ".." }
Expand Down
11 changes: 3 additions & 8 deletions src/rust/engine/process_execution/remote/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,9 @@ authors = ["Pants Build <[email protected]>"]
publish = false

[dependencies]
async-stream = { workspace = true }
async-trait = { workspace = true }
async-lock = { workspace = true }
protos = { path = "../../protos" }
bytes = { workspace = true }
derivative = { workspace = true }
# deepsize = { workspace = true, features=["log"] }
grpc_util = { path = "../../grpc_util" }
fs = { path = "../../fs" }
futures = { workspace = true }
Expand All @@ -23,11 +19,8 @@ store = { path = "../../fs/store" }
task_executor = { path = "../../task_executor" }
concrete_time = { path = "../../concrete_time" }
tokio = { workspace = true, features = ["net", "process", "rt-multi-thread", "sync", "time"] }
tokio-rustls = { workspace = true }
tokio-util = { workspace = true, features = ["codec"] }
workunit_store = { path = "../../workunit_store" }
async-oncecell = { workspace = true }
once_cell = { workspace = true }
prost = { workspace = true }
prost-types = { workspace = true }
rand = { workspace = true }
Expand All @@ -36,7 +29,6 @@ process_execution = { path = ".." }
strum = { workspace = true }
strum_macros = { workspace = true }
parking_lot = { workspace = true }
opendal = { workspace = true }
remote_provider = { path = "../../remote_provider" }
remote_provider_reapi = { path = "../../remote_provider/remote_provider_reapi" }

Expand All @@ -52,3 +44,6 @@ tokio = { workspace = true, features = ["macros"] }

[lints]
workspace = true

[package.metadata.cargo-machete]
ignored = ["strum"]
4 changes: 3 additions & 1 deletion src/rust/engine/process_executor/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ publish = false
[dependencies]
protos = { path = "../protos" }
clap = { workspace = true, features = ["derive"] }
dirs-next = { workspace = true }
env_logger = { workspace = true }
fs = { path = "../fs" }
futures = { workspace = true }
Expand All @@ -26,3 +25,6 @@ remote = { path = "../process_execution/remote" }

[lints]
workspace = true

[package.metadata.cargo-machete]
ignored = ["futures"]
5 changes: 3 additions & 2 deletions src/rust/engine/protos/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@ authors = ["Pants Build <[email protected]>"]
publish = false

[dependencies]
bytes = { workspace = true }
hashing = { path = "../hashing" }
prost = { workspace = true }
prost-build = { workspace = true }
prost-types = { workspace = true }
tonic = { workspace = true, features = ["transport", "codegen", "tls", "tls-roots"] }

[build-dependencies]
prost-build = { workspace = true }
tonic-build = { workspace = true, features = ["prost"] }

[package.metadata.cargo-machete]
ignored = ["prost-types"]
1 change: 0 additions & 1 deletion src/rust/engine/remote_provider/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ authors = ["Pants Build <[email protected]>"]
publish = false

[dependencies]
grpc_util = { path = "../grpc_util" }
remote_provider_opendal = { path = "./remote_provider_opendal" }
remote_provider_reapi = { path = "./remote_provider_reapi" }
remote_provider_traits = { path = "./remote_provider_traits" }
Expand Down
1 change: 0 additions & 1 deletion src/rust/engine/remote_provider/remote_provider_opendal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ futures = { workspace = true }
grpc_util = { path = "../../grpc_util" }
hashing = { path = "../../hashing" }
http = { workspace = true }
parking_lot = { workspace = true }
prost = { workspace = true }
protos = { path = "../../protos" }
opendal = { workspace = true }
Expand Down
4 changes: 3 additions & 1 deletion src/rust/engine/remote_provider/remote_provider_traits/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ authors = ["Pants Build <[email protected]>"]
publish = false

[dependencies]
async-oncecell = { workspace = true }
async-trait = { workspace = true }
bytes = { workspace = true }
grpc_util = { path = "../../grpc_util" }
Expand All @@ -18,3 +17,6 @@ tokio = { workspace = true, features = ["fs"] }

[lints]
workspace = true

[package.metadata.cargo-machete]
ignored = ["strum"]
5 changes: 3 additions & 2 deletions src/rust/engine/sharded_lmdb/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ edition = "2021"

[dependencies]
bytes = { workspace = true }
fs = { path = "../fs" }
futures = { workspace = true }
hashing = { path = "../hashing" }
lmdb-rkv = { workspace = true }
log = { workspace = true }
Expand All @@ -20,3 +18,6 @@ tokio = { workspace = true, features = ["macros"] }

[lints]
workspace = true

[package.metadata.cargo-machete]
ignored = ["lmdb-rkv"]
2 changes: 0 additions & 2 deletions src/rust/engine/testutil/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,10 @@ authors = ["Pants Build <[email protected]>"]
publish = false

[dependencies]
async-stream = { workspace = true }
bytes = { workspace = true }
fs = { path = "../fs" }
grpc_util = { path = "../grpc_util" }
hashing = { path = "../hashing" }
prost = { workspace = true }
protos = { path = "../protos" }
tempfile = { workspace = true }
tokio = { workspace = true }
Expand Down
Loading
Loading