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,16 +3,16 @@ name = "isle-fuzz"
|
||||
version = "0.0.0"
|
||||
authors = ["Automatically generated"]
|
||||
publish = false
|
||||
edition = "2021"
|
||||
edition.workspace = true
|
||||
|
||||
[package.metadata]
|
||||
cargo-fuzz = true
|
||||
|
||||
[dependencies]
|
||||
env_logger = { version = "0.9.0", default-features = false }
|
||||
env_logger = { workspace = true }
|
||||
cranelift-isle = { path = "../isle" }
|
||||
libfuzzer-sys = "0.4"
|
||||
log = "0.4.14"
|
||||
log = { workspace = true }
|
||||
|
||||
[[bin]]
|
||||
name = "compile"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
[package]
|
||||
authors = ["The Cranelift Project Developers"]
|
||||
description = "ISLE: Instruction Selection and Lowering Expressions. A domain-specific language for instruction selection in Cranelift."
|
||||
edition = "2021"
|
||||
edition.workspace = true
|
||||
license = "Apache-2.0 WITH LLVM-exception"
|
||||
name = "cranelift-isle"
|
||||
readme = "../README.md"
|
||||
@@ -9,7 +9,7 @@ repository = "https://github.com/bytecodealliance/wasmtime/tree/main/cranelift/i
|
||||
version = "0.89.0"
|
||||
|
||||
[dependencies]
|
||||
log = { version = "0.4", optional = true }
|
||||
log = { workspace = true, optional = true }
|
||||
miette = { version = "5.1.0", optional = true }
|
||||
rayon = "^1.5"
|
||||
|
||||
|
||||
@@ -2,12 +2,12 @@
|
||||
name = "islec"
|
||||
version = "0.1.0"
|
||||
authors = ["The Cranelift Project Developers"]
|
||||
edition = "2021"
|
||||
edition.workspace = true
|
||||
license = "Apache-2.0 WITH LLVM-exception"
|
||||
publish = false
|
||||
|
||||
[dependencies]
|
||||
cranelift-isle = { version = "*", path = "../isle/", features = ["miette-errors", "logging"] }
|
||||
env_logger = { version = "0.9", default-features = false }
|
||||
env_logger = { workspace = true }
|
||||
miette = { version = "5.1.0", features = ["fancy"] }
|
||||
clap = { version = "3.2.0", features = ["derive"] }
|
||||
clap = { workspace = true }
|
||||
|
||||
Reference in New Issue
Block a user