Fix some minor mistakes/typos in guest_write (#13210)

* Fix some minor mistakes/typos in `guest_write`

This commit fixes a mistake where if a synchronous call to
`future.write` was blocked, then it woke up because the readable end was
dropped, the future would then erroneously not be marked "done" which
could allow future operations to proceed. The fix here is to adjust a
`matches!` to handle both futures and streams.

An associated `*.wast` test is expanded to mix in synchronous calls as
well as asynchronous calls in various places. The test is refactored a
bit to have various helpers in various places.

Finally some minor updates to error messages are made which avoids
saying "stream" when the error shows up for both futures and streams.

* Fix tests

Author: alexcrichton

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

@@ -3512,7 +3512,7 @@ impl Instance {
         };
 
         if done {
-            bail!("cannot write to stream after being notified that the readable end dropped");
+            bail!("cannot write after being notified that the readable end dropped");
         }
 
         *state = TransmitLocalState::Busy;
@@ -3724,10 +3724,7 @@ impl Instance {
         if result != ReturnCode::Blocked {
             *self.id().get_mut(store.0).get_mut_by_index(ty, handle)?.1 =
                 TransmitLocalState::Write {
-                    done: matches!(
-                        (result, ty),
-                        (ReturnCode::Dropped(_), TransmitIndex::Stream(_))
-                    ),
+                    done: matches!(result, ReturnCode::Dropped(_)),
                 };
         }
 
@@ -3767,7 +3764,7 @@ impl Instance {
         };
 
         if done {
-            bail!("cannot read from stream after being notified that the writable end dropped");
+            bail!("cannot read after being notified that the writable end dropped");
         }
 
         *state = TransmitLocalState::Busy;

crates/wast/src/wast.rs

@@ -538,6 +538,10 @@ impl WastContext {
             || (expected.contains("null function") && (actual.contains("uninitialized element") || actual.contains("null reference")))
             // GC tests say "null $kind reference" but we just say "null reference".
             || (expected.contains("null") && expected.contains("reference") && actual.contains("null reference"))
+            // upstream component model tests expect slightly different error
+            // messages than we generate.
+            || (expected.contains("cannot write") && actual.contains("cannot write"))
+            || (expected.contains("cannot read") && actual.contains("cannot read"))
         {
             return Ok(());
         }

tests/misc_testsuite/component-model/async/stream-cancel-finished-op.wast

@@ -229,23 +229,23 @@
 )
 
 (component instance $A $A)
-(assert_trap (invoke "test-cancel-read" (u32.const 0)) "cannot read from stream after being notified that the writable end dropped")
+(assert_trap (invoke "test-cancel-read" (u32.const 0)) "cannot read after being notified that the writable end dropped")
 (component instance $A $A)
-(assert_trap (invoke "test-cancel-read" (u32.const 2)) "cannot read from stream after being notified that the writable end dropped")
+(assert_trap (invoke "test-cancel-read" (u32.const 2)) "cannot read after being notified that the writable end dropped")
 (component instance $A $A)
-(assert_trap (invoke "test-cancel-read" (u32.const 3)) "cannot read from stream after being notified that the writable end dropped")
+(assert_trap (invoke "test-cancel-read" (u32.const 3)) "cannot read after being notified that the writable end dropped")
 
 (component instance $A $A)
-(assert_trap (invoke "test-cancel-write" (u32.const 1)) "cannot write to stream after being notified that the readable end dropped")
+(assert_trap (invoke "test-cancel-write" (u32.const 1)) "cannot write after being notified that the readable end dropped")
 (component instance $A $A)
-(assert_trap (invoke "test-cancel-write" (u32.const 2)) "cannot write to stream after being notified that the readable end dropped")
+(assert_trap (invoke "test-cancel-write" (u32.const 2)) "cannot write after being notified that the readable end dropped")
 (component instance $A $A)
-(assert_trap (invoke "test-cancel-write" (u32.const 3)) "cannot write to stream after being notified that the readable end dropped")
+(assert_trap (invoke "test-cancel-write" (u32.const 3)) "cannot write after being notified that the readable end dropped")
 
 
 (component instance $A $A)
-(assert_trap (invoke "test-cancel-future-write" (u32.const 2)) "cannot write to stream after being notified that the readable end dropped")
+(assert_trap (invoke "test-cancel-future-write" (u32.const 2)) "cannot write after being notified that the readable end dropped")
 (component instance $A $A)
-(assert_trap (invoke "test-cancel-future-write" (u32.const 3)) "cannot write to stream after being notified that the readable end dropped")
+(assert_trap (invoke "test-cancel-future-write" (u32.const 3)) "cannot write after being notified that the readable end dropped")
 (component instance $A $A)
-(assert_trap (invoke "test-cancel-future-write" (u32.const 4)) "cannot write to stream after being notified that the readable end dropped")
+(assert_trap (invoke "test-cancel-future-write" (u32.const 4)) "cannot write after being notified that the readable end dropped")