Merge pull request #174 from bytecodealliance/dicej/another-cabi-fix

fix another stream/future ABI spec discrepancy

Author: dicej

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

@@ -157,17 +157,15 @@ enum Event {
     },
     StreamRead {
         code: ReturnCode,
-        handle: u32,
-        ty: TypeStreamTableIndex,
+        pending: Option<(TypeStreamTableIndex, u32)>,
     },
     StreamWrite {
         code: ReturnCode,
         pending: Option<(TypeStreamTableIndex, u32)>,
     },
     FutureRead {
         code: ReturnCode,
-        handle: u32,
-        ty: TypeFutureTableIndex,
+        pending: Option<(TypeFutureTableIndex, u32)>,
     },
     FutureWrite {
         code: ReturnCode,
@@ -4291,7 +4289,10 @@ impl Waitable {
     /// the state of the stream or future.
     fn on_delivery(&self, instance: &mut ComponentInstance, event: Event) {
         match event {
-            Event::FutureRead { ty, handle, .. }
+            Event::FutureRead {
+                pending: Some((ty, handle)),
+                ..
+            }
             | Event::FutureWrite {
                 pending: Some((ty, handle)),
                 ..
@@ -4313,7 +4314,10 @@ impl Waitable {
                     _ => unreachable!(),
                 };
             }
-            Event::StreamRead { ty, handle, .. }
+            Event::StreamRead {
+                pending: Some((ty, handle)),
+                ..
+            }
             | Event::StreamWrite {
                 pending: Some((ty, handle)),
                 ..