switch back to upstream wit-bindgen

Signed-off-by: Joel Dice <joel.dice@fermyon.com>

Author: dicej

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]
@@ -198,7 +198,6 @@ async = [
   "dep:futures",
   "wasmtime-component-macro?/async",
   "runtime",
-  "futures/std",  
 ]
 
 # Enables support for the pooling instance allocation strategy

crates/wasmtime/Cargo.toml

@@ -10,14 +10,14 @@ use {
         },
     },
     anyhow::{Result, anyhow},
-    futures::channel::oneshot,
-    std::{
+    core::{
         future, mem,
         ops::Range,
         pin::Pin,
         ptr::{self, NonNull},
         task::{Context, Poll},
     },
+    futures::channel::oneshot,
     wasmtime_environ::TripleExt,
     wasmtime_fiber::{Fiber, Suspend},
 };