T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Leverage Cargo's workspace inheritance feature (#4905)

Browse Source 
* 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:
Alex Crichton
2022-09-26 11:30:01 -05:00
committed by GitHub
parent af226d37c2
commit 7b311004b5
63 changed files with 520 additions and 446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
cranelift/wasm/Cargo.toml
View File

@@ -9,24 +9,23 @@ license = "Apache-2.0 WITH LLVM-exception"
categories = ["no-std", "wasm"]
readme = "README.md"
keywords = ["webassembly", "wasm"]
edition = "2021"
edition.workspace = true
[dependencies]
wasmparser = { version = "0.89.0", default-features = false }
cranelift-codegen = { path = "../codegen", version = "0.89.0", default-features = false }
cranelift-entity = { path = "../entity", version = "0.89.0" }
cranelift-frontend = { path = "../frontend", version = "0.89.0", default-features = false }
wasmtime-types = { path = "../../crates/types", version = "2.0.0" }
hashbrown = { version = "0.12", optional = true }
wasmparser = { workspace = true }
cranelift-codegen = { workspace = true, default-features = false }
cranelift-entity = { workspace = true }
cranelift-frontend = { workspace = true, default-features = false }
wasmtime-types = { workspace = true }
hashbrown = { workspace = true, optional = true }
itertools = "0.10.0"
log = { version = "0.4.6", default-features = false }
log = { workspace = true }
serde = { version = "1.0.94", features = ["derive"], optional = true }
smallvec = { version = "1.6.1", features = ["union"] }
[dev-dependencies]
wat = "1.0.47"
target-lexicon = "0.12"
cranelift-codegen = { path = "../codegen", version = "0.89.0", default-features = false }
wat = { workspace = true }
target-lexicon = { workspace = true }
[features]
default = ["std"]