Implement RFC 11: Redesigning Wasmtime's APIs (#2897)

Implement Wasmtime's new API as designed by RFC 11. This is quite a large commit which has had lots of discussion externally, so for more information it's best to read the RFC thread and the PR thread.

crates/wasi-common/cap-std-sync/src/dir.rs

@@ -106,7 +106,7 @@ impl Dir {
     }
 }
 
-#[async_trait::async_trait(?Send)]
+#[async_trait::async_trait]
 impl WasiDir for Dir {
     fn as_any(&self) -> &dyn Any {
         self

crates/wasi-common/cap-std-sync/src/file.rs

@@ -20,7 +20,7 @@ impl File {
     }
 }
 
-#[async_trait::async_trait(?Send)]
+#[async_trait::async_trait]
 impl WasiFile for File {
     fn as_any(&self) -> &dyn Any {
         self
@@ -119,10 +119,10 @@ impl WasiFile for File {
     async fn num_ready_bytes(&self) -> Result<u64, Error> {
         Ok(self.0.num_ready_bytes()?)
     }
-    async fn readable(&mut self) -> Result<(), Error> {
+    async fn readable(&self) -> Result<(), Error> {
         Err(Error::badf())
     }
-    async fn writable(&mut self) -> Result<(), Error> {
+    async fn writable(&self) -> Result<(), Error> {
         Err(Error::badf())
     }
 }

crates/wasi-common/cap-std-sync/src/lib.rs

@@ -42,9 +42,7 @@ pub use clocks::clocks_ctx;
 pub use sched::sched_ctx;
 
 use cap_rand::RngCore;
-use std::cell::RefCell;
 use std::path::Path;
-use std::rc::Rc;
 use wasi_common::{table::Table, Error, WasiCtx, WasiFile};
 
 pub struct WasiCtxBuilder(WasiCtx);
@@ -55,7 +53,7 @@ impl WasiCtxBuilder {
             random_ctx(),
             clocks_ctx(),
             sched_ctx(),
-            Rc::new(RefCell::new(Table::new())),
+            Table::new(),
         ))
     }
     pub fn env(mut self, var: &str, value: &str) -> Result<Self, wasi_common::StringArrayError> {
@@ -124,6 +122,6 @@ impl WasiCtxBuilder {
     }
 }
 
-pub fn random_ctx() -> RefCell<Box<dyn RngCore>> {
-    RefCell::new(Box::new(unsafe { cap_rand::rngs::OsRng::default() }))
+pub fn random_ctx() -> Box<dyn RngCore + Send + Sync> {
+    Box::new(unsafe { cap_rand::rngs::OsRng::default() })
 }

crates/wasi-common/cap-std-sync/src/sched.rs

@@ -21,7 +21,7 @@ impl SyncSched {
         Self {}
     }
 }
-#[async_trait::async_trait(?Send)]
+#[async_trait::async_trait]
 impl WasiSched for SyncSched {
     async fn poll_oneoff<'a>(&self, poll: &mut Poll<'a>) -> Result<(), Error> {
         poll_oneoff(poll).await

crates/wasi-common/cap-std-sync/src/stdio.rs

@@ -22,7 +22,7 @@ pub fn stdin() -> Stdin {
     Stdin(std::io::stdin())
 }
 
-#[async_trait::async_trait(?Send)]
+#[async_trait::async_trait]
 impl WasiFile for Stdin {
     fn as_any(&self) -> &dyn Any {
         self
@@ -103,10 +103,10 @@ impl WasiFile for Stdin {
     async fn num_ready_bytes(&self) -> Result<u64, Error> {
         Ok(self.0.num_ready_bytes()?)
     }
-    async fn readable(&mut self) -> Result<(), Error> {
+    async fn readable(&self) -> Result<(), Error> {
         Err(Error::badf())
     }
-    async fn writable(&mut self) -> Result<(), Error> {
+    async fn writable(&self) -> Result<(), Error> {
         Err(Error::badf())
     }
 }
@@ -125,7 +125,7 @@ impl AsRawFd for Stdin {
 
 macro_rules! wasi_file_write_impl {
     ($ty:ty) => {
-        #[async_trait::async_trait(?Send)]
+        #[async_trait::async_trait]
         impl WasiFile for $ty {
             fn as_any(&self) -> &dyn Any {
                 self
@@ -209,10 +209,10 @@ macro_rules! wasi_file_write_impl {
             async fn num_ready_bytes(&self) -> Result<u64, Error> {
                 Ok(0)
             }
-            async fn readable(&mut self) -> Result<(), Error> {
+            async fn readable(&self) -> Result<(), Error> {
                 Err(Error::badf())
             }
-            async fn writable(&mut self) -> Result<(), Error> {
+            async fn writable(&self) -> Result<(), Error> {
                 Err(Error::badf())
             }
         }