Merge pull request #2767 from lann/taplo

Add taplo.toml and format tomls
fermyon · Aug 28, 2024 · a1fe928 · a1fe928
2 parents c02b441 + f4d2854
commit a1fe928
Show file tree

Hide file tree

Showing 48 changed files with 129 additions and 114 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -1,11 +1,11 @@
 [net]
-    git-fetch-with-cli = true
+git-fetch-with-cli = true
 
 [target.aarch64-unknown-linux-gnu]
-    rustflags = ["-C", "target-feature=+fp16"]
+rustflags = ["-C", "target-feature=+fp16"]
 
 [target.aarch64-unknown-linux-musl]
-    rustflags = ["-C", "target-feature=+fp16", "-C", "target-feature=+crt-static", "-C", "link-self-contained=yes"]
+rustflags = ["-C", "target-feature=+fp16", "-C", "target-feature=+crt-static", "-C", "link-self-contained=yes"]
 
 [target.x86_64-unknown-linux-musl]
-    rustflags = ["-C", "target-feature=+crt-static", "-C", "link-self-contained=yes"]
+rustflags = ["-C", "target-feature=+crt-static", "-C", "link-self-contained=yes"]
diff --git a/Cargo.toml b/Cargo.toml
@@ -21,8 +21,8 @@ bytes = "1.1"
 chrono = "0.4"
 clap = { version = "3.2.24", features = ["derive", "env"] }
 clearscreen = "2.0.1"
-command-group = "2.1"
 comfy-table = "5.0"
+command-group = "2.1"
 ctrlc = { version = "3.2", features = ["termination"] }
 dialoguer = "0.10"
 dirs = "4.0"
@@ -35,8 +35,6 @@ itertools = "0.11.0"
 lazy_static = "1.4.0"
 levenshtein = "1.0.5"
 nix = { version = "0.24", features = ["signal"] }
-spin-key-value = { path = "crates/key-value" }
-spin-key-value-sqlite = { path = "crates/key-value-sqlite" }
 path-absolutize = "3.0.11"
 rand = "0.8"
 regex = "1.5.5"
@@ -46,13 +44,14 @@ semver = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.82"
 sha2 = "0.10.2"
-terminal = { path = "crates/terminal" }
 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-http = { path = "crates/http" }
+spin-key-value = { path = "crates/key-value" }
+spin-key-value-sqlite = { path = "crates/key-value-sqlite" }
 spin-loader = { path = "crates/loader" }
 spin-locked-app = { path = "crates/locked-app" }
 spin-manifest = { path = "crates/manifest" }
@@ -65,7 +64,9 @@ spin-templates = { path = "crates/templates" }
 spin-trigger = { path = "crates/trigger" }
 spin-trigger-http = { path = "crates/trigger-http" }
 spin-trigger-redis = { path = "crates/trigger-redis" }
+terminal = { path = "crates/terminal" }
 
+subprocess = "0.2.9"
 tempfile = "3.8.0"
 tokio = { version = "1.23", features = ["full"] }
 toml = "0.6"
@@ -75,7 +76,6 @@ 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" }
-subprocess = "0.2.9"
 
 [target.'cfg(target_os = "linux")'.dependencies]
 # This needs to be an explicit dependency to enable
@@ -84,20 +84,20 @@ openssl = { version = "0.10" }
 
 [dev-dependencies]
 anyhow = { workspace = true, features = ["backtrace"] }
+conformance = { path = "tests/conformance-tests" }
+conformance-tests = { workspace = true }
 hex = "0.4.3"
-hyper = { workspace = true }
-sha2 = "0.10.1"
-which = "4.2.5"
 http-body-util = { workspace = true }
-testing-framework = { path = "tests/testing-framework" }
+hyper = { workspace = true }
 hyper-util = { version = "0.1.2", features = ["tokio"] }
 redis = "0.24"
 runtime-tests = { path = "tests/runtime-tests" }
-test-components = { path = "tests/test-components" }
+sha2 = "0.10.1"
 test-codegen-macro = { path = "crates/test-codegen-macro" }
+test-components = { path = "tests/test-components" }
 test-environment = { workspace = true }
-conformance-tests = { workspace = true }
-conformance = { path = "tests/conformance-tests" }
+testing-framework = { path = "tests/testing-framework" }
+which = "4.2.5"
 
 [build-dependencies]
 cargo-target-dep = { git = "https://github.com/fermyon/cargo-target-dep", rev = "482f269eceb7b1a7e8fc618bf8c082dd24979cf1" }
@@ -127,12 +127,12 @@ members = [
 
 [workspace.dependencies]
 anyhow = "1.0.75"
+conformance-tests = { git = "https://github.com/fermyon/conformance-tests", rev = "387b7f375df59e6254a7c29cf4a53507a9f46d32" }
 http-body-util = "0.1.0"
 hyper = { version = "1.0.0", features = ["full"] }
 reqwest = { version = "0.12", features = ["stream", "blocking"] }
-tracing = { version = "0.1", features = ["log"] }
-conformance-tests = { git = "https://github.com/fermyon/conformance-tests", rev = "387b7f375df59e6254a7c29cf4a53507a9f46d32" }
 test-environment = { git = "https://github.com/fermyon/conformance-tests", rev = "387b7f375df59e6254a7c29cf4a53507a9f46d32" }
+tracing = { version = "0.1", features = ["log"] }
 
 wasi-common-preview1 = { version = "22.0.0", package = "wasi-common", features = [
   "tokio",

diff --git a/Cross.toml b/Cross.toml
@@ -1,9 +1,9 @@
 [build]
-    default-target = "x86_64-unknown-linux-musl"
+default-target = "x86_64-unknown-linux-musl"
 
 [build.env]
-    passthrough = [ "BUILD_SPIN_EXAMPLES", "RUSTFLAGS", ]
+passthrough = ["BUILD_SPIN_EXAMPLES", "RUSTFLAGS"]
 
 [target.aarch64-unknown-linux-musl]
-    dockerfile.file = "./cross/Dockerfile"
-    dockerfile.context = "./cross/"
+dockerfile.file = "./cross/Dockerfile"
+dockerfile.context = "./cross/"
diff --git a/crates/build/Cargo.toml b/crates/build/Cargo.toml
@@ -7,11 +7,11 @@ edition = { workspace = true }
 [dependencies]
 anyhow = "1.0.57"
 futures = "0.3.21"
-serde = { version = "1.0", features = [ "derive" ] }
+serde = { version = "1.0", features = ["derive"] }
 spin-common = { path = "../common" }
 spin-manifest = { path = "../manifest" }
-terminal = { path = "../terminal" }
 subprocess = "0.2.8"
-tokio = { version = "1.23", features = [ "full" ] }
+terminal = { path = "../terminal" }
+tokio = { version = "1.23", features = ["full"] }
 toml = "0.5"
 tracing = { workspace = true }
diff --git a/crates/common/Cargo.toml b/crates/common/Cargo.toml
@@ -10,4 +10,4 @@ dirs = "5.0.1"
 sha2 = "0.10"
 tempfile = "3.5"
 tokio = { version = "1", features = ["rt", "time"] }
-url = "2"
+url = "2"
diff --git a/crates/componentize/Cargo.toml b/crates/componentize/Cargo.toml
@@ -11,23 +11,23 @@ rust-version.workspace = true
 [dependencies]
 anyhow = { workspace = true }
 tracing = "0.1"
-wasmparser = "0.200.0"
 wasm-encoder = "0.200.0"
 wasm-metadata = "0.200.0"
+wasmparser = "0.200.0"
 wit-component = "0.200.0"
 wit-parser = "0.200.0"
 
 [dev-dependencies]
-wasmtime = { workspace = true }
-wasmtime-wasi = { workspace = true }
-tokio = { version = "1.36.0", features = ["macros", "rt", "fs"] }
 async-trait = "0.1.77"
 cap-std = "2.0.1"
 rand = "0.8.5"
 rand_chacha = "0.3.1"
 rand_core = "0.6.4"
 serde = { version = "1.0.197", features = ["derive"] }
+serde_json = "1.0"
 tempfile = "3.10.0"
+tokio = { version = "1.36.0", features = ["macros", "rt", "fs"] }
 toml = "0.8.10"
-serde_json = "1.0"
-wat = "1.200.0"
+wasmtime = { workspace = true }
+wasmtime-wasi = { workspace = true }
+wat = "1.200.0"
diff --git a/crates/compose/Cargo.toml b/crates/compose/Cargo.toml
@@ -12,10 +12,10 @@ rust-version.workspace = true
 anyhow = { workspace = true }
 async-trait = "0.1"
 indexmap = "2.2.6"
+semver = "1"
 spin-app = { path = "../app" }
-spin-serde = { path = "../serde" }
 spin-componentize = { workspace = true }
-semver = "1"
+spin-serde = { path = "../serde" }
 thiserror = "1"
 tokio = { version = "1.23", features = ["fs"] }
 wac-graph = "0.5.0"

diff --git a/crates/compose/deny-all/Cargo.toml b/crates/compose/deny-all/Cargo.toml
@@ -31,4 +31,4 @@ world = "deny-all"
 "wasi:cli" = { path = "wit/deps/wasi/cli.wasm" }
 "wasi:io" = { path = "wit/deps/wasi/io.wasm" }
 
-[workspace]
+[workspace]
diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
@@ -13,9 +13,9 @@ wasmtime = { workspace = true }
 [dev-dependencies]
 serde_json = "1"
 spin-componentize = { workspace = true }
-tokio = { version = "1", features = ["macros", "rt", "rt-multi-thread"] }
 spin-factor-wasi = { path = "../factor-wasi" }
 spin-factors = { path = "../factors" }
 spin-factors-test = { path = "../factors-test" }
 spin-locked-app = { path = "../locked-app" }
-wasmtime-wasi = { workspace = true }
+tokio = { version = "1", features = ["macros", "rt", "rt-multi-thread"] }
+wasmtime-wasi = { workspace = true }
diff --git a/crates/expressions/Cargo.toml b/crates/expressions/Cargo.toml
@@ -9,10 +9,10 @@ anyhow = "1.0"
 async-trait = "0.1"
 dotenvy = "0.15"
 once_cell = "1"
+serde = "1.0.188"
 spin-locked-app = { path = "../locked-app" }
 thiserror = "1"
-serde = "1.0.188"
 
 [dev-dependencies]
-toml = "0.5"
 tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
+toml = "0.5"
diff --git a/crates/factor-key-value/Cargo.toml b/crates/factor-key-value/Cargo.toml
@@ -14,11 +14,11 @@ spin-world = { path = "../world" }
 toml = "0.8"
 
 [dev-dependencies]
-spin-factors-test = { path = "../factors-test" }
-tokio = { version = "1", features = ["macros", "rt"] }
-spin-factor-key-value-spin = { path = "../factor-key-value-spin" }
 spin-factor-key-value-redis = { path = "../factor-key-value-redis" }
+spin-factor-key-value-spin = { path = "../factor-key-value-spin" }
+spin-factors-test = { path = "../factors-test" }
 tempfile = "3.12.0"
+tokio = { version = "1", features = ["macros", "rt"] }
 
 
 [lints]

diff --git a/crates/factor-llm/Cargo.toml b/crates/factor-llm/Cargo.toml
@@ -22,9 +22,9 @@ spin-llm-local = { path = "../llm-local", optional = true }
 spin-llm-remote-http = { path = "../llm-remote-http" }
 spin-locked-app = { path = "../locked-app" }
 spin-world = { path = "../world" }
-tracing = { workspace = true }
 tokio = { version = "1", features = ["sync"] }
 toml = "0.8"
+tracing = { workspace = true }
 url = { version = "2", features = ["serde"] }
 
 [dev-dependencies]

diff --git a/crates/factor-outbound-mqtt/Cargo.toml b/crates/factor-outbound-mqtt/Cargo.toml
@@ -7,9 +7,9 @@ edition = { workspace = true }
 [dependencies]
 anyhow = "1.0"
 rumqttc = { version = "0.24", features = ["url"] }
+spin-core = { path = "../core" }
 spin-factor-outbound-networking = { path = "../factor-outbound-networking" }
 spin-factors = { path = "../factors" }
-spin-core = { path = "../core" }
 spin-world = { path = "../world" }
 table = { path = "../table" }
 tokio = { version = "1.0", features = ["sync"] }

diff --git a/crates/factor-outbound-mysql/Cargo.toml b/crates/factor-outbound-mysql/Cargo.toml
@@ -12,15 +12,15 @@ anyhow = "1.0"
 flate2 = "1.0.17"
 # Removing default features for mysql_async to remove flate2/zlib feature
 mysql_async = { version = "0.33.0", default-features = false, features = [
-    "native-tls-tls",
+  "native-tls-tls",
 ] }
 # Removing default features for mysql_common to remove flate2/zlib feature
 mysql_common = { version = "0.31.0", 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-factors = { path = "../factors" }
 spin-outbound-networking = { path = "../outbound-networking" }
 spin-world = { path = "../world" }
 table = { path = "../table" }

diff --git a/crates/factor-outbound-networking/Cargo.toml b/crates/factor-outbound-networking/Cargo.toml
@@ -33,7 +33,7 @@ wasmtime-wasi = { workspace = true }
 default = ["spin-cli"]
 # Includes the runtime configuration handling used by the Spin CLI
 spin-cli = [
-    "dep:rustls-pemfile",
+  "dep:rustls-pemfile",
 ]
 [lints]
 workspace = true
diff --git a/crates/factor-outbound-redis/Cargo.toml b/crates/factor-outbound-redis/Cargo.toml
@@ -6,19 +6,19 @@ edition = { workspace = true }
 
 [dependencies]
 anyhow = "1.0"
+redis = { version = "0.21", features = ["tokio-comp", "tokio-native-tls-comp", "aio"] }
+spin-core = { path = "../core" }
 spin-factor-outbound-networking = { path = "../factor-outbound-networking" }
 spin-factors = { path = "../factors" }
-spin-core = { path = "../core" }
 spin-world = { path = "../world" }
-tracing = { workspace = true }
 table = { path = "../table" }
-redis = { version = "0.21", features = ["tokio-comp", "tokio-native-tls-comp", "aio"] }
+tracing = { workspace = true }
 
 
 [dev-dependencies]
+spin-factor-variables = { path = "../factor-variables" }
 spin-factors-test = { path = "../factors-test" }
 tokio = { version = "1", features = ["macros", "rt"] }
-spin-factor-variables = { path = "../factor-variables" }
 
 # wasmtime-wasi-http = { workspace = true }
 [lints]

diff --git a/crates/factor-sqlite/Cargo.toml b/crates/factor-sqlite/Cargo.toml
@@ -13,13 +13,13 @@ async-trait = "0.1"
 serde = { version = "1.0", features = ["rc"] }
 spin-factors = { path = "../factors" }
 spin-locked-app = { path = "../locked-app" }
+spin-sqlite = { path = "../sqlite", optional = true }
+spin-sqlite-inproc = { path = "../sqlite-inproc", optional = true }
+spin-sqlite-libsql = { path = "../sqlite-libsql", optional = true }
 spin-world = { path = "../world" }
 table = { path = "../table" }
 tokio = "1"
 toml = "0.8"
-spin-sqlite = { path = "../sqlite", optional = true }
-spin-sqlite-inproc = { path = "../sqlite-inproc", optional = true }
-spin-sqlite-libsql = { path = "../sqlite-libsql", optional = true }
 
 [dev-dependencies]
 spin-factors-test = { path = "../factors-test" }
@@ -29,9 +29,9 @@ tokio = { version = "1", features = ["macros", "rt"] }
 default = ["spin-cli"]
 # Includes the runtime configuration handling used by the Spin CLI
 spin-cli = [
-    "dep:spin-sqlite",
-    "dep:spin-sqlite-inproc",
-    "dep:spin-sqlite-libsql",
+  "dep:spin-sqlite",
+  "dep:spin-sqlite-inproc",
+  "dep:spin-sqlite-libsql",
 ]
 
 [lints]

diff --git a/crates/factor-variables/Cargo.toml b/crates/factor-variables/Cargo.toml
@@ -5,9 +5,9 @@ authors = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
-azure_security_keyvault = { git = "https://github.com/azure/azure-sdk-for-rust", rev = "8c4caa251c3903d5eae848b41bb1d02a4d65231c" }
 azure_core = { git = "https://github.com/azure/azure-sdk-for-rust", rev = "8c4caa251c3903d5eae848b41bb1d02a4d65231c" }
 azure_identity = { git = "https://github.com/azure/azure-sdk-for-rust", rev = "8c4caa251c3903d5eae848b41bb1d02a4d65231c" }
+azure_security_keyvault = { git = "https://github.com/azure/azure-sdk-for-rust", rev = "8c4caa251c3903d5eae848b41bb1d02a4d65231c" }
 dotenvy = "0.15"
 serde = { version = "1.0", features = ["rc"] }
 spin-expressions = { path = "../expressions" }

diff --git a/crates/http/Cargo.toml b/crates/http/Cargo.toml
@@ -7,16 +7,16 @@ edition = { workspace = true }
 [dependencies]
 anyhow = "1.0"
 http = "1.0.0"
-hyper = { workspace = true }
 http-body-util = { workspace = true }
-wasmtime-wasi-http = { workspace = true, optional = true }
+hyper = { workspace = true }
 indexmap = "1"
 percent-encoding = "2"
 routefinder = "0.5.4"
 serde = { version = "1.0", features = ["derive"] }
-tracing = { workspace = true }
 spin-app = { path = "../app", optional = true }
 spin-locked-app = { path = "../locked-app" }
+tracing = { workspace = true }
+wasmtime-wasi-http = { workspace = true, optional = true }
 
 [dev-dependencies]
 toml = "0.8.2"

diff --git a/crates/key-value-azure/Cargo.toml b/crates/key-value-azure/Cargo.toml
@@ -10,11 +10,11 @@ azure_data_cosmos = { git = "https://github.com/azure/azure-sdk-for-rust.git", r
 azure_identity = { git = "https://github.com/azure/azure-sdk-for-rust.git", rev = "8c4caa251c3903d5eae848b41bb1d02a4d65231c" }
 futures = "0.3.28"
 serde = { version = "1.0", features = ["derive"] }
-spin-key-value = { path = "../key-value" }
 spin-core = { path = "../core" }
+spin-key-value = { path = "../key-value" }
 tokio = "1"
-url = "2"
 tracing = { workspace = true }
+url = "2"
 
 [lints]
 workspace = true