Should use OsOther to wrap custom stdio

Author: Jakub Konka

crates/c-api/src/wasi.rs

@@ -238,7 +238,7 @@ fn create_snapshot0_instance(store: &Store, config: wasi_config_t) -> Result<Was
 
 fn wasi_preview_builder(config: wasi_config_t) -> Result<WasiPreview1CtxBuilder> {
     use std::convert::TryFrom;
-    use wasi_common::OsFile;
+    use wasi_common::OsOther;
     let mut builder = WasiPreview1CtxBuilder::new();
     if config.inherit_args {
         builder.inherit_args();
@@ -253,17 +253,17 @@ fn wasi_preview_builder(config: wasi_config_t) -> Result<WasiPreview1CtxBuilder>
     if config.inherit_stdin {
         builder.inherit_stdin();
     } else if let Some(file) = config.stdin {
-        builder.stdin(OsFile::try_from(file)?);
+        builder.stdin(OsOther::try_from(file)?);
     }
     if config.inherit_stdout {
         builder.inherit_stdout();
     } else if let Some(file) = config.stdout {
-        builder.stdout(OsFile::try_from(file)?);
+        builder.stdout(OsOther::try_from(file)?);
     }
     if config.inherit_stderr {
         builder.inherit_stderr();
     } else if let Some(file) = config.stderr {
-        builder.stderr(OsFile::try_from(file)?);
+        builder.stderr(OsOther::try_from(file)?);
     }
     for preopen in config.preopens {
         builder.preopened_dir(preopen.0, preopen.1);

crates/test-programs/tests/wasm_tests/runtime.rs

@@ -2,7 +2,7 @@ use anyhow::{bail, Context};
 use std::convert::TryFrom;
 use std::fs::File;
 use std::path::Path;
-use wasi_common::{OsFile, VirtualDirEntry};
+use wasi_common::{OsOther, VirtualDirEntry};
 use wasmtime::{Instance, Module, Store};
 
 #[derive(Clone, Copy, Debug)]
@@ -48,7 +48,7 @@ pub fn instantiate(
     // stdin is closed which causes tests to fail.
     let (reader, _writer) = os_pipe::pipe()?;
     let file = reader_to_file(reader);
-    let handle = OsFile::try_from(file).context("failed to create OsFile from PipeReader")?;
+    let handle = OsOther::try_from(file).context("failed to create OsOther from PipeReader")?;
     builder.stdin(handle);
     let snapshot1 = wasmtime_wasi::Wasi::new(&store, builder.build()?);
     let module = Module::new(&store, &data).context("failed to create wasm module")?;

crates/wasi-common/src/entry.rs

@@ -8,6 +8,7 @@ use std::rc::Rc;
 pub(crate) struct EntryHandle(Rc<dyn Handle>);
 
 impl EntryHandle {
+    #[allow(dead_code)]
     pub(crate) fn new<T: Handle + 'static>(handle: T) -> Self {
         Self(Rc::new(handle))
     }

crates/wasi-common/src/lib.rs

@@ -39,6 +39,7 @@ pub use ctx::{WasiCtx, WasiCtxBuilder, WasiCtxBuilderError};
 pub use handle::{Handle, HandleRights};
 pub use sys::osdir::OsDir;
 pub use sys::osfile::OsFile;
+pub use sys::osother::{OsOther, OsOtherExt};
 pub use sys::preopen_dir;
 pub use sys::stdio::{Stdio, StdioExt};
 pub use virtfs::{FileContents, VirtualDirEntry};

crates/wasi-common/src/sys/osother.rs

@@ -10,13 +10,13 @@ use std::fs::File;
 use std::io::{self, Read, Write};
 use std::ops::Deref;
 
-pub(crate) trait OsOtherExt {
+pub trait OsOtherExt {
     /// Create `OsOther` as `dyn Handle` from null device.
     fn from_null() -> io::Result<Box<dyn Handle>>;
 }
 
 #[derive(Debug)]
-pub(crate) struct OsOther {
+pub struct OsOther {
     file_type: Filetype,
     rights: Cell<HandleRights>,
     handle: OsHandle,