From 24a2ae08d8861bbee3c003dc0b67fbd84f144803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20Leegwater=20Sim=C3=B5es?= Date: Mon, 23 Oct 2023 17:17:27 +0200 Subject: [PATCH] Rename `wasmtime` to `dusk-wasmtime` --- Cargo.lock | 126 +++++++++++++++--------------- Cargo.toml | 2 +- crates/component-macro/Cargo.toml | 2 +- crates/wasmtime/Cargo.toml | 6 +- 4 files changed, 68 insertions(+), 68 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c4051e0fd344..cf87c13ea469 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -514,8 +514,8 @@ version = "0.0.0" dependencies = [ "anyhow", "arbitrary", + "dusk-wasmtime", "env_logger", - "wasmtime", ] [[package]] @@ -1008,6 +1008,52 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" +[[package]] +name = "dusk-wasmtime" +version = "19.0.2" +dependencies = [ + "addr2line", + "anyhow", + "async-trait", + "bincode", + "bumpalo", + "cfg-if", + "encoding_rs", + "fxprof-processed-profile", + "gimli", + "indexmap 2.0.0", + "ittapi", + "libc", + "log", + "object", + "once_cell", + "paste", + "rayon", + "rustix", + "semver", + "serde", + "serde_derive", + "serde_json", + "target-lexicon", + "tempfile", + "wasi-common", + "wasm-encoder", + "wasmparser", + "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 = "egg" version = "0.6.0" @@ -1034,7 +1080,7 @@ version = "19.0.2" dependencies = [ "anyhow", "dlmalloc", - "wasmtime", + "dusk-wasmtime", ] [[package]] @@ -3012,6 +3058,7 @@ dependencies = [ "cap-rand", "cap-std", "cap-time-ext", + "dusk-wasmtime", "fs-set-times", "io-extras", "io-lifetimes", @@ -3027,7 +3074,6 @@ dependencies = [ "tokio", "tracing", "tracing-subscriber", - "wasmtime", "wiggle", "windows-sys 0.52.0", ] @@ -3229,52 +3275,6 @@ dependencies = [ "wasmparser", ] -[[package]] -name = "wasmtime" -version = "19.0.2" -dependencies = [ - "addr2line", - "anyhow", - "async-trait", - "bincode", - "bumpalo", - "cfg-if", - "encoding_rs", - "fxprof-processed-profile", - "gimli", - "indexmap 2.0.0", - "ittapi", - "libc", - "log", - "object", - "once_cell", - "paste", - "rayon", - "rustix", - "semver", - "serde", - "serde_derive", - "serde_json", - "target-lexicon", - "tempfile", - "wasi-common", - "wasm-encoder", - "wasmparser", - "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 = "19.0.2" @@ -3289,10 +3289,10 @@ dependencies = [ "anyhow", "cap-std", "clap", + "dusk-wasmtime", "shuffling-allocator", "target-lexicon", "wasi-common", - "wasmtime", "wasmtime-cli-flags", "wasmtime-wasi-nn", "wat", @@ -3311,13 +3311,13 @@ version = "19.0.2" dependencies = [ "anyhow", "cap-std", + "dusk-wasmtime", "env_logger", "futures", "log", "once_cell", "tracing", "wasi-common", - "wasmtime", "wasmtime-c-api-macros", "wat", ] @@ -3366,6 +3366,7 @@ dependencies = [ "component-macro-test", "component-test-util", "criterion", + "dusk-wasmtime", "env_logger", "filecheck", "http", @@ -3391,7 +3392,6 @@ dependencies = [ "walkdir", "wasi-common", "wasmparser", - "wasmtime", "wasmtime-cache", "wasmtime-cli-flags", "wasmtime-component-util", @@ -3416,11 +3416,11 @@ version = "19.0.2" dependencies = [ "anyhow", "clap", + "dusk-wasmtime", "file-per-thread-logger", "humantime", "rayon", "tracing-subscriber", - "wasmtime", ] [[package]] @@ -3429,11 +3429,11 @@ version = "19.0.2" 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", @@ -3527,12 +3527,12 @@ version = "19.0.2" dependencies = [ "anyhow", "capstone", + "dusk-wasmtime", "serde", "serde_derive", "serde_json", "target-lexicon", "wasmprinter", - "wasmtime", ] [[package]] @@ -3565,6 +3565,7 @@ dependencies = [ "cranelift-native", "cranelift-reader", "cranelift-wasm", + "dusk-wasmtime", "libfuzzer-sys", "once_cell", "proc-macro2", @@ -3573,7 +3574,6 @@ dependencies = [ "smallvec", "target-lexicon", "wasmparser", - "wasmtime", "wasmtime-fuzzing", ] @@ -3585,6 +3585,7 @@ dependencies = [ "arbitrary", "component-fuzz-util", "component-test-util", + "dusk-wasmtime", "env_logger", "log", "rand", @@ -3599,7 +3600,6 @@ dependencies = [ "wasmi", "wasmparser", "wasmprinter", - "wasmtime", "wasmtime-wast", "wat", ] @@ -3691,6 +3691,7 @@ dependencies = [ "cap-rand", "cap-std", "cap-time-ext", + "dusk-wasmtime", "fs-set-times", "futures", "io-extras", @@ -3706,7 +3707,6 @@ dependencies = [ "tracing", "tracing-subscriber", "url", - "wasmtime", "wiggle", "windows-sys 0.52.0", ] @@ -3719,6 +3719,7 @@ dependencies = [ "async-trait", "base64", "bytes", + "dusk-wasmtime", "futures", "http", "http-body", @@ -3732,7 +3733,6 @@ dependencies = [ "tokio-rustls", "tracing", "tracing-subscriber", - "wasmtime", "wasmtime-wasi", "webpki-roots", ] @@ -3743,13 +3743,13 @@ version = "19.0.2" dependencies = [ "anyhow", "cap-std", + "dusk-wasmtime", "openvino", "test-programs-artifacts", "thiserror", "tracing", "walkdir", "wasi-common", - "wasmtime", "wiggle", "windows", ] @@ -3759,10 +3759,10 @@ name = "wasmtime-wasi-threads" version = "19.0.2" dependencies = [ "anyhow", + "dusk-wasmtime", "log", "rand", "wasi-common", - "wasmtime", ] [[package]] @@ -3770,8 +3770,8 @@ name = "wasmtime-wast" version = "19.0.2" dependencies = [ "anyhow", + "dusk-wasmtime", "log", - "wasmtime", "wast 201.0.0", ] @@ -3869,11 +3869,11 @@ dependencies = [ "anyhow", "async-trait", "bitflags 2.4.1", + "dusk-wasmtime", "proptest", "thiserror", "tokio", "tracing", - "wasmtime", "wiggle-macro", "wiggle-test", "witx", diff --git a/Cargo.toml b/Cargo.toml index 6bbc72645ca2..40e819be3db8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -153,7 +153,7 @@ all = 'allow' [workspace.dependencies] arbitrary = { version = "1.3.1" } wasmtime-wmemcheck = { path = "crates/wmemcheck", version = "=19.0.2" } -wasmtime = { path = "crates/wasmtime", version = "19.0.2", default-features = false } +wasmtime = { path = "crates/wasmtime", version = "19.0.2", default-features = false, package = "dusk-wasmtime" } wasmtime-c-api-macros = { path = "crates/c-api-macros", version = "=19.0.2" } wasmtime-cache = { path = "crates/cache", version = "=19.0.2" } wasmtime-cli-flags = { path = "crates/cli-flags", version = "=19.0.2" } diff --git a/crates/component-macro/Cargo.toml b/crates/component-macro/Cargo.toml index 672279140c59..ed24dcc300ea 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', features = ['component-model'], package = "dusk-wasmtime" } component-macro-test-helpers = { path = 'test-helpers' } tracing = { workspace = true } diff --git a/crates/wasmtime/Cargo.toml b/crates/wasmtime/Cargo.toml index 08d7efda9ed7..90ea7341ef4b 100644 --- a/crates/wasmtime/Cargo.toml +++ b/crates/wasmtime/Cargo.toml @@ -1,11 +1,11 @@ [package] -name = "wasmtime" +name = "dusk-wasmtime" version.workspace = true authors.workspace = true description = "High-level API to expose the Wasmtime runtime" -documentation = "https://docs.rs/wasmtime" +documentation = "https://docs.rs/dusk-wasmtime" license = "Apache-2.0 WITH LLVM-exception" -repository = "https://github.com/bytecodealliance/wasmtime" +repository = "https://github.com/dusk-network/wasmtime" readme = "README.md" edition.workspace = true rust-version.workspace = true