refactor: remove ResourceView

Signed-off-by: Roman Volosatovs <[email protected]>

Author: rvolosatovs

crates/wasi/src/cli.rs

@@ -1,53 +1,6 @@
 use std::rc::Rc;
 use std::sync::Arc;
 
-use wasmtime::component::ResourceTable;
-
-use crate::ResourceView;
-
-#[repr(transparent)]
-pub struct WasiCliImpl<T>(pub T);
-
-impl<T: WasiCliView> WasiCliView for &mut T {
-    type InputStream = T::InputStream;
-    type OutputStream = T::OutputStream;
-
-    fn cli(&mut self) -> &WasiCliCtx<T::InputStream, T::OutputStream> {
-        (**self).cli()
-    }
-}
-
-impl<T: WasiCliView> WasiCliView for Box<T> {
-    type InputStream = T::InputStream;
-    type OutputStream = T::OutputStream;
-
-    fn cli(&mut self) -> &WasiCliCtx<T::InputStream, T::OutputStream> {
-        (**self).cli()
-    }
-}
-
-impl<T: ResourceView> ResourceView for WasiCliImpl<T> {
-    fn table(&mut self) -> &mut ResourceTable {
-        self.0.table()
-    }
-}
-
-impl<T: WasiCliView> WasiCliView for WasiCliImpl<T> {
-    type InputStream = T::InputStream;
-    type OutputStream = T::OutputStream;
-
-    fn cli(&mut self) -> &WasiCliCtx<T::InputStream, T::OutputStream> {
-        self.0.cli()
-    }
-}
-
-pub trait WasiCliView: ResourceView + Send {
-    type InputStream: IsTerminal;
-    type OutputStream: IsTerminal;
-
-    fn cli(&mut self) -> &WasiCliCtx<Self::InputStream, Self::OutputStream>;
-}
-
 #[derive(Default)]
 pub struct WasiCliCtx<I, O> {
     pub environment: Vec<(String, String)>,

crates/wasi/src/lib.rs

@@ -42,20 +42,3 @@ pub use cap_fs_ext::SystemTimeSpec;
 pub use cap_rand::RngCore;
 #[doc(no_inline)]
 pub use wasmtime::component::{ResourceTable, ResourceTableError};
-
-// TODO: Consolidate with `IoView`
-pub trait ResourceView {
-    fn table(&mut self) -> &mut ResourceTable;
-}
-
-impl<T: ?Sized + ResourceView> ResourceView for &mut T {
-    fn table(&mut self) -> &mut ResourceTable {
-        (**self).table()
-    }
-}
-
-impl<T: ?Sized + ResourceView> ResourceView for Box<T> {
-    fn table(&mut self) -> &mut ResourceTable {
-        (**self).table()
-    }
-}

crates/wasi/src/p3/bindings.rs

@@ -12,8 +12,7 @@
 //! done using the `with` option to [`bindgen!`]:
 //!
 //! ```rust
-//! use wasmtime_wasi::ResourceView;
-//! use wasmtime_wasi::p3::{WasiCtx, WasiView};
+//! use wasmtime_wasi::p3::{WasiCtx, WasiCtxView, WasiView};
 //! use wasmtime::{Result, Engine, Config};
 //! use wasmtime::component::{Linker, HasSelf, ResourceTable};
 //!
@@ -96,12 +95,13 @@
 //!     }
 //! }
 //!
-//! impl ResourceView for MyState {
-//!     fn table(&mut self) -> &mut ResourceTable { &mut self.table }
-//! }
-//!
 //! impl WasiView for MyState {
-//!     fn ctx(&mut self) -> &mut WasiCtx { &mut self.ctx }
+//!     fn ctx(&mut self) -> WasiCtxView<'_> {
+//!         WasiCtxView{
+//!             ctx: &mut self.ctx,
+//!             table: &mut self.table,
+//!         }
+//!     }
 //! }
 //!
 //! fn main() -> Result<()> {
@@ -196,8 +196,7 @@ pub use self::generated::wasi::*;
 /// ```no_run
 /// use wasmtime::{Engine, Result, Store, Config};
 /// use wasmtime::component::{Component, Linker, ResourceTable};
-/// use wasmtime_wasi::ResourceView;
-/// use wasmtime_wasi::p3::{WasiCtx, WasiView, WasiCtxBuilder};
+/// use wasmtime_wasi::p3::{WasiCtx, WasiCtxView, WasiCtxBuilder, WasiView};
 /// use wasmtime_wasi::p3::bindings::Command;
 ///
 /// // This example is an example shim of executing a component based on the
@@ -248,12 +247,13 @@ pub use self::generated::wasi::*;
 ///     table: ResourceTable,
 /// }
 ///
-/// impl ResourceView for MyState {
-///     fn table(&mut self) -> &mut ResourceTable { &mut self.table }
-/// }
-///
 /// impl WasiView for MyState {
-///     fn ctx(&mut self) -> &mut WasiCtx { &mut self.ctx }
+///     fn ctx(&mut self) -> WasiCtxView<'_> {
+///         WasiCtxView{
+///             ctx: &mut self.ctx,
+///             table: &mut self.table,
+///         }
+///     }
 /// }
 /// ```
 ///
@@ -270,8 +270,7 @@ pub use self::generated::Command;
 /// ```no_run
 /// use wasmtime::{Engine, Result, Store, Config};
 /// use wasmtime::component::{Linker, Component, ResourceTable};
-/// use wasmtime_wasi::ResourceView;
-/// use wasmtime_wasi::p3::{WasiCtx, WasiView, WasiCtxBuilder};
+/// use wasmtime_wasi::p3::{WasiCtx, WasiCtxBuilder, WasiCtxView, WasiView};
 /// use wasmtime_wasi::p3::bindings::CommandPre;
 ///
 /// // This example is an example shim of executing a component based on the
@@ -323,12 +322,13 @@ pub use self::generated::Command;
 ///     table: ResourceTable,
 /// }
 ///
-/// impl ResourceView for MyState {
-///     fn table(&mut self) -> &mut ResourceTable { &mut self.table }
-/// }
-///
 /// impl WasiView for MyState {
-///     fn ctx(&mut self) -> &mut WasiCtx { &mut self.ctx }
+///     fn ctx(&mut self) -> WasiCtxView<'_> {
+///         WasiCtxView{
+///             ctx: &mut self.ctx,
+///             table: &mut self.table,
+///         }
+///     }
 /// }
 /// ```
 ///

crates/wasi/src/p3/cli/host.rs

@@ -1,10 +1,10 @@
-use crate::cli::{IsTerminal, WasiCliImpl, WasiCliView};
+use crate::I32Exit;
+use crate::cli::IsTerminal;
 use crate::p3::bindings::cli::{
     environment, exit, stderr, stdin, stdout, terminal_input, terminal_output, terminal_stderr,
     terminal_stdin, terminal_stdout,
 };
-use crate::p3::cli::{InputStream, OutputStream, TerminalInput, TerminalOutput, WasiCli};
-use crate::{I32Exit, ResourceView as _};
+use crate::p3::cli::{TerminalInput, TerminalOutput, WasiCli, WasiCliCtxView};
 use anyhow::{Context as _, anyhow};
 use bytes::BytesMut;
 use std::io::Cursor;
@@ -78,41 +78,32 @@ where
     }
 }
 
-impl<T> terminal_input::Host for WasiCliImpl<T> where T: WasiCliView {}
-impl<T> terminal_output::Host for WasiCliImpl<T> where T: WasiCliView {}
+impl terminal_input::Host for WasiCliCtxView<'_> {}
+impl terminal_output::Host for WasiCliCtxView<'_> {}
 
-impl<T> terminal_input::HostTerminalInput for WasiCliImpl<T>
-where
-    T: WasiCliView,
-{
+impl terminal_input::HostTerminalInput for WasiCliCtxView<'_> {
     fn drop(&mut self, rep: Resource<TerminalInput>) -> wasmtime::Result<()> {
-        self.table()
+        self.table
             .delete(rep)
             .context("failed to delete terminal input resource from table")?;
         Ok(())
     }
 }
 
-impl<T> terminal_output::HostTerminalOutput for WasiCliImpl<T>
-where
-    T: WasiCliView,
-{
+impl terminal_output::HostTerminalOutput for WasiCliCtxView<'_> {
     fn drop(&mut self, rep: Resource<TerminalOutput>) -> wasmtime::Result<()> {
-        self.table()
+        self.table
             .delete(rep)
             .context("failed to delete terminal output resource from table")?;
         Ok(())
     }
 }
 
-impl<T> terminal_stdin::Host for WasiCliImpl<T>
-where
-    T: WasiCliView,
-{
+impl terminal_stdin::Host for WasiCliCtxView<'_> {
     fn get_terminal_stdin(&mut self) -> wasmtime::Result<Option<Resource<TerminalInput>>> {
-        if self.cli().stdin.is_terminal() {
+        if self.ctx.stdin.is_terminal() {
             let fd = self
-                .table()
+                .table
                 .push(TerminalInput)
                 .context("failed to push terminal stdin resource to table")?;
             Ok(Some(fd))
@@ -122,14 +113,11 @@ where
     }
 }
 
-impl<T> terminal_stdout::Host for WasiCliImpl<T>
-where
-    T: WasiCliView,
-{
+impl terminal_stdout::Host for WasiCliCtxView<'_> {
     fn get_terminal_stdout(&mut self) -> wasmtime::Result<Option<Resource<TerminalOutput>>> {
-        if self.cli().stdout.is_terminal() {
+        if self.ctx.stdout.is_terminal() {
             let fd = self
-                .table()
+                .table
                 .push(TerminalOutput)
                 .context("failed to push terminal stdout resource to table")?;
             Ok(Some(fd))
@@ -139,14 +127,11 @@ where
     }
 }
 
-impl<T> terminal_stderr::Host for WasiCliImpl<T>
-where
-    T: WasiCliView,
-{
+impl terminal_stderr::Host for WasiCliCtxView<'_> {
     fn get_terminal_stderr(&mut self) -> wasmtime::Result<Option<Resource<TerminalOutput>>> {
-        if self.cli().stderr.is_terminal() {
+        if self.ctx.stderr.is_terminal() {
             let fd = self
-                .table()
+                .table
                 .push(TerminalOutput)
                 .context("failed to push terminal stderr resource to table")?;
             Ok(Some(fd))
@@ -156,18 +141,14 @@ where
     }
 }
 
-impl<T> stdin::HostConcurrent for WasiCli<T>
-where
-    T: WasiCliView + 'static,
-    T::InputStream: InputStream,
-{
+impl stdin::HostConcurrent for WasiCli {
     async fn get_stdin<U>(store: &Accessor<U, Self>) -> wasmtime::Result<HostStream<u8>> {
         store.with(|mut view| {
             let instance = view.instance();
             let (tx, rx) = instance
                 .stream::<_, _, BytesMut>(&mut view)
                 .context("failed to create stream")?;
-            let stdin = view.get().cli().stdin.reader();
+            let stdin = view.get().ctx.stdin.reader();
             view.spawn(InputTask {
                 rx: Box::into_pin(stdin),
                 tx,
@@ -177,20 +158,16 @@ where
     }
 }
 
-impl<T> stdin::Host for WasiCliImpl<T> where T: WasiCliView {}
+impl stdin::Host for WasiCliCtxView<'_> {}
 
-impl<T> stdout::HostConcurrent for WasiCli<T>
-where
-    T: WasiCliView + 'static,
-    T::OutputStream: OutputStream,
-{
+impl stdout::HostConcurrent for WasiCli {
     async fn set_stdout<U>(
         store: &Accessor<U, Self>,
         data: HostStream<u8>,
     ) -> wasmtime::Result<()> {
         store.with(|mut view| {
             let stdout = data.into_reader(&mut view);
-            let tx = view.get().cli().stdout.writer();
+            let tx = view.get().ctx.stdout.writer();
             view.spawn(OutputTask {
                 rx: stdout,
                 tx: Box::into_pin(tx),
@@ -200,20 +177,16 @@ where
     }
 }
 
-impl<T> stdout::Host for WasiCliImpl<T> where T: WasiCliView {}
+impl stdout::Host for WasiCliCtxView<'_> {}
 
-impl<T> stderr::HostConcurrent for WasiCli<T>
-where
-    T: WasiCliView + 'static,
-    T::OutputStream: OutputStream,
-{
+impl stderr::HostConcurrent for WasiCli {
     async fn set_stderr<U>(
         store: &Accessor<U, Self>,
         data: HostStream<u8>,
     ) -> wasmtime::Result<()> {
         store.with(|mut view| {
             let stderr = data.into_reader(&mut view);
-            let tx = view.get().cli().stderr.writer();
+            let tx = view.get().ctx.stderr.writer();
             view.spawn(OutputTask {
                 rx: stderr,
                 tx: Box::into_pin(tx),
@@ -223,29 +196,23 @@ where
     }
 }
 
-impl<T> stderr::Host for WasiCliImpl<T> where T: WasiCliView {}
+impl stderr::Host for WasiCliCtxView<'_> {}
 
-impl<T> environment::Host for WasiCliImpl<T>
-where
-    T: WasiCliView,
-{
+impl environment::Host for WasiCliCtxView<'_> {
     fn get_environment(&mut self) -> wasmtime::Result<Vec<(String, String)>> {
-        Ok(self.cli().environment.clone())
+        Ok(self.ctx.environment.clone())
     }
 
     fn get_arguments(&mut self) -> wasmtime::Result<Vec<String>> {
-        Ok(self.cli().arguments.clone())
+        Ok(self.ctx.arguments.clone())
     }
 
     fn initial_cwd(&mut self) -> wasmtime::Result<Option<String>> {
-        Ok(self.cli().initial_cwd.clone())
+        Ok(self.ctx.initial_cwd.clone())
     }
 }
 
-impl<T> exit::Host for WasiCliImpl<T>
-where
-    T: WasiCliView,
-{
+impl exit::Host for WasiCliCtxView<'_> {
     fn exit(&mut self, status: Result<(), ()>) -> wasmtime::Result<()> {
         let status = match status {
             Ok(()) => 0,