Skip to content

Commit a1fe928

Browse files
lannlann
authored
Merge pull request #2767 from lann/taplo
Add taplo.toml and format tomls
2 parents c02b441 + f4d2854 commit a1fe928

File tree

48 files changed

+129
-114
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+129
-114
lines changed

‎.cargo/config.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[net]
2-
git-fetch-with-cli = true
2+
git-fetch-with-cli = true
33

44
[target.aarch64-unknown-linux-gnu]
5-
rustflags = ["-C", "target-feature=+fp16"]
5+
rustflags = ["-C", "target-feature=+fp16"]
66

77
[target.aarch64-unknown-linux-musl]
8-
rustflags = ["-C", "target-feature=+fp16", "-C", "target-feature=+crt-static", "-C", "link-self-contained=yes"]
8+
rustflags = ["-C", "target-feature=+fp16", "-C", "target-feature=+crt-static", "-C", "link-self-contained=yes"]
99

1010
[target.x86_64-unknown-linux-musl]
11-
rustflags = ["-C", "target-feature=+crt-static", "-C", "link-self-contained=yes"]
11+
rustflags = ["-C", "target-feature=+crt-static", "-C", "link-self-contained=yes"]

‎Cargo.toml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ bytes = "1.1"
2121
chrono = "0.4"
2222
clap = { version = "3.2.24", features = ["derive", "env"] }
2323
clearscreen = "2.0.1"
24-
command-group = "2.1"
2524
comfy-table = "5.0"
25+
command-group = "2.1"
2626
ctrlc = { version = "3.2", features = ["termination"] }
2727
dialoguer = "0.10"
2828
dirs = "4.0"
@@ -35,8 +35,6 @@ itertools = "0.11.0"
3535
lazy_static = "1.4.0"
3636
levenshtein = "1.0.5"
3737
nix = { version = "0.24", features = ["signal"] }
38-
spin-key-value = { path = "crates/key-value" }
39-
spin-key-value-sqlite = { path = "crates/key-value-sqlite" }
4038
path-absolutize = "3.0.11"
4139
rand = "0.8"
4240
regex = "1.5.5"
@@ -46,13 +44,14 @@ semver = "1.0"
4644
serde = { version = "1.0", features = ["derive"] }
4745
serde_json = "1.0.82"
4846
sha2 = "0.10.2"
49-
terminal = { path = "crates/terminal" }
5047
spin-app = { path = "crates/app" }
5148
spin-build = { path = "crates/build" }
5249
spin-common = { path = "crates/common" }
5350
spin-doctor = { path = "crates/doctor" }
5451
spin-expressions = { path = "crates/expressions" }
5552
spin-http = { path = "crates/http" }
53+
spin-key-value = { path = "crates/key-value" }
54+
spin-key-value-sqlite = { path = "crates/key-value-sqlite" }
5655
spin-loader = { path = "crates/loader" }
5756
spin-locked-app = { path = "crates/locked-app" }
5857
spin-manifest = { path = "crates/manifest" }
@@ -65,7 +64,9 @@ spin-templates = { path = "crates/templates" }
6564
spin-trigger = { path = "crates/trigger" }
6665
spin-trigger-http = { path = "crates/trigger-http" }
6766
spin-trigger-redis = { path = "crates/trigger-redis" }
67+
terminal = { path = "crates/terminal" }
6868

69+
subprocess = "0.2.9"
6970
tempfile = "3.8.0"
7071
tokio = { version = "1.23", features = ["full"] }
7172
toml = "0.6"
@@ -75,7 +76,6 @@ uuid = { version = "^1.0", features = ["v4"] }
7576
wasmtime = { workspace = true }
7677
watchexec = { git = "https://github.com/watchexec/watchexec.git", rev = "8e91d26ef6400c1e60b32a8314cbb144fa33f288" }
7778
watchexec-filterer-globset = { git = "https://github.com/watchexec/watchexec.git", rev = "8e91d26ef6400c1e60b32a8314cbb144fa33f288" }
78-
subprocess = "0.2.9"
7979

8080
[target.'cfg(target_os = "linux")'.dependencies]
8181
# This needs to be an explicit dependency to enable
@@ -84,20 +84,20 @@ openssl = { version = "0.10" }
8484

8585
[dev-dependencies]
8686
anyhow = { workspace = true, features = ["backtrace"] }
87+
conformance = { path = "tests/conformance-tests" }
88+
conformance-tests = { workspace = true }
8789
hex = "0.4.3"
88-
hyper = { workspace = true }
89-
sha2 = "0.10.1"
90-
which = "4.2.5"
9190
http-body-util = { workspace = true }
92-
testing-framework = { path = "tests/testing-framework" }
91+
hyper = { workspace = true }
9392
hyper-util = { version = "0.1.2", features = ["tokio"] }
9493
redis = "0.24"
9594
runtime-tests = { path = "tests/runtime-tests" }
96-
test-components = { path = "tests/test-components" }
95+
sha2 = "0.10.1"
9796
test-codegen-macro = { path = "crates/test-codegen-macro" }
97+
test-components = { path = "tests/test-components" }
9898
test-environment = { workspace = true }
99-
conformance-tests = { workspace = true }
100-
conformance = { path = "tests/conformance-tests" }
99+
testing-framework = { path = "tests/testing-framework" }
100+
which = "4.2.5"
101101

102102
[build-dependencies]
103103
cargo-target-dep = { git = "https://github.com/fermyon/cargo-target-dep", rev = "482f269eceb7b1a7e8fc618bf8c082dd24979cf1" }
@@ -127,12 +127,12 @@ members = [
127127

128128
[workspace.dependencies]
129129
anyhow = "1.0.75"
130+
conformance-tests = { git = "https://github.com/fermyon/conformance-tests", rev = "387b7f375df59e6254a7c29cf4a53507a9f46d32" }
130131
http-body-util = "0.1.0"
131132
hyper = { version = "1.0.0", features = ["full"] }
132133
reqwest = { version = "0.12", features = ["stream", "blocking"] }
133-
tracing = { version = "0.1", features = ["log"] }
134-
conformance-tests = { git = "https://github.com/fermyon/conformance-tests", rev = "387b7f375df59e6254a7c29cf4a53507a9f46d32" }
135134
test-environment = { git = "https://github.com/fermyon/conformance-tests", rev = "387b7f375df59e6254a7c29cf4a53507a9f46d32" }
135+
tracing = { version = "0.1", features = ["log"] }
136136

137137
wasi-common-preview1 = { version = "22.0.0", package = "wasi-common", features = [
138138
"tokio",

‎Cross.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[build]
2-
default-target = "x86_64-unknown-linux-musl"
2+
default-target = "x86_64-unknown-linux-musl"
33

44
[build.env]
5-
passthrough = [ "BUILD_SPIN_EXAMPLES", "RUSTFLAGS", ]
5+
passthrough = ["BUILD_SPIN_EXAMPLES", "RUSTFLAGS"]
66

77
[target.aarch64-unknown-linux-musl]
8-
dockerfile.file = "./cross/Dockerfile"
9-
dockerfile.context = "./cross/"
8+
dockerfile.file = "./cross/Dockerfile"
9+
dockerfile.context = "./cross/"

‎crates/build/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ edition = { workspace = true }
77
[dependencies]
88
anyhow = "1.0.57"
99
futures = "0.3.21"
10-
serde = { version = "1.0", features = [ "derive" ] }
10+
serde = { version = "1.0", features = ["derive"] }
1111
spin-common = { path = "../common" }
1212
spin-manifest = { path = "../manifest" }
13-
terminal = { path = "../terminal" }
1413
subprocess = "0.2.8"
15-
tokio = { version = "1.23", features = [ "full" ] }
14+
terminal = { path = "../terminal" }
15+
tokio = { version = "1.23", features = ["full"] }
1616
toml = "0.5"
1717
tracing = { workspace = true }

‎crates/common/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ dirs = "5.0.1"
1010
sha2 = "0.10"
1111
tempfile = "3.5"
1212
tokio = { version = "1", features = ["rt", "time"] }
13-
url = "2"
13+
url = "2"

‎crates/componentize/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,23 @@ rust-version.workspace = true
1111
[dependencies]
1212
anyhow = { workspace = true }
1313
tracing = "0.1"
14-
wasmparser = "0.200.0"
1514
wasm-encoder = "0.200.0"
1615
wasm-metadata = "0.200.0"
16+
wasmparser = "0.200.0"
1717
wit-component = "0.200.0"
1818
wit-parser = "0.200.0"
1919

2020
[dev-dependencies]
21-
wasmtime = { workspace = true }
22-
wasmtime-wasi = { workspace = true }
23-
tokio = { version = "1.36.0", features = ["macros", "rt", "fs"] }
2421
async-trait = "0.1.77"
2522
cap-std = "2.0.1"
2623
rand = "0.8.5"
2724
rand_chacha = "0.3.1"
2825
rand_core = "0.6.4"
2926
serde = { version = "1.0.197", features = ["derive"] }
27+
serde_json = "1.0"
3028
tempfile = "3.10.0"
29+
tokio = { version = "1.36.0", features = ["macros", "rt", "fs"] }
3130
toml = "0.8.10"
32-
serde_json = "1.0"
33-
wat = "1.200.0"
31+
wasmtime = { workspace = true }
32+
wasmtime-wasi = { workspace = true }
33+
wat = "1.200.0"

‎crates/compose/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ rust-version.workspace = true
1212
anyhow = { workspace = true }
1313
async-trait = "0.1"
1414
indexmap = "2.2.6"
15+
semver = "1"
1516
spin-app = { path = "../app" }
16-
spin-serde = { path = "../serde" }
1717
spin-componentize = { workspace = true }
18-
semver = "1"
18+
spin-serde = { path = "../serde" }
1919
thiserror = "1"
2020
tokio = { version = "1.23", features = ["fs"] }
2121
wac-graph = "0.5.0"

‎crates/compose/deny-all/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ world = "deny-all"
3131
"wasi:cli" = { path = "wit/deps/wasi/cli.wasm" }
3232
"wasi:io" = { path = "wit/deps/wasi/io.wasm" }
3333

34-
[workspace]
34+
[workspace]

‎crates/core/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ wasmtime = { workspace = true }
1313
[dev-dependencies]
1414
serde_json = "1"
1515
spin-componentize = { workspace = true }
16-
tokio = { version = "1", features = ["macros", "rt", "rt-multi-thread"] }
1716
spin-factor-wasi = { path = "../factor-wasi" }
1817
spin-factors = { path = "../factors" }
1918
spin-factors-test = { path = "../factors-test" }
2019
spin-locked-app = { path = "../locked-app" }
21-
wasmtime-wasi = { workspace = true }
20+
tokio = { version = "1", features = ["macros", "rt", "rt-multi-thread"] }
21+
wasmtime-wasi = { workspace = true }

‎crates/expressions/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ anyhow = "1.0"
99
async-trait = "0.1"
1010
dotenvy = "0.15"
1111
once_cell = "1"
12+
serde = "1.0.188"
1213
spin-locked-app = { path = "../locked-app" }
1314
thiserror = "1"
14-
serde = "1.0.188"
1515

1616
[dev-dependencies]
17-
toml = "0.5"
1817
tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
18+
toml = "0.5"

0 commit comments

Comments
 (0)