Merge pull request #223 from bytecodealliance/dicej/unify-fiber-abstractions

combine fiber abstractions from `async_.rs` and `concurrent.rs`

Author: dicej

.gitignore

@@ -28,6 +28,7 @@ cranelift/isle/veri/veri_engine/test_output
 crates/explorer/node_modules
 tests/all/pulley_provenance_test.cwasm
 tests/all/pulley_provenance_test_component.cwasm
+tests/all/pulley_provenance_test_async_component.cwasm
 /artifacts
 testcase*.wat
 testcase*.wasm

Cargo.lock

@@ -632,12 +632,9 @@ lto = true
 # wasm-wave = { git = "https://github.com/bytecodealliance/wasm-tools" }
 # wasm-compose = { git = "https://github.com/bytecodealliance/wasm-tools" }
 # wasm-metadata = { git = "https://github.com/bytecodealliance/wasm-tools" }
-# wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen" }
-# wit-bindgen-rt = { git = "https://github.com/bytecodealliance/wit-bindgen" }
-# wit-bindgen-rust-macro = { git = "https://github.com/bytecodealliance/wit-bindgen" }
-wit-bindgen = { git = "https://github.com/dicej/wit-bindgen", branch = "no-reads-writes-after-dropped" }
-wit-bindgen-rt = { git = "https://github.com/dicej/wit-bindgen", branch = "no-reads-writes-after-dropped" }
-wit-bindgen-rust-macro = { git = "https://github.com/dicej/wit-bindgen", branch = "no-reads-writes-after-dropped" }
+wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen" }
+wit-bindgen-rt = { git = "https://github.com/bytecodealliance/wit-bindgen" }
+wit-bindgen-rust-macro = { git = "https://github.com/bytecodealliance/wit-bindgen" }
 
 # wasmparser = { path = '../wasm-tools/crates/wasmparser' }
 # wat = { path = '../wasm-tools/crates/wat' }

Cargo.toml

@@ -61,7 +61,7 @@ semver = { workspace = true, optional = true }
 smallvec = { workspace = true, optional = true }
 hashbrown = { workspace = true, features = ["default-hasher"] }
 bitflags = { workspace = true }
-futures = { workspace = true, features = ["alloc"], optional = true }
+futures = { workspace = true, default_features = false, features = ["alloc"], optional = true }
 bytes = { workspace = true, optional = true }
 
 [target.'cfg(target_os = "windows")'.dependencies.windows-sys]
@@ -195,6 +195,7 @@ async = [
   "dep:wasmtime-fiber",
   "dep:async-trait",
   "dep:trait-variant",
+  "dep:futures",
   "wasmtime-component-macro?/async",
   "runtime",
 ]

crates/wasmtime/Cargo.toml

@@ -34,6 +34,8 @@ pub(crate) mod code_memory;
 #[cfg(feature = "debug-builtins")]
 pub(crate) mod debug;
 pub(crate) mod externals;
+#[cfg(feature = "async")]
+pub(crate) mod fiber;
 pub(crate) mod gc;
 pub(crate) mod instance;
 pub(crate) mod instantiate;