sync with spec

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

Author: dicej

crates/rust/src/async_support.rs

@@ -270,8 +270,8 @@ pub trait FuturePayload: Sized + 'static {
     fn new() -> u32;
     async fn write(future: u32, value: Self) -> bool;
     async fn read(future: u32) -> Option<Self>;
-    fn drop_writable(future: u32);
-    fn drop_readable(future: u32);
+    fn close_writable(future: u32);
+    fn close_readable(future: u32);
 }
 
 pub struct FutureWriter<T: FuturePayload> {
@@ -332,7 +332,7 @@ impl<T: FuturePayload> Drop for FutureWriter<T> {
                 Handle::Read => unreachable!(),
                 Handle::Write | Handle::LocalClosed => {
                     entry.remove();
-                    T::drop_writable(self.handle);
+                    T::close_writable(self.handle);
                 }
             },
         }
@@ -434,7 +434,7 @@ impl<T: FuturePayload> Drop for FutureReader<T> {
                 }
                 Handle::Read | Handle::LocalClosed => {
                     entry.remove();
-                    T::drop_readable(self.handle);
+                    T::close_readable(self.handle);
                 }
                 Handle::Write => unreachable!(),
             },
@@ -447,8 +447,8 @@ pub trait StreamPayload: Unpin + Sized + 'static {
     fn new() -> u32;
     async fn write(stream: u32, values: &[Self]) -> Option<usize>;
     async fn read(stream: u32, values: &mut [MaybeUninit<Self>]) -> Option<usize>;
-    fn drop_writable(future: u32);
-    fn drop_readable(future: u32);
+    fn close_writable(future: u32);
+    fn close_readable(future: u32);
 }
 
 pub struct StreamWriter<T: StreamPayload> {
@@ -558,7 +558,7 @@ impl<T: StreamPayload> Drop for StreamWriter<T> {
                 Handle::Read => unreachable!(),
                 Handle::Write | Handle::LocalClosed => {
                     entry.remove();
-                    T::drop_writable(self.handle);
+                    T::close_writable(self.handle);
                 }
             },
         }
@@ -693,7 +693,7 @@ impl<T: StreamPayload> Drop for StreamReader<T> {
                 }
                 Handle::Read | Handle::LocalClosed => {
                     entry.remove();
-                    T::drop_readable(self.handle);
+                    T::close_readable(self.handle);
                 }
                 Handle::Write => unreachable!(),
             },

crates/rust/src/interface.rs

@@ -614,7 +614,7 @@ impl {async_support}::FuturePayload for {name} {{
         }}
     }}
 
-    fn drop_writable(writer: u32) {{
+    fn close_writable(writer: u32) {{
         #[cfg(not(target_arch = "wasm32"))]
         {{
             unreachable!();
@@ -624,14 +624,14 @@ impl {async_support}::FuturePayload for {name} {{
         {{
             #[link(wasm_import_module = "{module}")]
             extern "C" {{
-                #[link_name = "[future-drop-writable-{index}]{func_name}"]
-                fn drop(_: u32);
+                #[link_name = "[future-close-writable-{index}]{func_name}"]
+                fn drop(_: u32, _: u32);
             }}
-            unsafe {{ drop(writer) }}
+            unsafe {{ drop(writer, 0) }}
         }}
     }}
 
-    fn drop_readable(reader: u32) {{
+    fn close_readable(reader: u32) {{
         #[cfg(not(target_arch = "wasm32"))]
         {{
             unreachable!();
@@ -641,7 +641,7 @@ impl {async_support}::FuturePayload for {name} {{
         {{
             #[link(wasm_import_module = "{module}")]
             extern "C" {{
-                #[link_name = "[future-drop-readable-{index}]{func_name}"]
+                #[link_name = "[future-close-readable-{index}]{func_name}"]
                 fn drop(_: u32);
             }}
             unsafe {{ drop(reader) }}
@@ -789,7 +789,7 @@ impl {async_support}::StreamPayload for {name} {{
         }}
     }}
 
-    fn drop_writable(writer: u32) {{
+    fn close_writable(writer: u32) {{
         #[cfg(not(target_arch = "wasm32"))]
         {{
             unreachable!();
@@ -799,14 +799,14 @@ impl {async_support}::StreamPayload for {name} {{
         {{
             #[link(wasm_import_module = "{module}")]
             extern "C" {{
-                #[link_name = "[stream-drop-writable-{index}]{func_name}"]
-                fn drop(_: u32);
+                #[link_name = "[stream-close-writable-{index}]{func_name}"]
+                fn drop(_: u32, _: u32);
             }}
-            unsafe {{ drop(writer) }}
+            unsafe {{ drop(writer, 0) }}
         }}
     }}
 
-    fn drop_readable(reader: u32) {{
+    fn close_readable(reader: u32) {{
         #[cfg(not(target_arch = "wasm32"))]
         {{
             unreachable!();
@@ -816,7 +816,7 @@ impl {async_support}::StreamPayload for {name} {{
         {{
             #[link(wasm_import_module = "{module}")]
             extern "C" {{
-                #[link_name = "[stream-drop-readable-{index}]{func_name}"]
+                #[link_name = "[stream-close-readable-{index}]{func_name}"]
                 fn drop(_: u32);
             }}
             unsafe {{ drop(reader) }}