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:
@@ -1,29 +1,29 @@
|
||||
[package]
|
||||
authors = ["The Wasmtime Project Developers"]
|
||||
authors.workspace = true
|
||||
description = "Fuzzing infrastructure for Wasmtime"
|
||||
edition = "2021"
|
||||
edition.workspace = true
|
||||
name = "wasmtime-fuzzing"
|
||||
publish = false
|
||||
version = "0.19.0"
|
||||
version = "0.0.0"
|
||||
license = "Apache-2.0 WITH LLVM-exception"
|
||||
|
||||
[dependencies]
|
||||
anyhow = "1.0.22"
|
||||
anyhow = { workspace = true }
|
||||
arbitrary = { version = "1.1.0", features = ["derive"] }
|
||||
component-test-util = { path = "../misc/component-test-util" }
|
||||
component-fuzz-util = { path = "../misc/component-fuzz-util" }
|
||||
env_logger = "0.9.0"
|
||||
log = "0.4.8"
|
||||
component-test-util = { workspace = true }
|
||||
component-fuzz-util = { workspace = true }
|
||||
env_logger = { workspace = true }
|
||||
log = { workspace = true }
|
||||
rayon = "1.2.1"
|
||||
target-lexicon = "0.12.3"
|
||||
target-lexicon = { workspace = true }
|
||||
tempfile = "3.3.0"
|
||||
wasmparser = "0.89.0"
|
||||
wasmprinter = "0.2.39"
|
||||
wasmtime = { path = "../wasmtime" }
|
||||
wasmtime-wast = { path = "../wast" }
|
||||
wasm-encoder = "0.16.0"
|
||||
wasm-smith = "0.11.4"
|
||||
wasm-mutate = "0.2.7"
|
||||
wasmparser = { workspace = true }
|
||||
wasmprinter = { workspace = true }
|
||||
wasmtime = { workspace = true, features = ['default'] }
|
||||
wasmtime-wast = { workspace = true }
|
||||
wasm-encoder = { workspace = true }
|
||||
wasm-smith = { workspace = true }
|
||||
wasm-mutate = { workspace = true }
|
||||
wasm-spec-interpreter = { path = "./wasm-spec-interpreter", optional = true }
|
||||
wasmi = "0.11.0"
|
||||
|
||||
@@ -35,7 +35,7 @@ wasmi = "0.11.0"
|
||||
v8 = "0.44.3"
|
||||
|
||||
[dev-dependencies]
|
||||
wat = "1.0.48"
|
||||
wat = { workspace = true }
|
||||
rand = { version = "0.8.0", features = ["small_rng"] }
|
||||
|
||||
# Only enable the `build-libinterpret` feature when fuzzing is enabled, enabling
|
||||
|
||||
@@ -4,7 +4,7 @@ description = "A Rust-to-OCaml wrapper for the WebAssembly specification interpr
|
||||
name = "wasm-spec-interpreter"
|
||||
version = "0.1.0"
|
||||
publish = false
|
||||
edition = "2021"
|
||||
edition.workspace = true
|
||||
license = "Apache-2.0 WITH LLVM-exception"
|
||||
|
||||
# Until https://gitlab.com/ocaml-rust/ocaml-boxroot/-/issues/1 is resolved and
|
||||
@@ -13,10 +13,10 @@ license = "Apache-2.0 WITH LLVM-exception"
|
||||
# `build-libinterpret` feature set by this crate's parent).
|
||||
[dependencies]
|
||||
ocaml-interop = { version = "0.8", optional = true }
|
||||
once_cell = { version = "1.12.0", optional = true }
|
||||
once_cell = { workspace = true, optional = true }
|
||||
|
||||
[dev-dependencies]
|
||||
wat = "1.0.47"
|
||||
wat = { workspace = true }
|
||||
|
||||
[features]
|
||||
build-libinterpret = ["ocaml-interop", "once_cell"]
|
||||
|
||||
Reference in New Issue
Block a user