Skip to content

Commit a2b4148

Browse files
sunfishcodealexcrichton
sunfishcode
authored and
alexcrichton
committed
General Cargo.toml cleanup. (bytecodealliance#529)
* General Cargo.toml cleanup. - Remove travis-ci attributes. - Remove "experimental" badges from actively-developed crates. - Reflow some long lines. - Use dependency features consistently. - Add readme attributes * Update WASI to the latest trunk. This notably adds a .gitignore file for the WASI directory.
1 parent ae86822 commit a2b4148

File tree

23 files changed

+162
-81
lines changed

23 files changed

+162
-81
lines changed

‎Cargo.toml

+13-6
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
[package]
22
name = "wasmtime-cli"
3-
authors = ["The Wasmtime Project Developers"]
43
version = "0.2.0"
4+
authors = ["The Wasmtime Project Developers"]
55
description = "Command-line interface for Wasmtime"
66
license = "Apache-2.0 WITH LLVM-exception"
77
documentation = "https://cranelift.readthedocs.io/"
88
categories = ["wasm"]
99
keywords = ["webassembly", "wasm"]
1010
repository = "https://github.com/CraneStation/wasmtime"
11+
readme = "README.md"
1112
edition = "2018"
1213
default-run = "wasmtime"
1314

1415
[dependencies]
15-
cranelift-codegen = { version = "0.49", features = ["enable-serde"] }
16+
# Enable all supported architectures by default.
17+
cranelift-codegen = { version = "0.49", features = ["enable-serde", "all-arch"] }
1618
cranelift-entity = { version = "0.49", features = ["enable-serde"] }
1719
cranelift-wasm = { version = "0.49", features = ["enable-serde"] }
18-
cranelift-native = { version = "0.49" }
20+
cranelift-native = "0.49"
1921
wasmtime = { path = "crates/api" }
2022
wasmtime-debug = { path = "crates/debug" }
2123
wasmtime-environ = { path = "crates/environ" }
@@ -51,7 +53,12 @@ members = [
5153
exclude = ["crates/wasi-common/wasi-misc-tests"]
5254

5355
[features]
54-
# Enable all supported architectures by default.
55-
default = ["cranelift-codegen/all-arch"]
56-
lightbeam = ["wasmtime-environ/lightbeam", "wasmtime-jit/lightbeam", "wasmtime-wast/lightbeam"]
56+
lightbeam = [
57+
"wasmtime-environ/lightbeam",
58+
"wasmtime-jit/lightbeam",
59+
"wasmtime-wast/lightbeam"
60+
]
5761
wasi-c = ["wasmtime-wasi-c"]
62+
63+
[badges]
64+
maintenance = { status = "actively-developed" }

‎clippy.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
doc-valid-idents = [ "WebAssembly" ]
1+
doc-valid-idents = ["WebAssembly"]

‎crates/api/Cargo.toml

+25-10
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
[package]
22
name = "wasmtime"
3-
authors = ["The Wasmtime Project Developers"]
43
version = "0.1.0"
4+
authors = ["The Wasmtime Project Developers"]
55
description = "High-level API to expose the Wasmtime runtime"
66
license = "Apache-2.0 WITH LLVM-exception"
77
repository = "https://github.com/CraneStation/wasmtime"
8+
readme = "README.md"
89
edition = "2018"
910

1011
[lib]
@@ -13,13 +14,13 @@ crate-type = ["lib", "staticlib", "cdylib"]
1314

1415
[dependencies]
1516
cranelift-codegen = { version = "0.49", features = ["enable-serde"] }
16-
cranelift-native = { version = "0.49" }
17+
cranelift-native = "0.49"
1718
cranelift-entity = { version = "0.49", features = ["enable-serde"] }
1819
cranelift-wasm = { version = "0.49", features = ["enable-serde"] }
19-
cranelift-frontend = { version = "0.49" }
20-
wasmtime-runtime = { path="../runtime" }
21-
wasmtime-environ = { path="../environ" }
22-
wasmtime-jit = { path="../jit" }
20+
cranelift-frontend = "0.49"
21+
wasmtime-runtime = { path = "../runtime" }
22+
wasmtime-environ = { path = "../environ" }
23+
wasmtime-jit = { path = "../jit" }
2324
wasmparser = { version = "0.39.2", default-features = false }
2425
target-lexicon = { version = "0.9.0", default-features = false }
2526
anyhow = "1.0.19"
@@ -29,16 +30,30 @@ hashbrown = { version = "0.6.0", optional = true }
2930

3031
[features]
3132
default = ["std"]
32-
std = ["cranelift-codegen/std", "cranelift-wasm/std", "wasmtime-environ/std", "wasmparser/std"]
33-
core = ["hashbrown/nightly", "cranelift-codegen/core", "cranelift-wasm/core", "wasmtime-environ/core", "wasmparser/core"]
33+
std = [
34+
"cranelift-codegen/std",
35+
"cranelift-wasm/std",
36+
"wasmtime-environ/std",
37+
"wasmparser/std"
38+
]
39+
core = [
40+
"hashbrown/nightly",
41+
"cranelift-codegen/core",
42+
"cranelift-wasm/core",
43+
"wasmtime-environ/core",
44+
"wasmparser/core"
45+
]
3446

3547
[dev-dependencies]
3648
# for wasmtime.rs
3749
wasi-common = { path = "../wasi-common" }
3850
docopt = "1.0.1"
3951
serde = { "version" = "1.0.94", features = ["derive"] }
4052
pretty_env_logger = "0.3.0"
41-
wasmtime-wast = { path="../wast" }
42-
wasmtime-wasi = { path="../wasi" }
53+
wasmtime-wast = { path = "../wast" }
54+
wasmtime-wasi = { path = "../wasi" }
4355
rayon = "1.1"
4456
file-per-thread-logger = "0.1.1"
57+
58+
[badges]
59+
maintenance = { status = "actively-developed" }

‎crates/debug/Cargo.toml

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name = "wasmtime-debug"
33
version = "0.2.0"
44
authors = ["The Wasmtime Project Developers"]
55
description = "Debug utils for WebAsssembly code in Cranelift"
6+
license = "Apache-2.0 WITH LLVM-exception"
67
repository = "https://github.com/CraneStation/wasmtime"
78
documentation = "https://docs.rs/wasmtime-debug/"
89
categories = ["wasm"]
910
keywords = ["webassembly", "wasm", "debuginfo"]
10-
license = "Apache-2.0 WITH LLVM-exception"
1111
readme = "README.md"
1212
edition = "2018"
1313

@@ -30,5 +30,4 @@ std = ["cranelift-codegen/std", "cranelift-wasm/std", "wasmtime-environ/std"]
3030
core = ["hashbrown/nightly", "cranelift-codegen/core", "cranelift-wasm/core"]
3131

3232
[badges]
33-
maintenance = { status = "experimental" }
34-
travis-ci = { repository = "CraneStation/wasmtime" }
33+
maintenance = { status = "actively-developed" }

‎crates/environ/Cargo.toml

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name = "wasmtime-environ"
33
version = "0.2.0"
44
authors = ["The Wasmtime Project Developers"]
55
description = "Standalone environment support for WebAsssembly code in Cranelift"
6+
license = "Apache-2.0 WITH LLVM-exception"
67
repository = "https://github.com/CraneStation/wasmtime"
78
documentation = "https://docs.rs/wasmtime-environ/"
89
categories = ["wasm"]
910
keywords = ["webassembly", "wasm"]
10-
license = "Apache-2.0 WITH LLVM-exception"
1111
readme = "README.md"
1212
edition = "2018"
1313

@@ -52,5 +52,4 @@ std = ["cranelift-codegen/std", "cranelift-wasm/std"]
5252
core = ["cranelift-codegen/core", "cranelift-wasm/core"]
5353

5454
[badges]
55-
maintenance = { status = "experimental" }
56-
travis-ci = { repository = "CraneStation/wasmtime" }
55+
maintenance = { status = "actively-developed" }

‎crates/interface-types/Cargo.toml

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name = "wasmtime-interface-types"
33
version = "0.2.0"
44
authors = ["The Wasmtime Project Developers"]
55
description = "Support for wasm interface types with wasmtime"
6+
license = "Apache-2.0 WITH LLVM-exception"
67
categories = ["wasm"]
78
keywords = ["webassembly", "wasm"]
89
repository = "https://github.com/CraneStation/wasmtime"
9-
license = "Apache-2.0 WITH LLVM-exception"
1010
readme = "README.md"
1111
edition = "2018"
1212

@@ -18,3 +18,6 @@ wasmparser = { version = "0.39.2", default-features = false }
1818
wasm-webidl-bindings = "0.6"
1919
wasmtime-jit = { path = '../jit', default-features = false }
2020
wasmtime-runtime = { path = '../runtime', default-features = false }
21+
22+
[badges]
23+
maintenance = { status = "actively-developed" }

‎crates/jit/Cargo.toml

+19-6
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ name = "wasmtime-jit"
33
version = "0.2.0"
44
authors = ["The Wasmtime Project Developers"]
55
description = "JIT-style execution for WebAsssembly code in Cranelift"
6+
license = "Apache-2.0 WITH LLVM-exception"
67
categories = ["wasm"]
78
keywords = ["webassembly", "wasm"]
89
repository = "https://github.com/CraneStation/wasmtime"
9-
license = "Apache-2.0 WITH LLVM-exception"
1010
readme = "README.md"
1111
edition = "2018"
1212

1313
[dependencies]
1414
cranelift-codegen = { version = "0.49", features = ["enable-serde"] }
1515
cranelift-entity = { version = "0.49", features = ["enable-serde"] }
1616
cranelift-wasm = { version = "0.49", features = ["enable-serde"] }
17-
cranelift-frontend = { version = "0.49" }
17+
cranelift-frontend = "0.49"
1818
wasmtime-environ = { path = "../environ", default-features = false }
1919
wasmtime-runtime = { path = "../runtime", default-features = false }
2020
wasmtime-debug = { path = "../debug", default-features = false }
@@ -30,10 +30,23 @@ winapi = { version = "0.3.7", features = ["winnt", "impl-default"] }
3030

3131
[features]
3232
default = ["std"]
33-
std = ["cranelift-codegen/std", "cranelift-wasm/std", "wasmtime-environ/std", "wasmtime-debug/std", "wasmtime-runtime/std", "wasmparser/std"]
34-
core = ["hashbrown/nightly", "cranelift-codegen/core", "cranelift-wasm/core", "wasmtime-environ/core", "wasmtime-debug/core", "wasmparser/core"]
33+
std = [
34+
"cranelift-codegen/std",
35+
"cranelift-wasm/std",
36+
"wasmtime-environ/std",
37+
"wasmtime-debug/std",
38+
"wasmtime-runtime/std",
39+
"wasmparser/std"
40+
]
41+
core = [
42+
"hashbrown/nightly",
43+
"cranelift-codegen/core",
44+
"cranelift-wasm/core",
45+
"wasmtime-environ/core",
46+
"wasmtime-debug/core",
47+
"wasmparser/core"
48+
]
3549
lightbeam = ["wasmtime-environ/lightbeam"]
3650

3751
[badges]
38-
maintenance = { status = "experimental" }
39-
travis-ci = { repository = "CraneStation/wasmtime" }
52+
maintenance = { status = "actively-developed" }

‎crates/lightbeam/Cargo.toml

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22
name = "lightbeam"
33
version = "0.0.0"
44
authors = ["The Lightbeam Project Developers"]
5+
description = "An optimising one-pass streaming compiler for WebAssembly"
56
license = "Apache-2.0 WITH LLVM-exception"
7+
repository = "https://github.com/CraneStation/wasmtime"
68
readme = "README.md"
79
categories = ["wasm"]
810
keywords = ["webassembly", "wasm", "compile", "compiler", "jit"]
9-
publish = false
1011
edition = "2018"
12+
publish = false
1113

1214
[dependencies]
1315
smallvec = "1.0.0"
@@ -18,7 +20,7 @@ memoffset = "0.5.1"
1820
itertools = "0.8"
1921
capstone = "0.6.0"
2022
thiserror = "1.0.4"
21-
cranelift-codegen = { version = "0.49" }
23+
cranelift-codegen = "0.49"
2224
multi_mut = "0.1"
2325
either = "1.5"
2426
typemap = "0.3"

‎crates/misc/py/Cargo.toml

+10-8
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,20 @@ description = "Python extension for Wasmtime"
66
license = "Apache-2.0 WITH LLVM-exception"
77
categories = ["wasm", "python"]
88
keywords = ["webassembly", "wasm"]
9+
repository = "https://github.com/CraneStation/wasmtime"
10+
readme = "README.md"
911
edition = "2018"
1012

1113
[lib]
1214
name = "_wasmtime"
1315
crate-type = ["cdylib"]
1416

1517
[dependencies]
16-
cranelift-codegen = { version = "0.49" }
17-
cranelift-native = { version = "0.49" }
18-
cranelift-entity = { version = "0.49" }
19-
cranelift-wasm = { version = "0.49" }
20-
cranelift-frontend = { version = "0.49" }
18+
cranelift-codegen = "0.49"
19+
cranelift-native = "0.49"
20+
cranelift-entity = "0.49"
21+
cranelift-wasm = "0.49"
22+
cranelift-frontend = "0.49"
2123
wasmtime-environ = { path = "../../environ" }
2224
wasmtime-interface-types = { path = "../../interface-types" }
2325
wasmtime-jit = { path = "../../jit" }
@@ -26,7 +28,7 @@ target-lexicon = { version = "0.9.0", default-features = false }
2628
anyhow = "1.0.19"
2729
region = "2.0.0"
2830
wasmparser = "0.39.2"
31+
pyo3 = { version = "0.8.0", features = ["extension-module"] }
2932

30-
[dependencies.pyo3]
31-
version = "0.8.0"
32-
features = ["extension-module"]
33+
[badges]
34+
maintenance = { status = "actively-developed" }

‎crates/misc/rust/Cargo.toml

+10-5
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,26 @@
22
name = "wasmtime-rust"
33
version = "0.2.0"
44
authors = ["Alex Crichton <[email protected]>"]
5-
edition = "2018"
5+
description = "Rust extension for Wasmtime"
6+
license = "Apache-2.0 WITH LLVM-exception"
67
categories = ["wasm", "rust"]
78
keywords = ["webassembly", "wasm"]
8-
license = "Apache-2.0 WITH LLVM-exception"
9-
description = "Rust extension for Wasmtime"
9+
repository = "https://github.com/CraneStation/wasmtime"
10+
readme = "README.md"
11+
edition = "2018"
1012

1113
[lib]
1214
test = false
1315
doctest = false
1416

1517
[dependencies]
16-
cranelift-codegen = { version = "0.49" }
17-
cranelift-native = { version = "0.49" }
18+
cranelift-codegen = "0.49"
19+
cranelift-native = "0.49"
1820
wasmtime-interface-types = { path = "../../interface-types" }
1921
wasmtime-jit = { path = "../../jit" }
2022
wasmtime-rust-macro = { path = "./macro" }
2123
wasmtime-wasi = { path = "../../wasi" }
2224
anyhow = "1.0.19"
25+
26+
[badges]
27+
maintenance = { status = "actively-developed" }

‎crates/misc/rust/macro/Cargo.toml

+7-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
name = "wasmtime-rust-macro"
33
version = "0.2.0"
44
authors = ["Alex Crichton <[email protected]>"]
5-
edition = "2018"
6-
license = "Apache-2.0 WITH LLVM-exception"
75
description = "Macro support crate for wasmtime-rust"
6+
license = "Apache-2.0 WITH LLVM-exception"
7+
repository = "https://github.com/CraneStation/wasmtime"
8+
readme = "README.md"
9+
edition = "2018"
810

911
[lib]
1012
proc-macro = true
@@ -15,3 +17,6 @@ doctest = false
1517
proc-macro2 = "1.0"
1618
quote = "1.0"
1719
syn = { version = "1.0", features = ['full'] }
20+
21+
[badges]
22+
maintenance = { status = "actively-developed" }

‎crates/obj/Cargo.toml

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name = "wasmtime-obj"
33
version = "0.2.0"
44
authors = ["The Wasmtime Project Developers"]
55
description = "Native object file output for WebAsssembly code in Wasmtime"
6+
license = "Apache-2.0 WITH LLVM-exception"
67
repository = "https://github.com/CraneStation/wasmtime"
78
categories = ["wasm"]
89
keywords = ["webassembly", "wasm"]
9-
license = "Apache-2.0 WITH LLVM-exception"
1010
readme = "README.md"
1111
edition = "2018"
1212

@@ -16,3 +16,6 @@ cranelift-entity = { version = "0.49", features = ["enable-serde"] }
1616
cranelift-wasm = { version = "0.49", features = ["enable-serde"] }
1717
wasmtime-environ = { path = "../environ" }
1818
faerie = "0.12.0"
19+
20+
[badges]
21+
maintenance = { status = "experimental" }

‎crates/runtime/Cargo.toml

+10-5
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name = "wasmtime-runtime"
33
version = "0.2.0"
44
authors = ["The Wasmtime Project Developers"]
55
description = "Runtime library support for Wasmtime"
6+
license = "Apache-2.0 WITH LLVM-exception"
67
categories = ["wasm"]
78
keywords = ["webassembly", "wasm"]
89
repository = "https://github.com/CraneStation/wasmtime"
9-
license = "Apache-2.0 WITH LLVM-exception"
1010
readme = "README.md"
1111
edition = "2018"
1212

@@ -18,7 +18,7 @@ wasmtime-environ = { path = "../environ", default-features = false }
1818
region = "2.0.0"
1919
lazy_static = "1.2.0"
2020
libc = { version = "0.2.60", default-features = false }
21-
memoffset = "0.5.1"
21+
memoffset = "0.5.3"
2222
indexmap = "1.0.2"
2323
hashbrown = { version = "0.6.0", optional = true }
2424
spin = { version = "0.5.2", optional = true }
@@ -33,8 +33,13 @@ cc = "1.0"
3333
[features]
3434
default = ["std"]
3535
std = ["cranelift-codegen/std", "cranelift-wasm/std", "wasmtime-environ/std"]
36-
core = ["hashbrown/nightly", "cranelift-codegen/core", "cranelift-wasm/core", "wasmtime-environ/core", "spin"]
36+
core = [
37+
"hashbrown/nightly",
38+
"cranelift-codegen/core",
39+
"cranelift-wasm/core",
40+
"wasmtime-environ/core",
41+
"spin"
42+
]
3743

3844
[badges]
39-
maintenance = { status = "experimental" }
40-
travis-ci = { repository = "CraneStation/wasmtime" }
45+
maintenance = { status = "actively-developed" }

0 commit comments

Comments
 (0)