From 860ec1225d278dc696cafb4eaed742a3ad3db0df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20Leegwater=20Sim=C3=B5es?= Date: Wed, 24 Apr 2024 15:46:48 +0200 Subject: [PATCH] Rename relevant crates to `dusk-*` - wasmtime-environ - wasmtime-cranelift - wasmtime --- Cargo.lock | 242 +++++++++++++++--------------- Cargo.toml | 8 +- crates/component-macro/Cargo.toml | 2 +- crates/cranelift/Cargo.toml | 2 +- crates/environ/Cargo.toml | 2 +- crates/wasmtime/Cargo.toml | 2 +- 6 files changed, 129 insertions(+), 129 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2abf56650c5e..0b8aa68d8630 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -536,8 +536,8 @@ version = "0.0.0" dependencies = [ "anyhow", "arbitrary", + "dusk-wasmtime", "env_logger", - "wasmtime", ] [[package]] @@ -1025,6 +1025,102 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" +[[package]] +name = "dusk-wasmtime" +version = "20.0.0" +dependencies = [ + "addr2line", + "anyhow", + "async-trait", + "bincode", + "bumpalo", + "cfg-if", + "dusk-wasmtime-cranelift", + "dusk-wasmtime-environ", + "encoding_rs", + "fxprof-processed-profile", + "gimli", + "indexmap 2.0.0", + "ittapi", + "libc", + "log", + "object 0.33.0", + "once_cell", + "paste", + "rayon", + "rustix", + "semver", + "serde", + "serde_derive", + "serde_json", + "target-lexicon", + "tempfile", + "wasi-common", + "wasm-encoder 0.202.0", + "wasmparser 0.202.0", + "wasmtime-cache", + "wasmtime-component-macro", + "wasmtime-component-util", + "wasmtime-fiber", + "wasmtime-jit-debug", + "wasmtime-jit-icache-coherence", + "wasmtime-runtime", + "wasmtime-slab", + "wasmtime-winch", + "wat", + "windows-sys 0.52.0", +] + +[[package]] +name = "dusk-wasmtime-cranelift" +version = "20.0.0" +dependencies = [ + "anyhow", + "cfg-if", + "cranelift-codegen", + "cranelift-control", + "cranelift-entity", + "cranelift-frontend", + "cranelift-native", + "cranelift-wasm", + "dusk-wasmtime-environ", + "gimli", + "log", + "object 0.33.0", + "target-lexicon", + "thiserror", + "wasmparser 0.202.0", + "wasmtime-versioned-export-macros", +] + +[[package]] +name = "dusk-wasmtime-environ" +version = "20.0.0" +dependencies = [ + "anyhow", + "bincode", + "clap", + "cpp_demangle", + "cranelift-entity", + "env_logger", + "gimli", + "indexmap 2.0.0", + "log", + "object 0.33.0", + "paste", + "rustc-demangle", + "serde", + "serde_derive", + "target-lexicon", + "thiserror", + "wasm-encoder 0.202.0", + "wasmparser 0.202.0", + "wasmprinter", + "wasmtime-component-util", + "wasmtime-types", + "wat", +] + [[package]] name = "egg" version = "0.6.0" @@ -1051,7 +1147,7 @@ version = "20.0.0" dependencies = [ "anyhow", "dlmalloc", - "wasmtime", + "dusk-wasmtime", ] [[package]] @@ -3146,6 +3242,7 @@ dependencies = [ "cap-rand", "cap-std", "cap-time-ext", + "dusk-wasmtime", "fs-set-times", "io-extras", "io-lifetimes", @@ -3162,7 +3259,6 @@ dependencies = [ "tracing", "tracing-subscriber", "wasi-common", - "wasmtime", "wiggle", "windows-sys 0.52.0", ] @@ -3400,52 +3496,6 @@ dependencies = [ "wasmparser 0.202.0", ] -[[package]] -name = "wasmtime" -version = "20.0.0" -dependencies = [ - "addr2line", - "anyhow", - "async-trait", - "bincode", - "bumpalo", - "cfg-if", - "encoding_rs", - "fxprof-processed-profile", - "gimli", - "indexmap 2.0.0", - "ittapi", - "libc", - "log", - "object 0.33.0", - "once_cell", - "paste", - "rayon", - "rustix", - "semver", - "serde", - "serde_derive", - "serde_json", - "target-lexicon", - "tempfile", - "wasi-common", - "wasm-encoder 0.202.0", - "wasmparser 0.202.0", - "wasmtime-cache", - "wasmtime-component-macro", - "wasmtime-component-util", - "wasmtime-cranelift", - "wasmtime-environ", - "wasmtime-fiber", - "wasmtime-jit-debug", - "wasmtime-jit-icache-coherence", - "wasmtime-runtime", - "wasmtime-slab", - "wasmtime-winch", - "wat", - "windows-sys 0.52.0", -] - [[package]] name = "wasmtime-asm-macros" version = "20.0.0" @@ -3460,10 +3510,10 @@ dependencies = [ "anyhow", "cap-std", "clap", + "dusk-wasmtime", "shuffling-allocator", "target-lexicon", "wasi-common", - "wasmtime", "wasmtime-cli-flags", "wasmtime-wasi-nn", "wat", @@ -3482,13 +3532,13 @@ version = "20.0.0" dependencies = [ "anyhow", "cap-std", + "dusk-wasmtime", "env_logger", "futures", "log", "once_cell", "tokio", "tracing", - "wasmtime", "wasmtime-c-api-macros", "wasmtime-wasi", "wat", @@ -3542,6 +3592,9 @@ dependencies = [ "cranelift-filetests", "cranelift-reader", "criterion", + "dusk-wasmtime", + "dusk-wasmtime-cranelift", + "dusk-wasmtime-environ", "env_logger", "filecheck", "http", @@ -3571,12 +3624,9 @@ dependencies = [ "walkdir", "wasi-common", "wasmparser 0.202.0", - "wasmtime", "wasmtime-cache", "wasmtime-cli-flags", "wasmtime-component-util", - "wasmtime-cranelift", - "wasmtime-environ", "wasmtime-explorer", "wasmtime-runtime", "wasmtime-wasi", @@ -3596,11 +3646,11 @@ version = "20.0.0" dependencies = [ "anyhow", "clap", + "dusk-wasmtime", "file-per-thread-logger", "humantime", "rayon", "tracing-subscriber", - "wasmtime", ] [[package]] @@ -3609,11 +3659,11 @@ version = "20.0.0" dependencies = [ "anyhow", "component-macro-test-helpers", + "dusk-wasmtime", "proc-macro2", "quote", "syn 2.0.32", "tracing", - "wasmtime", "wasmtime-component-util", "wasmtime-wit-bindgen", "wit-parser 0.202.0", @@ -3623,67 +3673,17 @@ dependencies = [ name = "wasmtime-component-util" version = "20.0.0" -[[package]] -name = "wasmtime-cranelift" -version = "20.0.0" -dependencies = [ - "anyhow", - "cfg-if", - "cranelift-codegen", - "cranelift-control", - "cranelift-entity", - "cranelift-frontend", - "cranelift-native", - "cranelift-wasm", - "gimli", - "log", - "object 0.33.0", - "target-lexicon", - "thiserror", - "wasmparser 0.202.0", - "wasmtime-environ", - "wasmtime-versioned-export-macros", -] - -[[package]] -name = "wasmtime-environ" -version = "20.0.0" -dependencies = [ - "anyhow", - "bincode", - "clap", - "cpp_demangle", - "cranelift-entity", - "env_logger", - "gimli", - "indexmap 2.0.0", - "log", - "object 0.33.0", - "paste", - "rustc-demangle", - "serde", - "serde_derive", - "target-lexicon", - "thiserror", - "wasm-encoder 0.202.0", - "wasmparser 0.202.0", - "wasmprinter", - "wasmtime-component-util", - "wasmtime-types", - "wat", -] - [[package]] name = "wasmtime-environ-fuzz" version = "0.0.0" dependencies = [ "arbitrary", "component-fuzz-util", + "dusk-wasmtime-environ", "env_logger", "libfuzzer-sys", "wasmparser 0.202.0", "wasmprinter", - "wasmtime-environ", "wat", ] @@ -3693,12 +3693,12 @@ version = "20.0.0" dependencies = [ "anyhow", "capstone", + "dusk-wasmtime", "serde", "serde_derive", "serde_json", "target-lexicon", "wasmprinter", - "wasmtime", ] [[package]] @@ -3731,6 +3731,7 @@ dependencies = [ "cranelift-native", "cranelift-reader", "cranelift-wasm", + "dusk-wasmtime", "libfuzzer-sys", "once_cell", "proc-macro2", @@ -3739,7 +3740,6 @@ dependencies = [ "smallvec", "target-lexicon", "wasmparser 0.202.0", - "wasmtime", "wasmtime-fuzzing", ] @@ -3751,6 +3751,7 @@ dependencies = [ "arbitrary", "component-fuzz-util", "component-test-util", + "dusk-wasmtime", "env_logger", "log", "rand", @@ -3765,7 +3766,6 @@ dependencies = [ "wasmi", "wasmparser 0.202.0", "wasmprinter", - "wasmtime", "wasmtime-wast", "wat", ] @@ -3796,6 +3796,7 @@ dependencies = [ "anyhow", "cc", "cfg-if", + "dusk-wasmtime-environ", "encoding_rs", "indexmap 2.0.0", "libc", @@ -3812,7 +3813,6 @@ dependencies = [ "sptr", "wasm-encoder 0.202.0", "wasmtime-asm-macros", - "wasmtime-environ", "wasmtime-fiber", "wasmtime-jit-debug", "wasmtime-slab", @@ -3858,6 +3858,7 @@ dependencies = [ "cap-rand", "cap-std", "cap-time-ext", + "dusk-wasmtime", "fs-set-times", "futures", "io-extras", @@ -3873,7 +3874,6 @@ dependencies = [ "tracing", "tracing-subscriber", "url", - "wasmtime", "wiggle", "windows-sys 0.52.0", ] @@ -3886,6 +3886,7 @@ dependencies = [ "async-trait", "base64", "bytes", + "dusk-wasmtime", "futures", "http", "http-body", @@ -3899,7 +3900,6 @@ dependencies = [ "tokio-rustls", "tracing", "tracing-subscriber", - "wasmtime", "wasmtime-wasi", "webpki-roots", ] @@ -3910,6 +3910,7 @@ version = "20.0.0" dependencies = [ "anyhow", "cap-std", + "dusk-wasmtime", "openvino", "ort", "test-programs-artifacts", @@ -3917,7 +3918,6 @@ dependencies = [ "tracing", "walkdir", "wasi-common", - "wasmtime", "wiggle", "windows", ] @@ -3927,10 +3927,10 @@ name = "wasmtime-wasi-threads" version = "20.0.0" dependencies = [ "anyhow", + "dusk-wasmtime", "log", "rand", "wasi-common", - "wasmtime", ] [[package]] @@ -3938,8 +3938,8 @@ name = "wasmtime-wast" version = "20.0.0" dependencies = [ "anyhow", + "dusk-wasmtime", "log", - "wasmtime", "wast 202.0.0", ] @@ -3949,12 +3949,12 @@ version = "20.0.0" dependencies = [ "anyhow", "cranelift-codegen", + "dusk-wasmtime-cranelift", + "dusk-wasmtime-environ", "gimli", "object 0.33.0", "target-lexicon", "wasmparser 0.202.0", - "wasmtime-cranelift", - "wasmtime-environ", "winch-codegen", ] @@ -4042,11 +4042,11 @@ dependencies = [ "anyhow", "async-trait", "bitflags 2.4.1", + "dusk-wasmtime", "proptest", "thiserror", "tokio", "tracing", - "wasmtime", "wiggle-macro", "wiggle-test", "witx", @@ -4126,13 +4126,13 @@ version = "0.18.0" dependencies = [ "anyhow", "cranelift-codegen", + "dusk-wasmtime-cranelift", + "dusk-wasmtime-environ", "gimli", "regalloc2", "smallvec", "target-lexicon", "wasmparser 0.202.0", - "wasmtime-cranelift", - "wasmtime-environ", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index c3d0dd42fe99..51be988dad57 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -65,7 +65,7 @@ rustix = { workspace = true, features = ["mm", "param", "process"] } [dev-dependencies] # depend again on wasmtime to activate its default features for tests -wasmtime = { workspace = true, features = ['component-model', 'async', 'default', 'winch', 'debug-builtins', 'all-arch'] } +wasmtime = { workspace = true, package = "dusk-wasmtime", features = ['component-model', 'async', 'default', 'winch', 'debug-builtins', 'all-arch'] } env_logger = { workspace = true } log = { workspace = true } filecheck = { workspace = true } @@ -159,13 +159,13 @@ all = 'allow' [workspace.dependencies] arbitrary = { version = "1.3.1" } wasmtime-wmemcheck = { path = "crates/wmemcheck", version = "=20.0.0" } -wasmtime = { path = "crates/wasmtime", version = "20.0.0", default-features = false } +wasmtime = { path = "crates/wasmtime", package = "dusk-wasmtime", version = "20.0.0", default-features = false } wasmtime-c-api-macros = { path = "crates/c-api-macros", version = "=20.0.0" } wasmtime-cache = { path = "crates/cache", version = "=20.0.0" } wasmtime-cli-flags = { path = "crates/cli-flags", version = "=20.0.0" } -wasmtime-cranelift = { path = "crates/cranelift", version = "=20.0.0" } +wasmtime-cranelift = { path = "crates/cranelift", package = "dusk-wasmtime-cranelift", version = "=20.0.0" } wasmtime-winch = { path = "crates/winch", version = "=20.0.0" } -wasmtime-environ = { path = "crates/environ", version = "=20.0.0" } +wasmtime-environ = { path = "crates/environ", package = "dusk-wasmtime-environ", version = "=20.0.0" } wasmtime-explorer = { path = "crates/explorer", version = "=20.0.0" } wasmtime-fiber = { path = "crates/fiber", version = "=20.0.0" } wasmtime-types = { path = "crates/types", version = "20.0.0" } diff --git a/crates/component-macro/Cargo.toml b/crates/component-macro/Cargo.toml index 672279140c59..233bc98cf989 100644 --- a/crates/component-macro/Cargo.toml +++ b/crates/component-macro/Cargo.toml @@ -28,7 +28,7 @@ wasmtime-wit-bindgen = { workspace = true } wit-parser = { workspace = true } [dev-dependencies] -wasmtime = { path = '../wasmtime', features = ['component-model'] } +wasmtime = { path = '../wasmtime', package = "dusk-wasmtime", features = ['component-model'] } component-macro-test-helpers = { path = 'test-helpers' } tracing = { workspace = true } diff --git a/crates/cranelift/Cargo.toml b/crates/cranelift/Cargo.toml index 2d3eac7c8bff..3af7d3c87cda 100644 --- a/crates/cranelift/Cargo.toml +++ b/crates/cranelift/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "wasmtime-cranelift" +name = "dusk-wasmtime-cranelift" version.workspace = true authors.workspace = true description = "Integration between Cranelift and Wasmtime" diff --git a/crates/environ/Cargo.toml b/crates/environ/Cargo.toml index 7eeef1a43ec7..bd11afa38422 100644 --- a/crates/environ/Cargo.toml +++ b/crates/environ/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "wasmtime-environ" +name = "dusk-wasmtime-environ" version.workspace = true authors.workspace = true description = "Standalone environment support for WebAsssembly code in Cranelift" diff --git a/crates/wasmtime/Cargo.toml b/crates/wasmtime/Cargo.toml index 07e72b0fa093..c32641bcb8e9 100644 --- a/crates/wasmtime/Cargo.toml +++ b/crates/wasmtime/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "wasmtime" +name = "dusk-wasmtime" version.workspace = true authors.workspace = true description = "High-level API to expose the Wasmtime runtime"