Fix warnings

fastly · Jun 28, 2024 · 7000ec3 · 7000ec3
1 parent ba3a765
commit 7000ec3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/crates/adapter/src/descriptors.rs b/crates/adapter/src/descriptors.rs
@@ -57,13 +57,7 @@ impl Streams {
 
 pub enum StreamType {
     /// Streams for implementing stdio.
-    Stdio(Stdio),
-}
-
-pub enum Stdio {
-    Stdin,
-    Stdout,
-    Stderr,
+    Stdio,
 }
 
 #[repr(C)]
@@ -94,19 +88,19 @@ impl Descriptors {
         d.push(Descriptor::Streams(Streams {
             input: new_once(stdin::get_stdin()),
             output: OnceCell::new(),
-            type_: StreamType::Stdio(Stdio::Stdin),
+            type_: StreamType::Stdio,
         }))
         .trapping_unwrap();
         d.push(Descriptor::Streams(Streams {
             input: OnceCell::new(),
             output: new_once(stdout::get_stdout()),
-            type_: StreamType::Stdio(Stdio::Stdout),
+            type_: StreamType::Stdio,
         }))
         .trapping_unwrap();
         d.push(Descriptor::Streams(Streams {
             input: OnceCell::new(),
             output: new_once(stderr::get_stderr()),
-            type_: StreamType::Stdio(Stdio::Stderr),
+            type_: StreamType::Stdio,
         }))
         .trapping_unwrap();
 

diff --git a/crates/adapter/src/lib.rs b/crates/adapter/src/lib.rs
@@ -1150,7 +1150,7 @@ pub unsafe extern "C" fn poll_oneoff(
                         .trapping_unwrap();
                     match desc {
                         Descriptor::Streams(streams) => match &streams.type_ {
-                            StreamType::Stdio(_) => (ERRNO_SUCCESS, 1, 0),
+                            StreamType::Stdio => (ERRNO_SUCCESS, 1, 0),
                         },
                         _ => unreachable!(),
                     }
@@ -1163,7 +1163,7 @@ pub unsafe extern "C" fn poll_oneoff(
                         .trapping_unwrap();
                     match desc {
                         Descriptor::Streams(streams) => match &streams.type_ {
-                            StreamType::Stdio(_) => (ERRNO_SUCCESS, 1, 0),
+                            StreamType::Stdio => (ERRNO_SUCCESS, 1, 0),
                         },
                         _ => unreachable!(),
                     }

diff --git a/lib/data/viceroy-component-adapter.wasm b/lib/data/viceroy-component-adapter.wasm