Skip to content

Commit 48f2f49

Browse files
authored
wasmtime-jit-icache-coherence: Use wasmtime_environ::error instead of anyhow (#12207)
* wasmtime-jit-icache-coherence: Use `wasmtime_environ::error` instead of `anyhow` * Fix topo sort in publish script
1 parent 967f460 commit 48f2f49

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/jit-icache-coherence/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ workspace = true
1414

1515
[dependencies]
1616
cfg-if = { workspace = true }
17-
anyhow = { workspace = true }
17+
wasmtime-environ = { workspace = true }
1818

1919
[target.'cfg(target_os = "windows")'.dependencies.windows-sys]
2020
workspace = true

crates/jit-icache-coherence/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
//! # len: usize,
4242
//! # }
4343
//! #
44-
//! # fn main() -> anyhow::Result<()> {
44+
//! # fn main() -> wasmtime_environ::error::Result<()> {
4545
//! #
4646
//! # let run_code = || {};
4747
//! # let code = vec![0u8; 64];

crates/jit-icache-coherence/src/libc.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use std::ffi::c_void;
44
pub use std::io::Result;
55

66
#[cfg(not(any(target_os = "linux", target_os = "android")))]
7-
pub use anyhow::Result;
7+
pub use wasmtime_environ::error::Result;
88

99
#[cfg(all(
1010
target_arch = "aarch64",
@@ -93,7 +93,7 @@ mod details {
9393
any(target_os = "linux", target_os = "android")
9494
)))]
9595
mod details {
96-
// NB: this uses `anyhow::Result` instead of `std::io::Result` to compile on
96+
// NB: this uses `wasmtime_environ::error::Result` instead of `std::io::Result` to compile on
9797
// `no_std`.
9898
pub(crate) fn pipeline_flush_mt() -> super::Result<()> {
9999
Ok(())

crates/jit-icache-coherence/src/miri.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
pub use anyhow::Result;
21
use std::ffi::c_void;
2+
pub use wasmtime_environ::error::Result;
33

44
pub(crate) fn pipeline_flush_mt() -> Result<()> {
55
Ok(())

scripts/publish.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ const CRATES_TO_PUBLISH: &[&str] = &[
4141
"cranelift-native",
4242
"cranelift-object",
4343
"cranelift-interpreter",
44+
"wasmtime-internal-component-util",
45+
"wasmtime-environ",
4446
"wasmtime-internal-jit-icache-coherence",
4547
// Wasmtime unwinder, used by both `cranelift-jit` (optionally) and filetests, and by Wasmtime.
4648
"wasmtime-internal-unwinder",
@@ -56,8 +58,6 @@ const CRATES_TO_PUBLISH: &[&str] = &[
5658
"wasmtime-internal-error",
5759
"wasmtime-internal-versioned-export-macros",
5860
"wasmtime-internal-slab",
59-
"wasmtime-internal-component-util",
60-
"wasmtime-environ",
6161
"wasmtime-internal-wit-bindgen",
6262
"wasmtime-internal-component-macro",
6363
"wasmtime-internal-jit-debug",

0 commit comments

Comments
 (0)