From c952969389ceabb812ba154675e9d4773fd55b3f Mon Sep 17 00:00:00 2001 From: Benjamin Bouvier Date: Tue, 2 Nov 2021 18:08:30 +0100 Subject: [PATCH] Remove unused dependencies (#3490) * Remove unused dependencies in Cranelift * add serde to the current workspace * remove more unused dependencies in wasmtime? --- Cargo.lock | 28 ------------------- Cargo.toml | 1 + cranelift/Cargo.toml | 2 -- cranelift/codegen/Cargo.toml | 1 - cranelift/codegen/meta/Cargo.toml | 1 - cranelift/codegen/shared/Cargo.toml | 4 --- cranelift/fuzzgen/Cargo.toml | 1 - cranelift/module/Cargo.toml | 2 -- cranelift/peepmatic/crates/runtime/Cargo.toml | 1 - cranelift/preopt/Cargo.toml | 1 - cranelift/serde/Cargo.toml | 2 -- crates/c-api/Cargo.toml | 3 +- crates/environ/Cargo.toml | 1 - crates/jit/Cargo.toml | 3 -- crates/wasi-common/cap-std-sync/Cargo.toml | 1 - crates/wasi-common/tokio/Cargo.toml | 6 ---- crates/wasi-nn/Cargo.toml | 2 -- crates/wiggle/macro/Cargo.toml | 1 - 18 files changed, 2 insertions(+), 59 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e9c268349c..d01762bd4a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -557,15 +557,11 @@ name = "cranelift-codegen-meta" version = "0.78.0" dependencies = [ "cranelift-codegen-shared", - "cranelift-entity", ] [[package]] name = "cranelift-codegen-shared" version = "0.78.0" -dependencies = [ - "serde", -] [[package]] name = "cranelift-entity" @@ -613,7 +609,6 @@ dependencies = [ "anyhow", "arbitrary", "cranelift", - "rand 0.8.3", ] [[package]] @@ -654,9 +649,7 @@ version = "0.78.0" dependencies = [ "anyhow", "cranelift-codegen", - "cranelift-entity", "hashbrown", - "log", ] [[package]] @@ -687,7 +680,6 @@ name = "cranelift-preopt" version = "0.78.0" dependencies = [ "cranelift-codegen", - "cranelift-entity", ] [[package]] @@ -706,8 +698,6 @@ dependencies = [ "clap", "cranelift-codegen", "cranelift-reader", - "serde", - "serde_derive", "serde_json", ] @@ -723,7 +713,6 @@ dependencies = [ "cranelift-entity", "cranelift-filetests", "cranelift-frontend", - "cranelift-fuzzgen", "cranelift-interpreter", "cranelift-jit", "cranelift-module", @@ -731,7 +720,6 @@ dependencies = [ "cranelift-object", "cranelift-preopt", "cranelift-reader", - "cranelift-serde", "cranelift-wasm", "file-per-thread-logger", "filecheck", @@ -1957,7 +1945,6 @@ name = "peepmatic-runtime" version = "0.78.0" dependencies = [ "bincode", - "bumpalo", "log", "peepmatic-automata", "peepmatic-test-operator", @@ -3106,7 +3093,6 @@ version = "0.31.0" dependencies = [ "anyhow", "async-trait", - "bitflags", "cap-fs-ext", "cap-rand", "cap-std", @@ -3172,19 +3158,13 @@ name = "wasi-tokio" version = "0.31.0" dependencies = [ "anyhow", - "bitflags", - "cap-fs-ext", "cap-std", "cap-tempfile", - "cap-time-ext", - "fs-set-times", "io-lifetimes", "lazy_static", "rsix", - "system-interface", "tempfile", "tokio", - "tracing", "wasi-cap-std-sync", "wasi-common", "wiggle", @@ -3375,7 +3355,6 @@ dependencies = [ "env_logger 0.8.3", "once_cell", "wasi-cap-std-sync", - "wasi-common", "wasmtime", "wasmtime-c-api-macros", "wasmtime-wasi", @@ -3481,7 +3460,6 @@ name = "wasmtime-environ" version = "0.31.0" dependencies = [ "anyhow", - "cfg-if 1.0.0", "cranelift-entity", "gimli", "indexmap", @@ -3554,15 +3532,12 @@ dependencies = [ "cfg-if 1.0.0", "gimli", "ittapi-rs", - "log", - "more-asserts", "object", "region", "rsix", "serde", "target-lexicon", "thiserror", - "wasmparser", "wasmtime-environ", "wasmtime-runtime", "winapi", @@ -3634,8 +3609,6 @@ dependencies = [ "openvino", "thiserror", "walkdir", - "wasmtime", - "wasmtime-wasi", "wiggle", ] @@ -3735,7 +3708,6 @@ dependencies = [ "syn", "wiggle", "wiggle-generate", - "witx", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 82cf6e8129..5f0565abb3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -73,6 +73,7 @@ opt-level = 0 resolver = '2' members = [ "cranelift", + "cranelift/serde", "crates/bench-api", "crates/c-api", "crates/misc/run-examples", diff --git a/cranelift/Cargo.toml b/cranelift/Cargo.toml index 41f986cd72..95ac24a3b0 100644 --- a/cranelift/Cargo.toml +++ b/cranelift/Cargo.toml @@ -20,7 +20,6 @@ cranelift-entity = { path = "entity", version = "0.78.0" } cranelift-interpreter = { path = "interpreter", version = "0.78.0" } cranelift-reader = { path = "reader", version = "0.78.0" } cranelift-frontend = { path = "frontend", version = "0.78.0" } -cranelift-serde = { path = "serde", version = "0.78.0", optional = true } cranelift-wasm = { path = "wasm", version = "0.78.0", optional = true } cranelift-native = { path = "native", version = "0.78.0" } cranelift-filetests = { path = "filetests", version = "0.73.0" } @@ -29,7 +28,6 @@ cranelift-object = { path = "object", version = "0.78.0" } cranelift-jit = { path = "jit", version = "0.78.0" } cranelift-preopt = { path = "preopt", version = "0.78.0" } cranelift = { path = "umbrella", version = "0.78.0" } -cranelift-fuzzgen = { path = "fuzzgen", version = "0.75.0" } filecheck = "0.5.0" log = "0.4.8" termcolor = "1.1.2" diff --git a/cranelift/codegen/Cargo.toml b/cranelift/codegen/Cargo.toml index a2aa24bfbb..5bc01a92ce 100644 --- a/cranelift/codegen/Cargo.toml +++ b/cranelift/codegen/Cargo.toml @@ -82,7 +82,6 @@ enable-serde = [ "serde", "regalloc/enable-serde", "cranelift-entity/enable-serde", - "cranelift-codegen-shared/enable-serde" ] # Allow snapshotting regalloc test cases. Useful only to report bad register diff --git a/cranelift/codegen/meta/Cargo.toml b/cranelift/codegen/meta/Cargo.toml index 7447bde3d4..374f4f63db 100644 --- a/cranelift/codegen/meta/Cargo.toml +++ b/cranelift/codegen/meta/Cargo.toml @@ -14,7 +14,6 @@ edition = "2018" [dependencies] cranelift-codegen-shared = { path = "../shared", version = "0.78.0" } -cranelift-entity = { path = "../../entity", version = "0.78.0" } [badges] maintenance = { status = "experimental" } diff --git a/cranelift/codegen/shared/Cargo.toml b/cranelift/codegen/shared/Cargo.toml index 837c9b8af1..74244e5602 100644 --- a/cranelift/codegen/shared/Cargo.toml +++ b/cranelift/codegen/shared/Cargo.toml @@ -11,7 +11,3 @@ edition = "2018" [dependencies] # Since this is a shared dependency of several packages, please strive to keep this dependency-free # when no features are enabled. -serde = { version = "1.0.94", features = ["derive"], optional = true } - -[features] -enable-serde = ["serde"] diff --git a/cranelift/fuzzgen/Cargo.toml b/cranelift/fuzzgen/Cargo.toml index 730ae1b1c9..68e90fbb6b 100644 --- a/cranelift/fuzzgen/Cargo.toml +++ b/cranelift/fuzzgen/Cargo.toml @@ -15,4 +15,3 @@ cranelift = { path = "../umbrella", version = "0.78.0" } anyhow = "1.0.19" arbitrary = "1.0.0" -rand = "0.8.0" diff --git a/cranelift/module/Cargo.toml b/cranelift/module/Cargo.toml index c1f13b1621..7cbb9daaa9 100644 --- a/cranelift/module/Cargo.toml +++ b/cranelift/module/Cargo.toml @@ -12,9 +12,7 @@ edition = "2018" [dependencies] cranelift-codegen = { path = "../codegen", version = "0.78.0", default-features = false } -cranelift-entity = { path = "../entity", version = "0.78.0" } hashbrown = { version = "0.9.1", optional = true } -log = { version = "0.4.6", default-features = false } anyhow = "1.0" [features] diff --git a/cranelift/peepmatic/crates/runtime/Cargo.toml b/cranelift/peepmatic/crates/runtime/Cargo.toml index 79f59fdfca..44998bec06 100644 --- a/cranelift/peepmatic/crates/runtime/Cargo.toml +++ b/cranelift/peepmatic/crates/runtime/Cargo.toml @@ -10,7 +10,6 @@ description = "Runtime support for peepmatic peephole optimizers" [dependencies] bincode = "1.2.1" -bumpalo = "3.2.0" log = "0.4.8" peepmatic-automata = { version = "=0.78.0", path = "../automata", features = ["serde"] } peepmatic-traits = { version = "=0.78.0", path = "../traits" } diff --git a/cranelift/preopt/Cargo.toml b/cranelift/preopt/Cargo.toml index ef653e279b..ae587440f0 100644 --- a/cranelift/preopt/Cargo.toml +++ b/cranelift/preopt/Cargo.toml @@ -13,7 +13,6 @@ edition = "2018" [dependencies] cranelift-codegen = { path = "../codegen", version = "0.78.0", default-features = false } -cranelift-entity = { path = "../entity", version = "0.78.0" } # This is commented out because it doesn't build on Rust 1.25.0, which # cranelift currently supports. # rustc_apfloat = { version = "0.1.2", default-features = false } diff --git a/cranelift/serde/Cargo.toml b/cranelift/serde/Cargo.toml index 03d384db78..2ced1142d1 100644 --- a/cranelift/serde/Cargo.toml +++ b/cranelift/serde/Cargo.toml @@ -15,8 +15,6 @@ path = "src/clif-json.rs" [dependencies] clap = "2.32.0" -serde = "1.0.8" -serde_derive = "1.0.75" serde_json = "1.0.26" cranelift-codegen = { path = "../codegen", version = "0.78.0", features = ["enable-serde"] } cranelift-reader = { path = "../reader", version = "0.78.0" } diff --git a/crates/c-api/Cargo.toml b/crates/c-api/Cargo.toml index 97a0d759ae..df51e049ff 100644 --- a/crates/c-api/Cargo.toml +++ b/crates/c-api/Cargo.toml @@ -27,7 +27,6 @@ wasmtime-c-api-macros = { path = "macros" } wat = { version = "1.0.36", optional = true } # Optional dependencies for the `wasi` feature -wasi-common = { path = "../wasi-common", optional = true } wasi-cap-std-sync = { path = "../wasi-common/cap-std-sync", optional = true } wasmtime-wasi = { path = "../wasi", optional = true } cap-std = { version = "0.19.1", optional = true } @@ -36,4 +35,4 @@ cap-std = { version = "0.19.1", optional = true } default = ['jitdump', 'wat', 'wasi', 'cache'] jitdump = ["wasmtime/jitdump"] cache = ["wasmtime/cache"] -wasi = ['wasi-common', 'wasi-cap-std-sync', 'wasmtime-wasi', 'cap-std'] +wasi = ['wasi-cap-std-sync', 'wasmtime-wasi', 'cap-std'] diff --git a/crates/environ/Cargo.toml b/crates/environ/Cargo.toml index 5eb8e3c4be..841b98309b 100644 --- a/crates/environ/Cargo.toml +++ b/crates/environ/Cargo.toml @@ -20,7 +20,6 @@ thiserror = "1.0.4" serde = { version = "1.0.94", features = ["derive"] } log = { version = "0.4.8", default-features = false } more-asserts = "0.2.1" -cfg-if = "1.0" gimli = { version = "0.25.0", default-features = false, features = ['read'] } object = { version = "0.27.0", default-features = false, features = ['read_core', 'write_core', 'elf'] } target-lexicon = "0.12" diff --git a/crates/jit/Cargo.toml b/crates/jit/Cargo.toml index 90f75cb5e2..1fff35ee82 100644 --- a/crates/jit/Cargo.toml +++ b/crates/jit/Cargo.toml @@ -16,11 +16,8 @@ wasmtime-runtime = { path = "../runtime", version = "=0.31.0" } region = "2.2.0" thiserror = "1.0.4" target-lexicon = { version = "0.12.0", default-features = false } -wasmparser = "0.81" -more-asserts = "0.2.1" anyhow = "1.0" cfg-if = "1.0" -log = "0.4" gimli = { version = "0.25.0", default-features = false, features = ["std", "read"] } object = { version = "0.27.0", default-features = false, features = ["std", "read_core", "elf"] } serde = { version = "1.0.94", features = ["derive"] } diff --git a/crates/wasi-common/cap-std-sync/Cargo.toml b/crates/wasi-common/cap-std-sync/Cargo.toml index cee98ad92b..5d0bf7e066 100644 --- a/crates/wasi-common/cap-std-sync/Cargo.toml +++ b/crates/wasi-common/cap-std-sync/Cargo.toml @@ -22,7 +22,6 @@ cap-rand = "0.19.1" fs-set-times = "0.12.0" system-interface = { version = "0.15.0", features = ["cap_std_impls"] } tracing = "0.1.19" -bitflags = "1.2" io-lifetimes = { version = "0.3.0", default-features = false } [target.'cfg(unix)'.dependencies] diff --git a/crates/wasi-common/tokio/Cargo.toml b/crates/wasi-common/tokio/Cargo.toml index f13340fac5..f4baa3eb6c 100644 --- a/crates/wasi-common/tokio/Cargo.toml +++ b/crates/wasi-common/tokio/Cargo.toml @@ -16,12 +16,6 @@ wasi-cap-std-sync = { path = "../cap-std-sync", version = "=0.31.0" } wiggle = { path = "../../wiggle", version = "=0.31.0" } tokio = { version = "1.8.0", features = [ "rt", "fs", "time", "io-util", "net", "io-std", "rt-multi-thread"] } cap-std = "0.19.1" -cap-fs-ext = "0.19.1" -cap-time-ext = "0.19.1" -fs-set-times = "0.12.0" -system-interface = { version = "0.15.0", features = ["cap_std_impls"] } -tracing = "0.1.19" -bitflags = "1.2" anyhow = "1" io-lifetimes = { version = "0.3.0", default-features = false } diff --git a/crates/wasi-nn/Cargo.toml b/crates/wasi-nn/Cargo.toml index 91d047e284..8b0385c677 100644 --- a/crates/wasi-nn/Cargo.toml +++ b/crates/wasi-nn/Cargo.toml @@ -15,8 +15,6 @@ edition = "2018" # These dependencies are necessary for the witx-generation macros to work: anyhow = "1.0" log = { version = "0.4", default-features = false } -wasmtime = { path = "../wasmtime", version = "0.31.0", default-features = false } -wasmtime-wasi = { path = "../wasi", version = "0.31.0" } wiggle = { path = "../wiggle", version = "=0.31.0" } # These dependencies are necessary for the wasi-nn implementation: diff --git a/crates/wiggle/macro/Cargo.toml b/crates/wiggle/macro/Cargo.toml index 4f166224a3..5adc057bec 100644 --- a/crates/wiggle/macro/Cargo.toml +++ b/crates/wiggle/macro/Cargo.toml @@ -22,7 +22,6 @@ doctest = false [dependencies] wiggle-generate = { path = "../generate", version = "=0.31.0" } -witx = { version = "0.9.1", path = "../../wasi-common/WASI/tools/witx" } quote = "1.0" syn = { version = "1.0", features = ["full"] } proc-macro2 = "1.0"