From 6f16efbd8598fb2065d12b61be3b083b9283ac0f Mon Sep 17 00:00:00 2001 From: "Jiaxiao Zhou (Mossaka)" Date: Mon, 30 Sep 2024 19:30:01 -0700 Subject: [PATCH 1/3] all: remove unused deps remove unused dependencies found by running `cargo machete` Signed-off-by: Jiaxiao Zhou (Mossaka) --- Cargo.lock | 124 +------------------ Cargo.toml | 7 -- crates/app/Cargo.toml | 3 - crates/build/Cargo.toml | 2 - crates/compose/Cargo.toml | 1 - crates/expressions/Cargo.toml | 1 - crates/factor-outbound-http/Cargo.toml | 1 - crates/factor-outbound-mysql/Cargo.toml | 5 - crates/factor-outbound-networking/Cargo.toml | 1 - crates/factor-sqlite/Cargo.toml | 2 - crates/factor-variables/Cargo.toml | 2 - crates/factor-wasi/Cargo.toml | 1 - crates/factors-test/Cargo.toml | 2 - crates/factors/Cargo.toml | 1 - crates/http/Cargo.toml | 1 - crates/key-value-azure/Cargo.toml | 2 - crates/key-value-redis/Cargo.toml | 1 - crates/llm-local/Cargo.toml | 4 - crates/loader/Cargo.toml | 12 -- crates/oci/Cargo.toml | 1 - crates/plugins/Cargo.toml | 1 - crates/runtime-factors/Cargo.toml | 1 - crates/sqlite-inproc/Cargo.toml | 1 - crates/sqlite-libsql/Cargo.toml | 2 - crates/sqlite/Cargo.toml | 8 +- crates/telemetry/Cargo.toml | 3 - crates/templates/Cargo.toml | 5 - crates/trigger-http/Cargo.toml | 7 -- crates/trigger-redis/Cargo.toml | 1 - crates/trigger/Cargo.toml | 1 - 30 files changed, 4 insertions(+), 200 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bb84e5a0d..555aa1c05 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4334,16 +4334,6 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" -[[package]] -name = "mime_guess" -version = "2.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" -dependencies = [ - "mime", - "unicase", -] - [[package]] name = "minimal-lexical" version = "0.2.1" @@ -4980,12 +4970,6 @@ dependencies = [ "tonic", ] -[[package]] -name = "opentelemetry-semantic-conventions" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b8e442487022a943e2315740e443dc5ee95fd541c18f509a5a6251b408a9f95" - [[package]] name = "opentelemetry_sdk" version = "0.25.0" @@ -6738,15 +6722,6 @@ dependencies = [ "dirs 4.0.0", ] -[[package]] -name = "shellexpand" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b" -dependencies = [ - "dirs 5.0.1", -] - [[package]] name = "shlex" version = "1.3.0" @@ -6902,12 +6877,9 @@ dependencies = [ name = "spin-app" version = "2.8.0-pre0" dependencies = [ - "anyhow", - "async-trait", "serde 1.0.210", "serde_json", "spin-locked-app", - "thiserror", ] [[package]] @@ -6915,7 +6887,6 @@ name = "spin-build" version = "2.8.0-pre0" dependencies = [ "anyhow", - "futures", "serde 1.0.210", "spin-common", "spin-manifest", @@ -6923,7 +6894,6 @@ dependencies = [ "terminal", "tokio", "toml 0.8.19", - "tracing", ] [[package]] @@ -6934,7 +6904,6 @@ dependencies = [ "async-trait", "bytes", "cargo-target-dep", - "chrono", "clap 3.2.25", "clearscreen 3.0.0", "comfy-table", @@ -6943,23 +6912,19 @@ dependencies = [ "conformance-tests", "ctrlc", "dialoguer", - "dirs 5.0.1", "futures", - "glob", "hex", "http 1.1.0", "http-body-util", "hyper 1.4.1", "hyper-util", "indicatif", - "is-terminal", "itertools 0.13.0", "lazy_static 1.5.0", "levenshtein", "nix 0.29.0", "openssl", "path-absolutize", - "rand 0.8.5", "redis 0.27.2", "regex", "reqwest 0.12.7", @@ -6973,7 +6938,6 @@ dependencies = [ "spin-build", "spin-common", "spin-doctor", - "spin-expressions", "spin-factor-outbound-networking", "spin-http", "spin-loader", @@ -7000,7 +6964,6 @@ dependencies = [ "url", "uuid", "vergen", - "wasmtime", "watchexec", "watchexec-filterer-globset", ] @@ -7052,7 +7015,6 @@ dependencies = [ "indexmap 2.5.0", "semver", "spin-app", - "spin-componentize", "spin-serde", "thiserror", "wac-graph", @@ -7103,7 +7065,6 @@ version = "2.8.0-pre0" dependencies = [ "anyhow", "async-trait", - "serde 1.0.210", "spin-locked-app", "thiserror", "tokio", @@ -7167,7 +7128,6 @@ dependencies = [ "spin-factors-test", "spin-telemetry", "spin-world", - "terminal", "tokio", "tokio-rustls 0.26.0", "tracing", @@ -7198,12 +7158,8 @@ name = "spin-factor-outbound-mysql" version = "2.8.0-pre0" dependencies = [ "anyhow", - "flate2", "mysql_async", - "mysql_common", - "spin-app", "spin-core", - "spin-expressions", "spin-factor-outbound-networking", "spin-factor-variables", "spin-factors", @@ -7236,7 +7192,6 @@ dependencies = [ "spin-manifest", "spin-serde", "tempfile", - "terminal", "tokio", "toml 0.8.19", "tracing", @@ -7287,14 +7242,12 @@ name = "spin-factor-sqlite" version = "2.8.0-pre0" dependencies = [ "async-trait", - "serde 1.0.210", "spin-factors", "spin-factors-test", "spin-locked-app", "spin-resource-table", "spin-world", "tokio", - "toml 0.8.19", "tracing", ] @@ -7302,13 +7255,11 @@ dependencies = [ name = "spin-factor-variables" version = "2.8.0-pre0" dependencies = [ - "serde 1.0.210", "spin-expressions", "spin-factors", "spin-factors-test", "spin-world", "tokio", - "toml 0.8.19", "tracing", ] @@ -7318,7 +7269,6 @@ version = "2.8.0-pre0" dependencies = [ "async-trait", "bytes", - "cap-primitives", "spin-common", "spin-factors", "spin-factors-test", @@ -7337,7 +7287,6 @@ dependencies = [ "spin-factors-derive", "thiserror", "toml 0.8.19", - "tracing", "wasmtime", ] @@ -7368,10 +7317,8 @@ dependencies = [ name = "spin-factors-test" version = "2.8.0-pre0" dependencies = [ - "serde 1.0.210", "spin-app", "spin-factors", - "spin-factors-derive", "spin-loader", "tempfile", "toml 0.8.19", @@ -7390,7 +7337,6 @@ dependencies = [ "routefinder", "serde 1.0.210", "spin-app", - "spin-locked-app", "toml 0.8.19", "tracing", "wasmtime", @@ -7408,8 +7354,6 @@ dependencies = [ "serde 1.0.210", "spin-core", "spin-factor-key-value", - "tokio", - "url", ] [[package]] @@ -7421,7 +7365,6 @@ dependencies = [ "serde 1.0.210", "spin-core", "spin-factor-key-value", - "spin-world", "tokio", "url", ] @@ -7447,9 +7390,6 @@ dependencies = [ "candle-core", "candle-nn", "candle-transformers", - "chrono", - "lru", - "num_cpus", "rand 0.8.5", "safetensors", "serde 1.0.210", @@ -7457,7 +7397,6 @@ dependencies = [ "spin-common", "spin-core", "spin-world", - "terminal", "tokenizers", "tokio", "tracing", @@ -7481,37 +7420,25 @@ name = "spin-loader" version = "2.8.0-pre0" dependencies = [ "anyhow", - "async-trait", - "bytes", "dirs 5.0.1", "futures", "glob", - "indexmap 2.5.0", - "itertools 0.13.0", - "lazy_static 1.5.0", - "mime_guess", "path-absolutize", - "regex", "reqwest 0.12.7", "semver", "serde 1.0.210", "serde_json", "sha2", - "shellexpand 3.1.0", "spin-common", "spin-factor-outbound-networking", "spin-locked-app", "spin-manifest", "spin-serde", "tempfile", - "terminal", - "thiserror", "tokio", - "tokio-util", "toml 0.8.19", "tracing", "ui-testing", - "walkdir", "wasm-pkg-loader", ] @@ -7567,7 +7494,6 @@ dependencies = [ "spin-common", "spin-loader", "spin-locked-app", - "spin-manifest", "tempfile", "tokio", "tokio-util", @@ -7580,7 +7506,6 @@ name = "spin-plugins" version = "2.8.0-pre0" dependencies = [ "anyhow", - "bytes", "chrono", "dirs 5.0.1", "fd-lock", @@ -7657,7 +7582,6 @@ dependencies = [ "spin-factors", "spin-factors-executor", "spin-runtime-config", - "spin-telemetry", "spin-trigger", "terminal", "tracing", @@ -7678,16 +7602,11 @@ dependencies = [ name = "spin-sqlite" version = "2.8.0-pre0" dependencies = [ - "async-trait", "serde 1.0.210", "spin-factor-sqlite", "spin-factors", - "spin-locked-app", - "spin-resource-table", "spin-sqlite-inproc", "spin-sqlite-libsql", - "spin-world", - "tokio", "toml 0.8.19", ] @@ -7697,7 +7616,6 @@ version = "2.8.0-pre0" dependencies = [ "anyhow", "async-trait", - "rand 0.8.5", "rusqlite", "spin-factor-sqlite", "spin-world", @@ -7711,10 +7629,8 @@ dependencies = [ "anyhow", "async-trait", "libsql", - "rusqlite", "spin-factor-sqlite", "spin-world", - "sqlparser", "tokio", ] @@ -7727,14 +7643,11 @@ dependencies = [ "http 1.1.0", "opentelemetry", "opentelemetry-otlp", - "opentelemetry-semantic-conventions", "opentelemetry_sdk", "terminal", "tracing", - "tracing-appender", "tracing-opentelemetry", "tracing-subscriber", - "url", ] [[package]] @@ -7742,11 +7655,7 @@ name = "spin-templates" version = "2.8.0-pre0" dependencies = [ "anyhow", - "async-trait", - "bytes", - "console", "dialoguer", - "dirs 5.0.1", "fs_extra", "heck 0.5.0", "indexmap 2.5.0", @@ -7755,7 +7664,6 @@ dependencies = [ "liquid", "liquid-core", "liquid-derive", - "liquid-lib", "path-absolutize", "pathdiff", "regex", @@ -7796,7 +7704,6 @@ dependencies = [ "spin-world", "tempfile", "tokio", - "toml 0.8.19", "tracing", ] @@ -7805,16 +7712,12 @@ name = "spin-trigger-http" version = "2.8.0-pre0" dependencies = [ "anyhow", - "async-trait", "clap 3.2.25", "futures", - "futures-util", "http 1.1.0", "http-body-util", "hyper 1.4.1", "hyper-util", - "indexmap 2.5.0", - "percent-encoding", "rustls 0.23.13", "rustls-pemfile 2.1.3", "rustls-pki-types", @@ -7834,11 +7737,8 @@ dependencies = [ "tokio", "tokio-rustls 0.26.0", "tracing", - "url", - "wasmtime", "wasmtime-wasi", "wasmtime-wasi-http", - "webpki-roots 0.26.6", ] [[package]] @@ -7846,7 +7746,6 @@ name = "spin-trigger-redis" version = "2.8.0-pre0" dependencies = [ "anyhow", - "async-trait", "futures", "redis 0.27.2", "serde 1.0.210", @@ -7913,15 +7812,6 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" -[[package]] -name = "sqlparser" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe11944a61da0da3f592e19a45ebe5ab92dc14a779907ff1f08fbb797bfefc7" -dependencies = [ - "log", -] - [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -8677,18 +8567,6 @@ dependencies = [ "tracing-core", ] -[[package]] -name = "tracing-appender" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" -dependencies = [ - "crossbeam-channel", - "thiserror", - "time", - "tracing-subscriber", -] - [[package]] name = "tracing-attributes" version = "0.1.27" @@ -10043,7 +9921,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "shellexpand 2.1.2", + "shellexpand", "syn 2.0.77", "witx", ] diff --git a/Cargo.toml b/Cargo.toml index f6b19eae5..ee0226fbc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,25 +18,20 @@ rust-version = "1.79" anyhow = { workspace = true } async-trait = { workspace = true } bytes = { workspace = true } -chrono = "0.4" clap = { version = "3.2.24", features = ["derive", "env"] } clearscreen = "3" comfy-table = "7" command-group = "2" ctrlc = { version = "3.4", features = ["termination"] } dialoguer = "0.11" -dirs = { workspace = true } futures = { workspace = true } -glob = { workspace = true } http = { workspace = true } indicatif = "0.17" -is-terminal = "0.4" itertools = { workspace = true } lazy_static = "1.5" levenshtein = "1" nix = { version = "0.29", features = ["signal"] } path-absolutize = "3" -rand = { workspace = true } regex = { workspace = true } reqwest = { workspace = true } rpassword = "7" @@ -51,7 +46,6 @@ toml = { workspace = true } tracing = { workspace = true } url = { workspace = true } uuid = { version = "1.0", features = ["v4"] } -wasmtime = { workspace = true } watchexec = { git = "https://github.com/watchexec/watchexec.git", rev = "8e91d26ef6400c1e60b32a8314cbb144fa33f288" } watchexec-filterer-globset = { git = "https://github.com/watchexec/watchexec.git", rev = "8e91d26ef6400c1e60b32a8314cbb144fa33f288" } @@ -59,7 +53,6 @@ spin-app = { path = "crates/app" } spin-build = { path = "crates/build" } spin-common = { path = "crates/common" } spin-doctor = { path = "crates/doctor" } -spin-expressions = { path = "crates/expressions" } spin-factor-outbound-networking = { path = "crates/factor-outbound-networking" } spin-http = { path = "crates/http" } spin-loader = { path = "crates/loader" } diff --git a/crates/app/Cargo.toml b/crates/app/Cargo.toml index 1136ba2e7..887b65eef 100644 --- a/crates/app/Cargo.toml +++ b/crates/app/Cargo.toml @@ -5,9 +5,6 @@ authors = { workspace = true } edition = { workspace = true } [dependencies] -anyhow = { workspace = true } -async-trait = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } spin-locked-app = { path = "../locked-app" } -thiserror = { workspace = true } diff --git a/crates/build/Cargo.toml b/crates/build/Cargo.toml index 2bc920422..aa698b566 100644 --- a/crates/build/Cargo.toml +++ b/crates/build/Cargo.toml @@ -6,7 +6,6 @@ edition = { workspace = true } [dependencies] anyhow = { workspace = true } -futures = { workspace = true } serde = { workspace = true } spin-common = { path = "../common" } spin-manifest = { path = "../manifest" } @@ -14,4 +13,3 @@ subprocess = "0.2" terminal = { path = "../terminal" } tokio = { workspace = true, features = ["full"] } toml = { workspace = true } -tracing = { workspace = true } diff --git a/crates/compose/Cargo.toml b/crates/compose/Cargo.toml index 38beda3e2..34a910aa5 100644 --- a/crates/compose/Cargo.toml +++ b/crates/compose/Cargo.toml @@ -14,7 +14,6 @@ async-trait = { workspace = true } indexmap = "2" semver = "1" spin-app = { path = "../app" } -spin-componentize = { workspace = true } spin-serde = { path = "../serde" } thiserror = { workspace = true } wac-graph = "0.6" diff --git a/crates/expressions/Cargo.toml b/crates/expressions/Cargo.toml index 15bb79a68..cc416867e 100644 --- a/crates/expressions/Cargo.toml +++ b/crates/expressions/Cargo.toml @@ -7,7 +7,6 @@ edition = { workspace = true } [dependencies] anyhow = { workspace = true } async-trait = { workspace = true } -serde = { workspace = true } spin-locked-app = { path = "../locked-app" } thiserror = { workspace = true } diff --git a/crates/factor-outbound-http/Cargo.toml b/crates/factor-outbound-http/Cargo.toml index 55f620f9d..1377e464f 100644 --- a/crates/factor-outbound-http/Cargo.toml +++ b/crates/factor-outbound-http/Cargo.toml @@ -16,7 +16,6 @@ spin-factor-outbound-networking = { path = "../factor-outbound-networking" } spin-factors = { path = "../factors" } spin-telemetry = { path = "../telemetry" } spin-world = { path = "../world" } -terminal = { path = "../terminal" } tokio = { workspace = true, features = ["macros", "rt", "net"] } tokio-rustls = { version = "0.26", default-features = false, features = ["logging", "tls12"] } tracing = { workspace = true } diff --git a/crates/factor-outbound-mysql/Cargo.toml b/crates/factor-outbound-mysql/Cargo.toml index 5acd07d97..2d87fa38c 100644 --- a/crates/factor-outbound-mysql/Cargo.toml +++ b/crates/factor-outbound-mysql/Cargo.toml @@ -9,16 +9,11 @@ doctest = false [dependencies] anyhow = { workspace = true } -flate2 = "1" # Removing default features for mysql_async to remove flate2/zlib feature mysql_async = { version = "0.34", default-features = false, features = [ "native-tls-tls", ] } -# Removing default features for mysql_common to remove flate2/zlib feature -mysql_common = { version = "0.32", default-features = false } -spin-app = { path = "../app" } spin-core = { path = "../core" } -spin-expressions = { path = "../expressions" } spin-factor-outbound-networking = { path = "../factor-outbound-networking" } spin-factors = { path = "../factors" } spin-resource-table = { path = "../table" } diff --git a/crates/factor-outbound-networking/Cargo.toml b/crates/factor-outbound-networking/Cargo.toml index e88412490..9cec6379b 100644 --- a/crates/factor-outbound-networking/Cargo.toml +++ b/crates/factor-outbound-networking/Cargo.toml @@ -20,7 +20,6 @@ spin-factors = { path = "../factors" } spin-locked-app = { path = "../locked-app" } spin-manifest = { path = "../manifest" } spin-serde = { path = "../serde" } -terminal = { path = "../terminal" } tracing = { workspace = true } url = { workspace = true } urlencoding = "2" diff --git a/crates/factor-sqlite/Cargo.toml b/crates/factor-sqlite/Cargo.toml index bc2dc8438..ee945ed4f 100644 --- a/crates/factor-sqlite/Cargo.toml +++ b/crates/factor-sqlite/Cargo.toml @@ -10,13 +10,11 @@ rust-version.workspace = true [dependencies] async-trait = { workspace = true } -serde = { workspace = true } spin-factors = { path = "../factors" } spin-locked-app = { path = "../locked-app" } spin-resource-table = { path = "../table" } spin-world = { path = "../world" } tokio = { workspace = true } -toml = { workspace = true } tracing = { workspace = true } [dev-dependencies] diff --git a/crates/factor-variables/Cargo.toml b/crates/factor-variables/Cargo.toml index 82c915bf4..f02168ed4 100644 --- a/crates/factor-variables/Cargo.toml +++ b/crates/factor-variables/Cargo.toml @@ -5,11 +5,9 @@ authors = { workspace = true } edition = { workspace = true } [dependencies] -serde = { workspace = true } spin-expressions = { path = "../expressions" } spin-factors = { path = "../factors" } spin-world = { path = "../world" } -toml = { workspace = true } tracing = { workspace = true } [dev-dependencies] diff --git a/crates/factor-wasi/Cargo.toml b/crates/factor-wasi/Cargo.toml index 978b2cdb0..3647670be 100644 --- a/crates/factor-wasi/Cargo.toml +++ b/crates/factor-wasi/Cargo.toml @@ -7,7 +7,6 @@ edition = { workspace = true } [dependencies] async-trait = { workspace = true } bytes = { workspace = true } -cap-primitives = "3.0.0" spin-common = { path = "../common" } spin-factors = { path = "../factors" } tokio = { workspace = true } diff --git a/crates/factors-test/Cargo.toml b/crates/factors-test/Cargo.toml index 62c6549a4..514e3ac3e 100644 --- a/crates/factors-test/Cargo.toml +++ b/crates/factors-test/Cargo.toml @@ -5,10 +5,8 @@ authors = { workspace = true } edition = { workspace = true } [dependencies] -serde = { workspace = true } spin-app = { path = "../app" } spin-factors = { path = "../factors" } -spin-factors-derive = { path = "../factors-derive", features = ["expander"] } spin-loader = { path = "../loader" } tempfile = { workspace = true } toml = { workspace = true } diff --git a/crates/factors/Cargo.toml b/crates/factors/Cargo.toml index 9fe8c8383..05cb0e1a6 100644 --- a/crates/factors/Cargo.toml +++ b/crates/factors/Cargo.toml @@ -12,7 +12,6 @@ spin-factors-derive = { path = "../factors-derive" } thiserror = { workspace = true } # TODO: make this optional and behind a feature flag toml = { workspace = true } -tracing = { workspace = true } wasmtime = { workspace = true } [lints] diff --git a/crates/http/Cargo.toml b/crates/http/Cargo.toml index 1365afa9f..9d7cf8b17 100644 --- a/crates/http/Cargo.toml +++ b/crates/http/Cargo.toml @@ -14,7 +14,6 @@ percent-encoding = "2" routefinder = "0.5.4" serde = { workspace = true } spin-app = { path = "../app", optional = true } -spin-locked-app = { path = "../locked-app" } tracing = { workspace = true } wasmtime = { workspace = true } wasmtime-wasi-http = { workspace = true, optional = true } diff --git a/crates/key-value-azure/Cargo.toml b/crates/key-value-azure/Cargo.toml index dee1704b7..4697b0f92 100644 --- a/crates/key-value-azure/Cargo.toml +++ b/crates/key-value-azure/Cargo.toml @@ -16,8 +16,6 @@ futures = { workspace = true } serde = { workspace = true } spin-core = { path = "../core" } spin-factor-key-value = { path = "../factor-key-value" } -tokio = { workspace = true } -url = { workspace = true } [lints] workspace = true diff --git a/crates/key-value-redis/Cargo.toml b/crates/key-value-redis/Cargo.toml index 4096ff06a..35c105017 100644 --- a/crates/key-value-redis/Cargo.toml +++ b/crates/key-value-redis/Cargo.toml @@ -10,7 +10,6 @@ redis = { version = "0.27", features = ["tokio-comp", "tokio-native-tls-comp"] } serde = { workspace = true } spin-core = { path = "../core" } spin-factor-key-value = { path = "../factor-key-value" } -spin-world = { path = "../world" } tokio = { workspace = true } url = { workspace = true } diff --git a/crates/llm-local/Cargo.toml b/crates/llm-local/Cargo.toml index fc91e8b8f..86ee307ce 100644 --- a/crates/llm-local/Cargo.toml +++ b/crates/llm-local/Cargo.toml @@ -9,9 +9,6 @@ anyhow = "1.0" candle = { git = "https://github.com/huggingface/candle", rev = "e3261216b157a7305c18ccdd766b6e2a41afe483", package = "candle-core" } candle-nn = { git = "https://github.com/huggingface/candle", rev = "e3261216b157a7305c18ccdd766b6e2a41afe483" } candle-transformers = { git = "https://github.com/huggingface/candle", rev = "e3261216b157a7305c18ccdd766b6e2a41afe483" } -chrono = "0.4" -lru = "0.12" -num_cpus = "1" rand = { workspace = true } safetensors = "0.4" serde = { workspace = true } @@ -19,7 +16,6 @@ serde_json = { workspace = true } spin-common = { path = "../common" } spin-core = { path = "../core" } spin-world = { path = "../world" } -terminal = { path = "../terminal" } tokenizers = "0.20" tokio = { workspace = true, features = ["macros", "sync", "fs"] } tracing = { workspace = true } diff --git a/crates/loader/Cargo.toml b/crates/loader/Cargo.toml index 639e75463..d8d967278 100644 --- a/crates/loader/Cargo.toml +++ b/crates/loader/Cargo.toml @@ -6,36 +6,24 @@ edition = { workspace = true } [dependencies] anyhow = { workspace = true } -async-trait = { workspace = true } -bytes = { workspace = true } dirs = { workspace = true } futures = { workspace = true } glob = { workspace = true } -indexmap = "2" -itertools = { workspace = true } -lazy_static = "1" -mime_guess = "2" path-absolutize = { version = "3", features = ["use_unix_paths_on_wasm"] } -regex = { workspace = true } reqwest = "0.12" semver = "1" serde = { workspace = true } serde_json = { workspace = true } sha2 = { workspace = true } -shellexpand = "3" spin-common = { path = "../common" } spin-factor-outbound-networking = { path = "../factor-outbound-networking" } spin-locked-app = { path = "../locked-app" } spin-manifest = { path = "../manifest" } spin-serde = { path = "../serde" } tempfile = { workspace = true } -terminal = { path = "../terminal" } -thiserror = { workspace = true } tokio = { workspace = true } -tokio-util = "0.7" toml = { workspace = true } tracing = { workspace = true } -walkdir = "2" wasm-pkg-loader = "0.4" [dev-dependencies] diff --git a/crates/oci/Cargo.toml b/crates/oci/Cargo.toml index 1b7f5de95..2ca72e6f9 100644 --- a/crates/oci/Cargo.toml +++ b/crates/oci/Cargo.toml @@ -24,7 +24,6 @@ serde_json = { workspace = true } spin-common = { path = "../common" } spin-loader = { path = "../loader" } spin-locked-app = { path = "../locked-app" } -spin-manifest = { path = "../manifest" } tempfile = { workspace = true } tokio = { workspace = true, features = ["fs"] } tokio-util = { version = "0.7", features = ["compat"] } diff --git a/crates/plugins/Cargo.toml b/crates/plugins/Cargo.toml index 07019699e..b3714a6ef 100644 --- a/crates/plugins/Cargo.toml +++ b/crates/plugins/Cargo.toml @@ -6,7 +6,6 @@ edition = { workspace = true } [dependencies] anyhow = { workspace = true } -bytes = { workspace = true } chrono = { version = "0.4", features = ["serde"] } dirs = { workspace = true } fd-lock = "4" diff --git a/crates/runtime-factors/Cargo.toml b/crates/runtime-factors/Cargo.toml index 7bea71664..fd982d8be 100644 --- a/crates/runtime-factors/Cargo.toml +++ b/crates/runtime-factors/Cargo.toml @@ -31,7 +31,6 @@ spin-factor-wasi = { path = "../factor-wasi" } spin-factors = { path = "../factors" } spin-factors-executor = { path = "../factors-executor" } spin-runtime-config = { path = "../runtime-config" } -spin-telemetry = { path = "../telemetry" } spin-trigger = { path = "../trigger" } terminal = { path = "../terminal" } tracing = { workspace = true } diff --git a/crates/sqlite-inproc/Cargo.toml b/crates/sqlite-inproc/Cargo.toml index e53e1cabe..9151e4970 100644 --- a/crates/sqlite-inproc/Cargo.toml +++ b/crates/sqlite-inproc/Cargo.toml @@ -7,7 +7,6 @@ edition = { workspace = true } [dependencies] anyhow = { workspace = true } async-trait = { workspace = true } -rand = { workspace = true } rusqlite = { version = "0.32", features = ["bundled"] } spin-factor-sqlite = { path = "../factor-sqlite" } spin-world = { path = "../world" } diff --git a/crates/sqlite-libsql/Cargo.toml b/crates/sqlite-libsql/Cargo.toml index 3a5513419..0f8302f9e 100644 --- a/crates/sqlite-libsql/Cargo.toml +++ b/crates/sqlite-libsql/Cargo.toml @@ -10,10 +10,8 @@ async-trait = { workspace = true } # We don't actually use rusqlite itself, but we'd like the same bundled # libsqlite3-sys as used by spin-sqlite-inproc. libsql = { version = "0.5", features = ["remote"], default-features = false } -rusqlite = { version = "0.32", features = ["bundled"] } spin-factor-sqlite = { path = "../factor-sqlite" } spin-world = { path = "../world" } -sqlparser = "0.51" tokio = { workspace = true, features = ["full"] } [lints] diff --git a/crates/sqlite/Cargo.toml b/crates/sqlite/Cargo.toml index 51437faf1..16d284a67 100644 --- a/crates/sqlite/Cargo.toml +++ b/crates/sqlite/Cargo.toml @@ -5,14 +5,12 @@ authors = { workspace = true } edition = { workspace = true } [dependencies] -async-trait = { workspace = true } serde = { workspace = true } spin-factor-sqlite = { path = "../factor-sqlite" } spin-factors = { path = "../factors" } -spin-locked-app = { path = "../locked-app" } -spin-resource-table = { path = "../table" } +# spin-locked-app = { path = "../locked-app" } +# spin-resource-table = { path = "../table" } spin-sqlite-inproc = { path = "../sqlite-inproc" } spin-sqlite-libsql = { path = "../sqlite-libsql" } -spin-world = { path = "../world" } -tokio = { workspace = true } +# spin-world = { path = "../world" } toml = { workspace = true } diff --git a/crates/telemetry/Cargo.toml b/crates/telemetry/Cargo.toml index 07da37bb6..c33e0eff2 100644 --- a/crates/telemetry/Cargo.toml +++ b/crates/telemetry/Cargo.toml @@ -10,14 +10,11 @@ http0 = { version = "0.2.9", package = "http" } http1 = { version = "1.0.0", package = "http" } opentelemetry = { workspace = true } opentelemetry-otlp = { version = "0.25", features = ["http-proto", "http", "reqwest-client"] } -opentelemetry-semantic-conventions = "0.25" opentelemetry_sdk = { workspace = true } terminal = { path = "../terminal" } tracing = { workspace = true } -tracing-appender = "0.2" tracing-opentelemetry = { workspace = true } tracing-subscriber = { version = "0.3", default-features = false, features = ["smallvec", "fmt", "ansi", "std", "env-filter", "json", "registry"] } -url = { workspace = true } [features] tracing-log-compat = ["tracing-subscriber/tracing-log", "tracing-opentelemetry/tracing-log"] diff --git a/crates/templates/Cargo.toml b/crates/templates/Cargo.toml index 3604f1e8f..998734c49 100644 --- a/crates/templates/Cargo.toml +++ b/crates/templates/Cargo.toml @@ -6,11 +6,7 @@ edition = { workspace = true } [dependencies] anyhow = { workspace = true } -async-trait = { workspace = true } -bytes = { workspace = true } -console = "0.15" dialoguer = "0.11" -dirs = { workspace = true } fs_extra = "1" heck = "0.5" indexmap = { version = "2", features = ["serde"] } @@ -19,7 +15,6 @@ lazy_static = "1" liquid = "0.26" liquid-core = "0.26" liquid-derive = "0.26" -liquid-lib = "0.26" path-absolutize = "3" pathdiff = "0.2" regex = { workspace = true } diff --git a/crates/trigger-http/Cargo.toml b/crates/trigger-http/Cargo.toml index a7f95eec2..ad10fa3ed 100644 --- a/crates/trigger-http/Cargo.toml +++ b/crates/trigger-http/Cargo.toml @@ -9,16 +9,12 @@ doctest = false [dependencies] anyhow = { workspace = true } -async-trait = { workspace = true } clap = "3" futures = { workspace = true } -futures-util = "0.3" http = { workspace = true } http-body-util = { workspace = true } hyper = { workspace = true } hyper-util = { version = "0.1", features = ["tokio"] } -indexmap = "2" -percent-encoding = "2" rustls = { workspace = true } rustls-pemfile = "2.1.2" rustls-pki-types = "1.7" @@ -38,11 +34,8 @@ terminal = { path = "../terminal" } tokio = { workspace = true, features = ["full"] } tokio-rustls = { version = "0.26", default-features = false, features = ["logging", "tls12"] } tracing = { workspace = true } -url = { workspace = true } -wasmtime = { workspace = true } wasmtime-wasi = { workspace = true } wasmtime-wasi-http = { workspace = true } -webpki-roots = { version = "0.26" } [lints] workspace = true diff --git a/crates/trigger-redis/Cargo.toml b/crates/trigger-redis/Cargo.toml index 81b90c456..c9250682d 100644 --- a/crates/trigger-redis/Cargo.toml +++ b/crates/trigger-redis/Cargo.toml @@ -9,7 +9,6 @@ doctest = false [dependencies] anyhow = { workspace = true } -async-trait = { workspace = true } futures = { workspace = true } redis = { version = "0.27", features = ["tokio-comp"] } serde = { workspace = true } diff --git a/crates/trigger/Cargo.toml b/crates/trigger/Cargo.toml index 6fa114be2..0f46026c3 100644 --- a/crates/trigger/Cargo.toml +++ b/crates/trigger/Cargo.toml @@ -34,7 +34,6 @@ spin-factors = { path = "../factors" } spin-factors-executor = { path = "../factors-executor" } spin-telemetry = { path = "../telemetry" } tokio = { workspace = true, features = ["fs", "rt"] } -toml = { workspace = true } tracing = { workspace = true } [dev-dependencies] From 1d69c8c7aba0786ee2568bcae4ab7662e23cb59d Mon Sep 17 00:00:00 2001 From: "Jiaxiao Zhou (Mossaka)" Date: Tue, 1 Oct 2024 20:08:17 -0700 Subject: [PATCH 2/3] sqlite/Cargo: remove commented out lines Signed-off-by: Jiaxiao Zhou (Mossaka) --- crates/sqlite/Cargo.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/crates/sqlite/Cargo.toml b/crates/sqlite/Cargo.toml index 16d284a67..a200f8b9e 100644 --- a/crates/sqlite/Cargo.toml +++ b/crates/sqlite/Cargo.toml @@ -8,9 +8,6 @@ edition = { workspace = true } serde = { workspace = true } spin-factor-sqlite = { path = "../factor-sqlite" } spin-factors = { path = "../factors" } -# spin-locked-app = { path = "../locked-app" } -# spin-resource-table = { path = "../table" } spin-sqlite-inproc = { path = "../sqlite-inproc" } spin-sqlite-libsql = { path = "../sqlite-libsql" } -# spin-world = { path = "../world" } toml = { workspace = true } From 6b76495418eaab3e3e34d1d4dc9f5fbbadb8f6fa Mon Sep 17 00:00:00 2001 From: "Jiaxiao Zhou (Mossaka)" Date: Thu, 3 Oct 2024 15:58:54 -0700 Subject: [PATCH 3/3] Cargo: removed unused dependencies in examples and tests Signed-off-by: Jiaxiao Zhou (Mossaka) --- Cargo.lock | 6 ------ examples/http-rust/Cargo.toml | 1 - examples/spin-timer/Cargo.toml | 1 - examples/spin-wagi-http/http-rust/Cargo.toml | 2 -- tests/test-components/components/Cargo.lock | 7 ------- .../components/integration-http-outbound-post/Cargo.toml | 4 ---- .../components/internal-http-streaming-back/Cargo.toml | 2 -- tests/test-components/helper/Cargo.toml | 1 - tests/testing-framework/Cargo.toml | 6 ------ 9 files changed, 30 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 555aa1c05..f4b7b0347 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8133,25 +8133,19 @@ name = "testing-framework" version = "0.1.0" dependencies = [ "anyhow", - "fslock", "http 1.1.0", "http-body-util", "log", "nix 0.29.0", - "regex", "reqwest 0.12.7", "spin-app", - "spin-factors-executor", "spin-http", "spin-loader", "spin-runtime-factors", "spin-trigger", "spin-trigger-http", - "temp-dir", "test-environment", "tokio", - "toml 0.8.19", - "wasmtime-wasi-http", ] [[package]] diff --git a/examples/http-rust/Cargo.toml b/examples/http-rust/Cargo.toml index 525db0ea4..55ab97c36 100644 --- a/examples/http-rust/Cargo.toml +++ b/examples/http-rust/Cargo.toml @@ -9,7 +9,6 @@ crate-type = ["cdylib"] [dependencies] anyhow = "1" http = "0.2.9" -serde = { version = "1.0", features = ["derive"] } spin-sdk = "2.2.0" [workspace] diff --git a/examples/spin-timer/Cargo.toml b/examples/spin-timer/Cargo.toml index 6071955d2..8fe12fba0 100644 --- a/examples/spin-timer/Cargo.toml +++ b/examples/spin-timer/Cargo.toml @@ -7,7 +7,6 @@ edition = "2021" [dependencies] anyhow = "1.0.68" clap = { version = "3.1.15", features = ["derive", "env"] } -futures = "0.3.25" serde = "1.0.188" spin-factors = { path = "../../crates/factors" } spin-runtime-factors = { path = "../../crates/runtime-factors" } diff --git a/examples/spin-wagi-http/http-rust/Cargo.toml b/examples/spin-wagi-http/http-rust/Cargo.toml index b5fb3c8d3..e34814867 100644 --- a/examples/spin-wagi-http/http-rust/Cargo.toml +++ b/examples/spin-wagi-http/http-rust/Cargo.toml @@ -9,8 +9,6 @@ crate-type = ["cdylib"] [dependencies] # Useful crate to handle errors. anyhow = "1" -# Crate to simplify working with bytes. -bytes = "1" # General-purpose crate with common HTTP types. http = "0.2" # The Spin SDK. diff --git a/tests/test-components/components/Cargo.lock b/tests/test-components/components/Cargo.lock index c8a222412..3c6212dd8 100644 --- a/tests/test-components/components/Cargo.lock +++ b/tests/test-components/components/Cargo.lock @@ -255,7 +255,6 @@ dependencies = [ name = "helper" version = "0.1.0" dependencies = [ - "anyhow", "wit-bindgen 0.16.0", ] @@ -393,9 +392,7 @@ dependencies = [ name = "internal-http-streaming-back-component" version = "0.1.0" dependencies = [ - "anyhow", "futures", - "helper", "spin-sdk 2.2.0", ] @@ -712,11 +709,7 @@ name = "spin-outbound-post" version = "0.1.0" dependencies = [ "anyhow", - "futures", - "hex", - "sha2", "spin-sdk 2.2.0", - "url", ] [[package]] diff --git a/tests/test-components/components/integration-http-outbound-post/Cargo.toml b/tests/test-components/components/integration-http-outbound-post/Cargo.toml index b1d4be0ca..eef81b7d2 100644 --- a/tests/test-components/components/integration-http-outbound-post/Cargo.toml +++ b/tests/test-components/components/integration-http-outbound-post/Cargo.toml @@ -8,8 +8,4 @@ crate-type = ["cdylib"] [dependencies] anyhow = "1.0.71" -futures = "0.3.28" -hex = "0.4.3" -sha2 = "0.10" -url = "2.4.0" spin-sdk = "2.2.0" diff --git a/tests/test-components/components/internal-http-streaming-back/Cargo.toml b/tests/test-components/components/internal-http-streaming-back/Cargo.toml index ecebcfc90..b939aed9c 100644 --- a/tests/test-components/components/internal-http-streaming-back/Cargo.toml +++ b/tests/test-components/components/internal-http-streaming-back/Cargo.toml @@ -7,7 +7,5 @@ edition = "2021" crate-type = ["cdylib"] [dependencies] -anyhow = "1" futures = "0.3.30" -helper = { path = "../../helper", default-features = false } spin-sdk = "2.2" diff --git a/tests/test-components/helper/Cargo.toml b/tests/test-components/helper/Cargo.toml index 6cbb68d7f..a9dbe7f71 100644 --- a/tests/test-components/helper/Cargo.toml +++ b/tests/test-components/helper/Cargo.toml @@ -5,7 +5,6 @@ edition = "2021" [dependencies] wit-bindgen = { version = "0.16.0", optional = true } -anyhow = { workspace = true } [features] default = ["define-component"] diff --git a/tests/testing-framework/Cargo.toml b/tests/testing-framework/Cargo.toml index 915e2856f..f21903958 100644 --- a/tests/testing-framework/Cargo.toml +++ b/tests/testing-framework/Cargo.toml @@ -5,22 +5,16 @@ edition = "2021" [dependencies] anyhow = { workspace = true } -fslock = "0.2.1" http = "1.0" http-body-util = "0.1.0" log = "0.4" nix = "0.29" -regex = "1.10.2" reqwest = { workspace = true } -temp-dir = "0.1.11" test-environment = { workspace = true } spin-app = { path = "../../crates/app" } -spin-factors-executor = { path = "../../crates/factors-executor" } spin-http = { path = "../../crates/http" } spin-loader = { path = "../../crates/loader" } spin-runtime-factors = { path = "../../crates/runtime-factors" } spin-trigger = { path = "../../crates/trigger" } spin-trigger-http = { path = "../../crates/trigger-http" } -toml = { workspace = true } tokio = { workspace = true } -wasmtime-wasi-http = { workspace = true }