Leverage Cargo's workspace inheritance feature (#4905)
* Leverage Cargo's workspace inheritance feature This commit is an attempt to reduce the complexity of the Cargo manifests in this repository with Cargo's workspace-inheritance feature becoming stable in Rust 1.64.0. This feature allows specifying fields in the root workspace `Cargo.toml` which are then reused throughout the workspace. For example this PR shares definitions such as: * All of the Wasmtime-family of crates now use `version.workspace = true` to have a single location which defines the version number. * All crates use `edition.workspace = true` to have one default edition for the entire workspace. * Common dependencies are listed in `[workspace.dependencies]` to avoid typing the same version number in a lot of different places (e.g. the `wasmparser = "0.89.0"` is now in just one spot. Currently the workspace-inheritance feature doesn't allow having two different versions to inherit, so all of the Cranelift-family of crates still manually specify their version. The inter-crate dependencies, however, are shared amongst the root workspace. This feature can be seen as a method of "preprocessing" of sorts for Cargo manifests. This will help us develop Wasmtime but shouldn't have any actual impact on the published artifacts -- everything's dependency lists are still the same. * Fix wasi-crypto tests
This commit is contained in:
@@ -3,7 +3,7 @@ name = "test-programs"
|
||||
version = "0.19.0"
|
||||
authors = ["The Wasmtime Project Developers"]
|
||||
readme = "README.md"
|
||||
edition = "2021"
|
||||
edition.workspace = true
|
||||
publish = false
|
||||
license = "Apache-2.0 WITH LLVM-exception"
|
||||
|
||||
@@ -11,17 +11,17 @@ license = "Apache-2.0 WITH LLVM-exception"
|
||||
cfg-if = "1.0"
|
||||
|
||||
[dev-dependencies]
|
||||
wasi-common = { path = "../wasi-common", version = "2.0.0" }
|
||||
wasi-cap-std-sync = { path = "../wasi-common/cap-std-sync", version = "2.0.0" }
|
||||
wasmtime = { path = "../wasmtime", version = "2.0.0" }
|
||||
wasmtime-wasi = { path = "../wasi", version = "2.0.0", features = ["tokio"] }
|
||||
target-lexicon = "0.12.0"
|
||||
wasi-common = { workspace = true }
|
||||
wasi-cap-std-sync = { workspace = true }
|
||||
wasmtime = { workspace = true }
|
||||
wasmtime-wasi = { workspace = true, features = ["tokio"] }
|
||||
target-lexicon = { workspace = true }
|
||||
tracing-subscriber = { version = "0.3.1", default-features = false, features = ['fmt'] }
|
||||
tempfile = "3.1.0"
|
||||
os_pipe = "0.9"
|
||||
anyhow = "1.0.19"
|
||||
wat = "1.0.47"
|
||||
cap-std = "0.26.0"
|
||||
anyhow = { workspace = true }
|
||||
wat = { workspace = true }
|
||||
cap-std = { workspace = true }
|
||||
tokio = { version = "1.8.0", features = ["rt-multi-thread"] }
|
||||
|
||||
[features]
|
||||
|
||||
2
crates/test-programs/wasi-tests/Cargo.lock
generated
2
crates/test-programs/wasi-tests/Cargo.lock
generated
@@ -22,7 +22,7 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
|
||||
|
||||
[[package]]
|
||||
name = "wasi-tests"
|
||||
version = "0.19.0"
|
||||
version = "0.0.0"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"once_cell",
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
[package]
|
||||
name = "wasi-tests"
|
||||
version = "0.19.0"
|
||||
authors = ["The Wasmtime Project Developers"]
|
||||
version = "0.0.0"
|
||||
readme = "README.md"
|
||||
edition = "2021"
|
||||
publish = false
|
||||
@@ -9,7 +8,7 @@ publish = false
|
||||
[dependencies]
|
||||
libc = "0.2.65"
|
||||
wasi = "0.10.2"
|
||||
once_cell = "1.12.0"
|
||||
once_cell = "1.12"
|
||||
|
||||
# This crate is built with the wasm32-wasi target, so it's separate
|
||||
# from the main Wasmtime build, so use this directive to exclude it
|
||||
|
||||
Reference in New Issue
Block a user