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,8 +1,8 @@
|
||||
[package]
|
||||
name = "wiggle"
|
||||
version = "2.0.0"
|
||||
version.workspace = true
|
||||
authors = ["Pat Hickey <phickey@fastly.com>", "Jakub Konka <kubkonk@jakubkonka.com>", "Alex Crichton <alex@alexcrichton.com>"]
|
||||
edition = "2021"
|
||||
edition.workspace = true
|
||||
license = "Apache-2.0 WITH LLVM-exception"
|
||||
description = "Runtime components of wiggle code generator"
|
||||
categories = ["wasm"]
|
||||
@@ -13,19 +13,18 @@ include = ["src/**/*", "README.md", "LICENSE"]
|
||||
[dependencies]
|
||||
thiserror = "1"
|
||||
witx = { path = "../wasi-common/WASI/tools/witx", version = "0.9.1", optional = true }
|
||||
wiggle-macro = { path = "macro", version = "=2.0.0" }
|
||||
wiggle-macro = { workspace = true }
|
||||
tracing = "0.1.26"
|
||||
bitflags = "1.2"
|
||||
async-trait = "0.1.42"
|
||||
wasmtime = { path = "../wasmtime", version = "2.0.0", optional = true, default-features = false }
|
||||
anyhow = "1.0"
|
||||
wasmtime = { workspace = true, optional = true }
|
||||
anyhow = { workspace = true }
|
||||
|
||||
[badges]
|
||||
maintenance = { status = "actively-developed" }
|
||||
|
||||
[dev-dependencies]
|
||||
wiggle-test = { path = "test-helpers" }
|
||||
anyhow = "1"
|
||||
proptest = "1.0.0"
|
||||
tokio = { version = "1", features = ["rt-multi-thread","time", "macros"] }
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
[package]
|
||||
name = "wiggle-generate"
|
||||
version = "2.0.0"
|
||||
version.workspace = true
|
||||
authors = ["Pat Hickey <phickey@fastly.com>", "Jakub Konka <kubkon@jakubkonka.com>", "Alex Crichton <alex@alexcrichton.com>"]
|
||||
license = "Apache-2.0 WITH LLVM-exception"
|
||||
edition = "2021"
|
||||
edition.workspace = true
|
||||
description = "Library crate for wiggle code generator."
|
||||
categories = ["wasm"]
|
||||
keywords = ["webassembly", "wasm"]
|
||||
@@ -18,7 +18,7 @@ witx = { version = "0.9.1", path = "../../wasi-common/WASI/tools/witx" }
|
||||
quote = "1.0"
|
||||
proc-macro2 = "1.0"
|
||||
heck = "0.4"
|
||||
anyhow = "1"
|
||||
anyhow = { workspace = true }
|
||||
syn = { version = "1.0", features = ["full"] }
|
||||
shellexpand = "2.0"
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
[package]
|
||||
name = "wiggle-macro"
|
||||
version = "2.0.0"
|
||||
version.workspace = true
|
||||
authors = ["Pat Hickey <phickey@fastly.com>", "Jakub Konka <kubkon@jakubkonka.com>", "Alex Crichton <alex@alexcrichton.com>"]
|
||||
edition = "2021"
|
||||
edition.workspace = true
|
||||
license = "Apache-2.0 WITH LLVM-exception"
|
||||
description = "Wiggle code generator"
|
||||
categories = ["wasm"]
|
||||
@@ -21,7 +21,7 @@ test = false
|
||||
doctest = false
|
||||
|
||||
[dependencies]
|
||||
wiggle-generate = { path = "../generate", version = "=2.0.0" }
|
||||
wiggle-generate = { workspace = true }
|
||||
quote = "1.0"
|
||||
syn = { version = "1.0", features = ["full"] }
|
||||
proc-macro2 = "1.0"
|
||||
|
||||
@@ -3,7 +3,7 @@ name = "wiggle-test"
|
||||
version = "0.21.0"
|
||||
authors = ["Pat Hickey <phickey@fastly.com>", "Jakub Konka <kubkon@jakubkonka.com>", "Alex Crichton <alex@alexcrichton.com>"]
|
||||
license = "Apache-2.0 WITH LLVM-exception"
|
||||
edition = "2021"
|
||||
edition.workspace = true
|
||||
description = "Reusable testing components for wiggle code generator. Only intended to be used by tests in `wiggle` crate."
|
||||
categories = ["wasm"]
|
||||
keywords = ["webassembly", "wasm"]
|
||||
|
||||
Reference in New Issue
Block a user