New upstream version 1.41.1+dfsg1

[rustc.git] / src / libstd / sys / wasi / stdio.rs

diff --git a/src/libstd/sys/wasi/stdio.rs b/src/libstd/sys/wasi/stdio.rs
index 1d57b9922e5993770c828484e6d28916515164d4..1d53884f2d6b40a6779718ea4c0387777c90b6b5 100644 (file)
--- a/src/libstd/sys/wasi/stdio.rs
+++ b/src/libstd/sys/wasi/stdio.rs
@@ -2,8 +2,6 @@ use crate::io::{self, IoSlice, IoSliceMut};
 use crate::mem::ManuallyDrop;
 use crate::sys::fd::WasiFd;
 
-use ::wasi::wasi_unstable as wasi;
-
 pub struct Stdin;
 pub struct Stdout;
 pub struct Stderr;
@@ -18,8 +16,11 @@ impl Stdin {
     }
 
     pub fn read_vectored(&self, data: &mut [IoSliceMut<'_>]) -> io::Result<usize> {
-        ManuallyDrop::new(unsafe { WasiFd::from_raw(wasi::STDIN_FD) })
-            .read(data)
+        ManuallyDrop::new(unsafe { WasiFd::from_raw(self.as_raw_fd()) }).read(data)
+    }
+
+    pub fn as_raw_fd(&self) -> u32 {
+        0
     }
 }
 
@@ -33,13 +34,16 @@ impl Stdout {
     }
 
     pub fn write_vectored(&self, data: &[IoSlice<'_>]) -> io::Result<usize> {
-        ManuallyDrop::new(unsafe { WasiFd::from_raw(wasi::STDOUT_FD) })
-            .write(data)
+        ManuallyDrop::new(unsafe { WasiFd::from_raw(self.as_raw_fd()) }).write(data)
     }
 
     pub fn flush(&self) -> io::Result<()> {
         Ok(())
     }
+
+    pub fn as_raw_fd(&self) -> u32 {
+        1
+    }
 }
 
 impl Stderr {
@@ -52,13 +56,16 @@ impl Stderr {
     }
 
     pub fn write_vectored(&self, data: &[IoSlice<'_>]) -> io::Result<usize> {
-        ManuallyDrop::new(unsafe { WasiFd::from_raw(wasi::STDERR_FD) })
-            .write(data)
+        ManuallyDrop::new(unsafe { WasiFd::from_raw(self.as_raw_fd()) }).write(data)
     }
 
     pub fn flush(&self) -> io::Result<()> {
         Ok(())
     }
+
+    pub fn as_raw_fd(&self) -> u32 {
+        2
+    }
 }
 
 impl io::Write for Stderr {
@@ -74,7 +81,7 @@ impl io::Write for Stderr {
 pub const STDIN_BUF_SIZE: usize = crate::sys_common::io::DEFAULT_BUF_SIZE;
 
 pub fn is_ebadf(err: &io::Error) -> bool {
-    err.raw_os_error() == Some(wasi::EBADF.get() as i32)
+    err.raw_os_error() == Some(wasi::ERRNO_BADF.into())
 }
 
 pub fn panic_output() -> Option<impl io::Write> {