diff --git a/crates/wasi-common/cap-std-sync/Cargo.toml b/crates/wasi-common/cap-std-sync/Cargo.toml index aa85bf9d55..46b2dd6976 100644 --- a/crates/wasi-common/cap-std-sync/Cargo.toml +++ b/crates/wasi-common/cap-std-sync/Cargo.toml @@ -13,7 +13,7 @@ include = ["src/**/*", "LICENSE" ] [dependencies] wasi-common = { path = "../", version = "0.26.0" } -wiggle = { path = "../../wiggle", version = "0.26.0" } +async_trait = "0.1" anyhow = "1.0" cap-std = "0.13.7" cap-fs-ext = "0.13.7" diff --git a/crates/wasi-common/cap-std-sync/src/dir.rs b/crates/wasi-common/cap-std-sync/src/dir.rs index c52f5d8e1b..de924e3c4e 100644 --- a/crates/wasi-common/cap-std-sync/src/dir.rs +++ b/crates/wasi-common/cap-std-sync/src/dir.rs @@ -106,7 +106,7 @@ impl Dir { } } -#[wiggle::async_trait] +#[async_trait::async_trait(?Send)] impl WasiDir for Dir { fn as_any(&self) -> &dyn Any { self diff --git a/crates/wasi-common/cap-std-sync/src/file.rs b/crates/wasi-common/cap-std-sync/src/file.rs index 751c5f21b1..0105d61583 100644 --- a/crates/wasi-common/cap-std-sync/src/file.rs +++ b/crates/wasi-common/cap-std-sync/src/file.rs @@ -20,7 +20,7 @@ impl File { } } -#[wiggle::async_trait] +#[async_trait::async_trait(?Send)] impl WasiFile for File { fn as_any(&self) -> &dyn Any { self diff --git a/crates/wasi-common/cap-std-sync/src/sched/unix.rs b/crates/wasi-common/cap-std-sync/src/sched/unix.rs index 94a8614a60..1c1227bd6a 100644 --- a/crates/wasi-common/cap-std-sync/src/sched/unix.rs +++ b/crates/wasi-common/cap-std-sync/src/sched/unix.rs @@ -20,7 +20,7 @@ impl SyncSched { } } -#[wiggle::async_trait] +#[async_trait::async_trait(?Send)] impl WasiSched for SyncSched { async fn poll_oneoff<'a>(&self, poll: &mut Poll<'a>) -> Result<(), Error> { if poll.is_empty() { diff --git a/crates/wasi-common/cap-std-sync/src/sched/windows.rs b/crates/wasi-common/cap-std-sync/src/sched/windows.rs index a98e558a7b..3d5fdd37ad 100644 --- a/crates/wasi-common/cap-std-sync/src/sched/windows.rs +++ b/crates/wasi-common/cap-std-sync/src/sched/windows.rs @@ -21,7 +21,7 @@ impl SyncSched { } } -#[wiggle::async_trait] +#[async_trait::async_trait(?Send)] impl WasiSched for SyncSched { async fn poll_oneoff<'a>(&self, poll: &mut Poll<'a>) -> Result<(), Error> { if poll.is_empty() { diff --git a/crates/wasi-common/cap-std-sync/src/stdio.rs b/crates/wasi-common/cap-std-sync/src/stdio.rs index d86d181399..c6afa8f9b4 100644 --- a/crates/wasi-common/cap-std-sync/src/stdio.rs +++ b/crates/wasi-common/cap-std-sync/src/stdio.rs @@ -22,7 +22,7 @@ pub fn stdin() -> Stdin { Stdin(std::io::stdin()) } -#[wiggle::async_trait] +#[async_trait::async_trait(?Send)] impl WasiFile for Stdin { fn as_any(&self) -> &dyn Any { self @@ -125,7 +125,7 @@ impl AsRawFd for Stdin { macro_rules! wasi_file_write_impl { ($ty:ty) => { - #[wiggle::async_trait] + #[async_trait::async_trait(?Send)] impl WasiFile for $ty { fn as_any(&self) -> &dyn Any { self