Auto merge of rust-lang#136769 - thaliaarchi:io-optional-methods/stdio, r=<try>

bors · bors · commit 4fff64277713 · 2025-03-22T07:55:34.000Z
Provide optional `Read`/`Write` methods for stdio Override more of the default methods for `io::Read` and `io::Write` for stdio types, when efficient to do so, and deduplicate unsupported types. Tracked in rust-lang#136756. try-job: x86_64-msvc-1
diff --git a/library/std/src/io/stdio.rs b/library/std/src/io/stdio.rs
@@ -97,39 +97,53 @@ const fn stderr_raw() -> StderrRaw {
 
 impl Read for StdinRaw {
     fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        handle_ebadf(self.0.read(buf), 0)
+        handle_ebadf(self.0.read(buf), || Ok(0))
     }
 
     fn read_buf(&mut self, buf: BorrowedCursor<'_>) -> io::Result<()> {
-        handle_ebadf(self.0.read_buf(buf), ())
+        handle_ebadf(self.0.read_buf(buf), || Ok(()))
     }
 
     fn read_vectored(&mut self, bufs: &mut [IoSliceMut<'_>]) -> io::Result<usize> {
-        handle_ebadf(self.0.read_vectored(bufs), 0)
+        handle_ebadf(self.0.read_vectored(bufs), || Ok(0))
     }
 
     #[inline]
     fn is_read_vectored(&self) -> bool {
         self.0.is_read_vectored()
     }
 
+    fn read_exact(&mut self, buf: &mut [u8]) -> io::Result<()> {
+        if buf.is_empty() {
+            return Ok(());
+        }
+        handle_ebadf(self.0.read_exact(buf), || Err(io::Error::READ_EXACT_EOF))
+    }
+
+    fn read_buf_exact(&mut self, buf: BorrowedCursor<'_>) -> io::Result<()> {
+        if buf.capacity() == 0 {
+            return Ok(());
+        }
+        handle_ebadf(self.0.read_buf_exact(buf), || Err(io::Error::READ_EXACT_EOF))
+    }
+
     fn read_to_end(&mut self, buf: &mut Vec<u8>) -> io::Result<usize> {
-        handle_ebadf(self.0.read_to_end(buf), 0)
+        handle_ebadf(self.0.read_to_end(buf), || Ok(0))
     }
 
     fn read_to_string(&mut self, buf: &mut String) -> io::Result<usize> {
-        handle_ebadf(self.0.read_to_string(buf), 0)
+        handle_ebadf(self.0.read_to_string(buf), || Ok(0))
     }
 }
 
 impl Write for StdoutRaw {
     fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        handle_ebadf(self.0.write(buf), buf.len())
+        handle_ebadf(self.0.write(buf), || Ok(buf.len()))
     }
 
     fn write_vectored(&mut self, bufs: &[IoSlice<'_>]) -> io::Result<usize> {
-        let total = || bufs.iter().map(|b| b.len()).sum();
-        handle_ebadf_lazy(self.0.write_vectored(bufs), total)
+        let total = || Ok(bufs.iter().map(|b| b.len()).sum());
+        handle_ebadf(self.0.write_vectored(bufs), total)
     }
 
     #[inline]
@@ -138,30 +152,30 @@ impl Write for StdoutRaw {
     }
 
     fn flush(&mut self) -> io::Result<()> {
-        handle_ebadf(self.0.flush(), ())
+        handle_ebadf(self.0.flush(), || Ok(()))
     }
 
     fn write_all(&mut self, buf: &[u8]) -> io::Result<()> {
-        handle_ebadf(self.0.write_all(buf), ())
+        handle_ebadf(self.0.write_all(buf), || Ok(()))
     }
 
     fn write_all_vectored(&mut self, bufs: &mut [IoSlice<'_>]) -> io::Result<()> {
-        handle_ebadf(self.0.write_all_vectored(bufs), ())
+        handle_ebadf(self.0.write_all_vectored(bufs), || Ok(()))
     }
 
     fn write_fmt(&mut self, fmt: fmt::Arguments<'_>) -> io::Result<()> {
-        handle_ebadf(self.0.write_fmt(fmt), ())
+        handle_ebadf(self.0.write_fmt(fmt), || Ok(()))
     }
 }
 
 impl Write for StderrRaw {
     fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        handle_ebadf(self.0.write(buf), buf.len())
+        handle_ebadf(self.0.write(buf), || Ok(buf.len()))
     }
 
     fn write_vectored(&mut self, bufs: &[IoSlice<'_>]) -> io::Result<usize> {
-        let total = || bufs.iter().map(|b| b.len()).sum();
-        handle_ebadf_lazy(self.0.write_vectored(bufs), total)
+        let total = || Ok(bufs.iter().map(|b| b.len()).sum());
+        handle_ebadf(self.0.write_vectored(bufs), total)
     }
 
     #[inline]
@@ -170,32 +184,25 @@ impl Write for StderrRaw {
     }
 
     fn flush(&mut self) -> io::Result<()> {
-        handle_ebadf(self.0.flush(), ())
+        handle_ebadf(self.0.flush(), || Ok(()))
     }
 
     fn write_all(&mut self, buf: &[u8]) -> io::Result<()> {
-        handle_ebadf(self.0.write_all(buf), ())
+        handle_ebadf(self.0.write_all(buf), || Ok(()))
     }
 
     fn write_all_vectored(&mut self, bufs: &mut [IoSlice<'_>]) -> io::Result<()> {
-        handle_ebadf(self.0.write_all_vectored(bufs), ())
+        handle_ebadf(self.0.write_all_vectored(bufs), || Ok(()))
     }
 
     fn write_fmt(&mut self, fmt: fmt::Arguments<'_>) -> io::Result<()> {
-        handle_ebadf(self.0.write_fmt(fmt), ())
-    }
-}
-
-fn handle_ebadf<T>(r: io::Result<T>, default: T) -> io::Result<T> {
-    match r {
-        Err(ref e) if stdio::is_ebadf(e) => Ok(default),
-        r => r,
+        handle_ebadf(self.0.write_fmt(fmt), || Ok(()))
     }
 }
 
-fn handle_ebadf_lazy<T>(r: io::Result<T>, default: impl FnOnce() -> T) -> io::Result<T> {
+fn handle_ebadf<T>(r: io::Result<T>, default: impl FnOnce() -> io::Result<T>) -> io::Result<T> {
     match r {
-        Err(ref e) if stdio::is_ebadf(e) => Ok(default()),
+        Err(ref e) if stdio::is_ebadf(e) => default(),
         r => r,
     }
 }
diff --git a/library/std/src/sys/stdio/sgx.rs b/library/std/src/sys/stdio/sgx.rs
@@ -3,9 +3,9 @@ use fortanix_sgx_abi as abi;
 use crate::io::{self, BorrowedCursor, IoSlice, IoSliceMut};
 use crate::sys::fd::FileDesc;
 
-pub struct Stdin(());
-pub struct Stdout(());
-pub struct Stderr(());
+pub struct Stdin;
+pub struct Stdout;
+pub struct Stderr;
 
 fn with_std_fd<F: FnOnce(&FileDesc) -> R, R>(fd: abi::Fd, f: F) -> R {
     let fd = FileDesc::new(fd);
@@ -16,7 +16,7 @@ fn with_std_fd<F: FnOnce(&FileDesc) -> R, R>(fd: abi::Fd, f: F) -> R {
 
 impl Stdin {
     pub const fn new() -> Stdin {
-        Stdin(())
+        Stdin
     }
 }
 
@@ -41,7 +41,7 @@ impl io::Read for Stdin {
 
 impl Stdout {
     pub const fn new() -> Stdout {
-        Stdout(())
+        Stdout
     }
 }
 
@@ -66,7 +66,7 @@ impl io::Write for Stdout {
 
 impl Stderr {
     pub const fn new() -> Stderr {
-        Stderr(())
+        Stderr
     }
 }
 
diff --git a/library/std/src/sys/stdio/solid.rs b/library/std/src/sys/stdio/solid.rs
@@ -1,22 +1,13 @@
+#[expect(dead_code)]
+#[path = "unsupported.rs"]
+mod unsupported_stdio;
+
 use crate::io;
 use crate::sys::pal::abi;
 
-pub struct Stdin;
+pub type Stdin = unsupported_stdio::Stdin;
 pub struct Stdout;
-pub struct Stderr;
-struct PanicOutput;
-
-impl Stdin {
-    pub const fn new() -> Stdin {
-        Stdin
-    }
-}
-
-impl io::Read for Stdin {
-    fn read(&mut self, _buf: &mut [u8]) -> io::Result<usize> {
-        Ok(0)
-    }
-}
+pub type Stderr = Stdout;
 
 impl Stdout {
     pub const fn new() -> Stdout {
@@ -35,46 +26,12 @@ impl io::Write for Stdout {
     }
 }
 
-impl Stderr {
-    pub const fn new() -> Stderr {
-        Stderr
-    }
-}
-
-impl io::Write for Stderr {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        unsafe { abi::SOLID_LOG_write(buf.as_ptr(), buf.len()) };
-        Ok(buf.len())
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        Ok(())
-    }
-}
-
-impl PanicOutput {
-    pub const fn new() -> PanicOutput {
-        PanicOutput
-    }
-}
-
-impl io::Write for PanicOutput {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        unsafe { abi::SOLID_LOG_write(buf.as_ptr(), buf.len()) };
-        Ok(buf.len())
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        Ok(())
-    }
-}
-
-pub const STDIN_BUF_SIZE: usize = 0;
+pub const STDIN_BUF_SIZE: usize = unsupported_stdio::STDIN_BUF_SIZE;
 
 pub fn is_ebadf(_err: &io::Error) -> bool {
     true
 }
 
 pub fn panic_output() -> Option<impl io::Write> {
-    Some(PanicOutput::new())
+    Some(Stderr::new())
 }
diff --git a/library/std/src/sys/stdio/teeos.rs b/library/std/src/sys/stdio/teeos.rs
@@ -1,12 +1,16 @@
 #![deny(unsafe_op_in_unsafe_fn)]
 
+#[expect(dead_code)]
+#[path = "unsupported.rs"]
+mod unsupported_stdio;
+
 use core::arch::asm;
 
 use crate::io;
 
-pub struct Stdin;
+pub type Stdin = unsupported_stdio::Stdin;
 pub struct Stdout;
-pub struct Stderr;
+pub type Stderr = Stdout;
 
 const KCALL_DEBUG_CMD_PUT_BYTES: i64 = 2;
 
@@ -25,27 +29,6 @@ unsafe fn debug_call(cap_ref: u64, call_no: i64, arg1: u64, arg2: u64) -> i32 {
     ret as i32
 }
 
-fn print_buf(s: &[u8]) -> io::Result<usize> {
-    // Corresponds to `HM_DEBUG_PUT_BYTES_LIMIT`.
-    const MAX_LEN: usize = 512;
-    let len = if s.len() > MAX_LEN { MAX_LEN } else { s.len() };
-    let result = unsafe { debug_call(0, KCALL_DEBUG_CMD_PUT_BYTES, s.as_ptr() as u64, len as u64) };
-
-    if result == 0 { Ok(len) } else { Err(io::Error::from(io::ErrorKind::InvalidInput)) }
-}
-
-impl Stdin {
-    pub const fn new() -> Stdin {
-        Stdin
-    }
-}
-
-impl io::Read for Stdin {
-    fn read(&mut self, _buf: &mut [u8]) -> io::Result<usize> {
-        Ok(0)
-    }
-}
-
 impl Stdout {
     pub const fn new() -> Stdout {
         Stdout
@@ -54,31 +37,21 @@ impl Stdout {
 
 impl io::Write for Stdout {
     fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        print_buf(buf)
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        Ok(())
-    }
-}
+        // Corresponds to `HM_DEBUG_PUT_BYTES_LIMIT`.
+        const MAX_LEN: usize = 512;
+        let len = buf.len().min(MAX_LEN);
+        let result =
+            unsafe { debug_call(0, KCALL_DEBUG_CMD_PUT_BYTES, buf.as_ptr() as u64, len as u64) };
 
-impl Stderr {
-    pub const fn new() -> Stderr {
-        Stderr
-    }
-}
-
-impl io::Write for Stderr {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        print_buf(buf)
+        if result == 0 { Ok(len) } else { Err(io::Error::from(io::ErrorKind::InvalidInput)) }
     }
 
     fn flush(&mut self) -> io::Result<()> {
         Ok(())
     }
 }
 
-pub const STDIN_BUF_SIZE: usize = 0;
+pub const STDIN_BUF_SIZE: usize = unsupported_stdio::STDIN_BUF_SIZE;
 
 pub fn is_ebadf(err: &io::Error) -> bool {
     err.raw_os_error() == Some(libc::EBADF as i32)
diff --git a/library/std/src/sys/stdio/unix.rs b/library/std/src/sys/stdio/unix.rs
@@ -11,13 +11,13 @@ use crate::os::hermit::io::FromRawFd;
 use crate::os::unix::io::FromRawFd;
 use crate::sys::fd::FileDesc;
 
-pub struct Stdin(());
-pub struct Stdout(());
-pub struct Stderr(());
+pub struct Stdin;
+pub struct Stdout;
+pub struct Stderr;
 
 impl Stdin {
     pub const fn new() -> Stdin {
-        Stdin(())
+        Stdin
     }
 }
 
@@ -42,7 +42,7 @@ impl io::Read for Stdin {
 
 impl Stdout {
     pub const fn new() -> Stdout {
-        Stdout(())
+        Stdout
     }
 }
 
@@ -68,7 +68,7 @@ impl io::Write for Stdout {
 
 impl Stderr {
     pub const fn new() -> Stderr {
-        Stderr(())
+        Stderr
     }
 }
 
diff --git a/library/std/src/sys/stdio/unsupported.rs b/library/std/src/sys/stdio/unsupported.rs
diff --git a/library/std/src/sys/stdio/xous.rs b/library/std/src/sys/stdio/xous.rs

Original file line number	Diff line number	Diff line change
`@@ -97,39 +97,53 @@ const fn stderr_raw() -> StderrRaw {`
`97`	`97`
`98`	`98`	`impl Read for StdinRaw {`
`99`	`99`	`fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {`
`100`		`- handle_ebadf(self.0.read(buf), 0)`
	`100`	`+ handle_ebadf(self.0.read(buf), \|\| Ok(0))`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`fn read_buf(&mut self, buf: BorrowedCursor<'_>) -> io::Result<()> {`
`104`		`- handle_ebadf(self.0.read_buf(buf), ())`
	`104`	`+ handle_ebadf(self.0.read_buf(buf), \|\| Ok(()))`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`fn read_vectored(&mut self, bufs: &mut [IoSliceMut<'_>]) -> io::Result<usize> {`
`108`		`- handle_ebadf(self.0.read_vectored(bufs), 0)`
	`108`	`+ handle_ebadf(self.0.read_vectored(bufs), \|\| Ok(0))`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`#[inline]`
`112`	`112`	`fn is_read_vectored(&self) -> bool {`
`113`	`113`	`self.0.is_read_vectored()`
`114`	`114`	`}`
`115`	`115`
	`116`	`+ fn read_exact(&mut self, buf: &mut [u8]) -> io::Result<()> {`
	`117`	`+ if buf.is_empty() {`
	`118`	`+ return Ok(());`
	`119`	`+ }`
	`120`	`+ handle_ebadf(self.0.read_exact(buf), \|\| Err(io::Error::READ_EXACT_EOF))`
	`121`	`+ }`
	`122`	`+`
	`123`	`+ fn read_buf_exact(&mut self, buf: BorrowedCursor<'_>) -> io::Result<()> {`
	`124`	`+ if buf.capacity() == 0 {`
	`125`	`+ return Ok(());`
	`126`	`+ }`
	`127`	`+ handle_ebadf(self.0.read_buf_exact(buf), \|\| Err(io::Error::READ_EXACT_EOF))`
	`128`	`+ }`
	`129`	`+`
`116`	`130`	`fn read_to_end(&mut self, buf: &mut Vec<u8>) -> io::Result<usize> {`
`117`		`- handle_ebadf(self.0.read_to_end(buf), 0)`
	`131`	`+ handle_ebadf(self.0.read_to_end(buf), \|\| Ok(0))`
`118`	`132`	`}`
`119`	`133`
`120`	`134`	`fn read_to_string(&mut self, buf: &mut String) -> io::Result<usize> {`
`121`		`- handle_ebadf(self.0.read_to_string(buf), 0)`
	`135`	`+ handle_ebadf(self.0.read_to_string(buf), \|\| Ok(0))`
`122`	`136`	`}`
`123`	`137`	`}`
`124`	`138`
`125`	`139`	`impl Write for StdoutRaw {`
`126`	`140`	`fn write(&mut self, buf: &[u8]) -> io::Result<usize> {`
`127`		`- handle_ebadf(self.0.write(buf), buf.len())`
	`141`	`+ handle_ebadf(self.0.write(buf), \|\| Ok(buf.len()))`
`128`	`142`	`}`
`129`	`143`
`130`	`144`	`fn write_vectored(&mut self, bufs: &[IoSlice<'_>]) -> io::Result<usize> {`
`131`		`- let total = \|\| bufs.iter().map(\|b\| b.len()).sum();`
`132`		`- handle_ebadf_lazy(self.0.write_vectored(bufs), total)`
	`145`	`+ let total = \|\| Ok(bufs.iter().map(\|b\| b.len()).sum());`
	`146`	`+ handle_ebadf(self.0.write_vectored(bufs), total)`
`133`	`147`	`}`
`134`	`148`
`135`	`149`	`#[inline]`
`@@ -138,30 +152,30 @@ impl Write for StdoutRaw {`
`138`	`152`	`}`
`139`	`153`
`140`	`154`	`fn flush(&mut self) -> io::Result<()> {`
`141`		`- handle_ebadf(self.0.flush(), ())`
	`155`	`+ handle_ebadf(self.0.flush(), \|\| Ok(()))`
`142`	`156`	`}`
`143`	`157`
`144`	`158`	`fn write_all(&mut self, buf: &[u8]) -> io::Result<()> {`
`145`		`- handle_ebadf(self.0.write_all(buf), ())`
	`159`	`+ handle_ebadf(self.0.write_all(buf), \|\| Ok(()))`
`146`	`160`	`}`
`147`	`161`
`148`	`162`	`fn write_all_vectored(&mut self, bufs: &mut [IoSlice<'_>]) -> io::Result<()> {`
`149`		`- handle_ebadf(self.0.write_all_vectored(bufs), ())`
	`163`	`+ handle_ebadf(self.0.write_all_vectored(bufs), \|\| Ok(()))`
`150`	`164`	`}`
`151`	`165`
`152`	`166`	`fn write_fmt(&mut self, fmt: fmt::Arguments<'_>) -> io::Result<()> {`
`153`		`- handle_ebadf(self.0.write_fmt(fmt), ())`
	`167`	`+ handle_ebadf(self.0.write_fmt(fmt), \|\| Ok(()))`
`154`	`168`	`}`
`155`	`169`	`}`
`156`	`170`
`157`	`171`	`impl Write for StderrRaw {`
`158`	`172`	`fn write(&mut self, buf: &[u8]) -> io::Result<usize> {`
`159`		`- handle_ebadf(self.0.write(buf), buf.len())`
	`173`	`+ handle_ebadf(self.0.write(buf), \|\| Ok(buf.len()))`
`160`	`174`	`}`
`161`	`175`
`162`	`176`	`fn write_vectored(&mut self, bufs: &[IoSlice<'_>]) -> io::Result<usize> {`
`163`		`- let total = \|\| bufs.iter().map(\|b\| b.len()).sum();`
`164`		`- handle_ebadf_lazy(self.0.write_vectored(bufs), total)`
	`177`	`+ let total = \|\| Ok(bufs.iter().map(\|b\| b.len()).sum());`
	`178`	`+ handle_ebadf(self.0.write_vectored(bufs), total)`
`165`	`179`	`}`
`166`	`180`
`167`	`181`	`#[inline]`
`@@ -170,32 +184,25 @@ impl Write for StderrRaw {`
`170`	`184`	`}`
`171`	`185`
`172`	`186`	`fn flush(&mut self) -> io::Result<()> {`
`173`		`- handle_ebadf(self.0.flush(), ())`
	`187`	`+ handle_ebadf(self.0.flush(), \|\| Ok(()))`
`174`	`188`	`}`
`175`	`189`
`176`	`190`	`fn write_all(&mut self, buf: &[u8]) -> io::Result<()> {`
`177`		`- handle_ebadf(self.0.write_all(buf), ())`
	`191`	`+ handle_ebadf(self.0.write_all(buf), \|\| Ok(()))`
`178`	`192`	`}`
`179`	`193`
`180`	`194`	`fn write_all_vectored(&mut self, bufs: &mut [IoSlice<'_>]) -> io::Result<()> {`
`181`		`- handle_ebadf(self.0.write_all_vectored(bufs), ())`
	`195`	`+ handle_ebadf(self.0.write_all_vectored(bufs), \|\| Ok(()))`
`182`	`196`	`}`
`183`	`197`
`184`	`198`	`fn write_fmt(&mut self, fmt: fmt::Arguments<'_>) -> io::Result<()> {`
`185`		`- handle_ebadf(self.0.write_fmt(fmt), ())`
`186`		`- }`
`187`		`-}`
`188`		`-`
`189`		`-fn handle_ebadf<T>(r: io::Result<T>, default: T) -> io::Result<T> {`
`190`		`- match r {`
`191`		`- Err(ref e) if stdio::is_ebadf(e) => Ok(default),`
`192`		`- r => r,`
	`199`	`+ handle_ebadf(self.0.write_fmt(fmt), \|\| Ok(()))`
`193`	`200`	`}`
`194`	`201`	`}`
`195`	`202`
`196`		`-fn handle_ebadf_lazy<T>(r: io::Result<T>, default: impl FnOnce() -> T) -> io::Result<T> {`
	`203`	`+fn handle_ebadf<T>(r: io::Result<T>, default: impl FnOnce() -> io::Result<T>) -> io::Result<T> {`
`197`	`204`	`match r {`
`198`		`- Err(ref e) if stdio::is_ebadf(e) => Ok(default()),`
	`205`	`+ Err(ref e) if stdio::is_ebadf(e) => default(),`
`199`	`206`	`r => r,`
`200`	`207`	`}`
`201`	`208`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,9 @@ use fortanix_sgx_abi as abi;`
`3`	`3`	`use crate::io::{self, BorrowedCursor, IoSlice, IoSliceMut};`
`4`	`4`	`use crate::sys::fd::FileDesc;`
`5`	`5`
`6`		`-pub struct Stdin(());`
`7`		`-pub struct Stdout(());`
`8`		`-pub struct Stderr(());`
	`6`	`+pub struct Stdin;`
	`7`	`+pub struct Stdout;`
	`8`	`+pub struct Stderr;`
`9`	`9`
`10`	`10`	`fn with_std_fd<F: FnOnce(&FileDesc) -> R, R>(fd: abi::Fd, f: F) -> R {`
`11`	`11`	`let fd = FileDesc::new(fd);`
`@@ -16,7 +16,7 @@ fn with_std_fd<F: FnOnce(&FileDesc) -> R, R>(fd: abi::Fd, f: F) -> R {`
`16`	`16`
`17`	`17`	`impl Stdin {`
`18`	`18`	`pub const fn new() -> Stdin {`
`19`		`- Stdin(())`
	`19`	`+ Stdin`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`
`@@ -41,7 +41,7 @@ impl io::Read for Stdin {`
`41`	`41`
`42`	`42`	`impl Stdout {`
`43`	`43`	`pub const fn new() -> Stdout {`
`44`		`- Stdout(())`
	`44`	`+ Stdout`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`@@ -66,7 +66,7 @@ impl io::Write for Stdout {`
`66`	`66`
`67`	`67`	`impl Stderr {`
`68`	`68`	`pub const fn new() -> Stderr {`
`69`		`- Stderr(())`
	`69`	`+ Stderr`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`
Original file line number	Diff line number	Diff line change
`@@ -11,13 +11,13 @@ use crate::os::hermit::io::FromRawFd;`
`11`	`11`	`use crate::os::unix::io::FromRawFd;`
`12`	`12`	`use crate::sys::fd::FileDesc;`
`13`	`13`
`14`		`-pub struct Stdin(());`
`15`		`-pub struct Stdout(());`
`16`		`-pub struct Stderr(());`
	`14`	`+pub struct Stdin;`
	`15`	`+pub struct Stdout;`
	`16`	`+pub struct Stderr;`
`17`	`17`
`18`	`18`	`impl Stdin {`
`19`	`19`	`pub const fn new() -> Stdin {`
`20`		`- Stdin(())`
	`20`	`+ Stdin`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`
`@@ -42,7 +42,7 @@ impl io::Read for Stdin {`
`42`	`42`
`43`	`43`	`impl Stdout {`
`44`	`44`	`pub const fn new() -> Stdout {`
`45`		`- Stdout(())`
	`45`	`+ Stdout`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
`@@ -68,7 +68,7 @@ impl io::Write for Stdout {`
`68`	`68`
`69`	`69`	`impl Stderr {`
`70`	`70`	`pub const fn new() -> Stderr {`
`71`		`- Stderr(())`
	`71`	`+ Stderr`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`