Fixup rebase conflicts

Author: alexcrichton

Cargo.lock

@@ -62,6 +62,7 @@ smallvec = { workspace = true, optional = true }
 hashbrown = { workspace = true, features = ["default-hasher"] }
 bitflags = { workspace = true }
 futures = { workspace = true, features = ["alloc"], optional = true }
+bytes = { workspace = true, optional = true }
 
 [target.'cfg(target_os = "windows")'.dependencies.windows-sys]
 workspace = true
@@ -391,4 +392,7 @@ component-model-async = [
   "component-model",
   "std",
   "wasmtime-component-macro?/component-model-async",
+  "dep:futures",
+  "futures/std",
+  "dep:bytes",
 ]

crates/wasmtime/Cargo.toml

@@ -89,8 +89,8 @@ use wasmtime_environ::component::{
 use wasmtime_environ::{PrimaryMap, fact};
 
 pub use futures_and_streams::{
-    ErrorContext, FutureReader, FutureWriter, HostFuture, HostStream, StreamReader, StreamWriter,
-    Watch,
+    ErrorContext, FutureReader, FutureWriter, HostFuture, HostStream, ReadBuffer, StreamReader,
+    StreamWriter, VecBuffer, Watch, WriteBuffer,
 };
 pub(crate) use futures_and_streams::{
     ResourcePair, lower_error_context_to_index, lower_future_to_index, lower_stream_to_index,
@@ -4537,15 +4537,6 @@ pub(crate) enum WaitableCheck {
     Yield,
 }
 
-/// Helper struct for nulling out an `AtomicPtr<u8>` on drop.
-pub(crate) struct ResetPtr<'a>(pub(crate) &'a AtomicPtr<u8>);
-
-impl<'a> Drop for ResetPtr<'a> {
-    fn drop(&mut self) {
-        self.0.store(ptr::null_mut(), Relaxed);
-    }
-}
-
 /// Drop the specified pointer as a `Box<T>`.
 ///
 /// SAFETY: The specified pointer must be a valid `*mut T` which was originally

crates/wasmtime/src/runtime/component/concurrent.rs

@@ -904,6 +904,10 @@ impl Func {
             })
             .collect()
     }
+
+    pub(crate) fn instance(&self) -> Instance {
+        self.instance
+    }
 }
 
 /// Lower parameters of the specified type using the specified function.

crates/wasmtime/src/runtime/component/func.rs

@@ -118,7 +118,8 @@ pub use self::component::{Component, ComponentExportIndex};
 #[cfg(feature = "component-model-async")]
 pub use self::concurrent::{
     AbortOnDropHandle, Access, Accessor, AccessorTask, ErrorContext, FutureReader, FutureWriter,
-    HostFuture, HostStream, StreamReader, StreamWriter, VMComponentAsyncStore, Watch,
+    HostFuture, HostStream, ReadBuffer, StreamReader, StreamWriter, VMComponentAsyncStore,
+    VecBuffer, Watch, WriteBuffer,
 };
 pub use self::func::{
     ComponentNamedList, ComponentType, Func, Lift, Lower, TypedFunc, WasmList, WasmStr,