Use standard Read/Write traits in sys::stdio

pitdicker · pitdicker · commit 6464e32ea97f · 2019-02-20T19:27:03.000+01:00
diff --git a/src/libstd/sys/cloudabi/stdio.rs b/src/libstd/sys/cloudabi/stdio.rs
@@ -9,8 +9,10 @@ impl Stdin {
     pub fn new() -> io::Result<Stdin> {
         Ok(Stdin(()))
     }
+}
 
-    pub fn read(&self, _: &mut [u8]) -> io::Result<usize> {
+impl io::Read for Stdin {
+    fn read(&mut self, _buf: &mut [u8]) -> io::Result<usize> {
         Ok(0)
     }
 }
@@ -19,15 +21,17 @@ impl Stdout {
     pub fn new() -> io::Result<Stdout> {
         Ok(Stdout(()))
     }
+}
 
-    pub fn write(&self, _: &[u8]) -> io::Result<usize> {
+impl io::Write for Stdout {
+    fn write(&mut self, _buf: &[u8]) -> io::Result<usize> {
         Err(io::Error::new(
             io::ErrorKind::BrokenPipe,
             "Stdout is not connected to any output in this environment",
         ))
     }
 
-    pub fn flush(&self) -> io::Result<()> {
+    fn flush(&mut self) -> io::Result<()> {
         Ok(())
     }
 }
@@ -36,15 +40,17 @@ impl Stderr {
     pub fn new() -> io::Result<Stderr> {
         Ok(Stderr(()))
     }
+}
 
-    pub fn write(&self, _: &[u8]) -> io::Result<usize> {
+impl io::Write for Stderr {
+    fn write(&mut self, _buf: &[u8]) -> io::Result<usize> {
         Err(io::Error::new(
             io::ErrorKind::BrokenPipe,
             "Stderr is not connected to any output in this environment",
         ))
     }
 
-    pub fn flush(&self) -> io::Result<()> {
+    fn flush(&mut self) -> io::Result<()> {
         Ok(())
     }
 }
diff --git a/src/libstd/sys/redox/stdio.rs b/src/libstd/sys/redox/stdio.rs
@@ -8,41 +8,47 @@ pub struct Stderr(());
 
 impl Stdin {
     pub fn new() -> io::Result<Stdin> { Ok(Stdin(())) }
+}
 
-    pub fn read(&self, data: &mut [u8]) -> io::Result<usize> {
+impl io::Read for Stdin {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
         let fd = FileDesc::new(0);
-        let ret = fd.read(data);
+        let ret = fd.read(buf);
         fd.into_raw();
         ret
     }
 }
 
 impl Stdout {
     pub fn new() -> io::Result<Stdout> { Ok(Stdout(())) }
+}
 
-    pub fn write(&self, data: &[u8]) -> io::Result<usize> {
+impl io::Write for Stdout {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
         let fd = FileDesc::new(1);
-        let ret = fd.write(data);
+        let ret = fd.write(buf);
         fd.into_raw();
         ret
     }
 
-    pub fn flush(&self) -> io::Result<()> {
+    fn flush(&mut self) -> io::Result<()> {
         cvt(syscall::fsync(1)).and(Ok(()))
     }
 }
 
 impl Stderr {
     pub fn new() -> io::Result<Stderr> { Ok(Stderr(())) }
+}
 
-    pub fn write(&self, data: &[u8]) -> io::Result<usize> {
+impl io::Write for Stderr {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
         let fd = FileDesc::new(2);
-        let ret = fd.write(data);
+        let ret = fd.write(buf);
         fd.into_raw();
         ret
     }
 
-    pub fn flush(&self) -> io::Result<()> {
+    fn flush(&mut self) -> io::Result<()> {
         cvt(syscall::fsync(2)).and(Ok(()))
     }
 }
diff --git a/src/libstd/sys/sgx/stdio.rs b/src/libstd/sys/sgx/stdio.rs
@@ -16,32 +16,38 @@ fn with_std_fd<F: FnOnce(&FileDesc) -> R, R>(fd: abi::Fd, f: F) -> R {
 
 impl Stdin {
     pub fn new() -> io::Result<Stdin> { Ok(Stdin(())) }
+}
 
-    pub fn read(&self, data: &mut [u8]) -> io::Result<usize> {
-        with_std_fd(abi::FD_STDIN, |fd| fd.read(data))
+impl io::Read for Stdin {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        with_std_fd(abi::FD_STDIN, |fd| fd.read(buf))
     }
 }
 
 impl Stdout {
     pub fn new() -> io::Result<Stdout> { Ok(Stdout(())) }
+}
 
-    pub fn write(&self, data: &[u8]) -> io::Result<usize> {
-        with_std_fd(abi::FD_STDOUT, |fd| fd.write(data))
+impl io::Write for Stdout {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        with_std_fd(abi::FD_STDOUT, |fd| fd.write(buf))
     }
 
-    pub fn flush(&self) -> io::Result<()> {
+    fn flush(&mut self) -> io::Result<()> {
         with_std_fd(abi::FD_STDOUT, |fd| fd.flush())
     }
 }
 
 impl Stderr {
     pub fn new() -> io::Result<Stderr> { Ok(Stderr(())) }
+}
 
-    pub fn write(&self, data: &[u8]) -> io::Result<usize> {
-        with_std_fd(abi::FD_STDERR, |fd| fd.write(data))
+impl io::Write for Stderr {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        with_std_fd(abi::FD_STDERR, |fd| fd.write(buf))
     }
 
-    pub fn flush(&self) -> io::Result<()> {
+    fn flush(&mut self) -> io::Result<()> {
         with_std_fd(abi::FD_STDERR, |fd| fd.flush())
     }
 }
diff --git a/src/libstd/sys/unix/stdio.rs b/src/libstd/sys/unix/stdio.rs
@@ -8,41 +8,47 @@ pub struct Stderr(());
 
 impl Stdin {
     pub fn new() -> io::Result<Stdin> { Ok(Stdin(())) }
+}
 
-    pub fn read(&self, data: &mut [u8]) -> io::Result<usize> {
+impl io::Read for Stdin {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
         let fd = FileDesc::new(libc::STDIN_FILENO);
-        let ret = fd.read(data);
+        let ret = fd.read(buf);
         fd.into_raw(); // do not close this FD
         ret
     }
 }
 
 impl Stdout {
     pub fn new() -> io::Result<Stdout> { Ok(Stdout(())) }
+}
 
-    pub fn write(&self, data: &[u8]) -> io::Result<usize> {
+impl io::Write for Stdout {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
         let fd = FileDesc::new(libc::STDOUT_FILENO);
-        let ret = fd.write(data);
+        let ret = fd.write(buf);
         fd.into_raw(); // do not close this FD
         ret
     }
 
-    pub fn flush(&self) -> io::Result<()> {
+    fn flush(&mut self) -> io::Result<()> {
         Ok(())
     }
 }
 
 impl Stderr {
     pub fn new() -> io::Result<Stderr> { Ok(Stderr(())) }
+}
 
-    pub fn write(&self, data: &[u8]) -> io::Result<usize> {
+impl io::Write for Stderr {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
         let fd = FileDesc::new(libc::STDERR_FILENO);
-        let ret = fd.write(data);
+        let ret = fd.write(buf);
         fd.into_raw(); // do not close this FD
         ret
     }
 
-    pub fn flush(&self) -> io::Result<()> {
+    fn flush(&mut self) -> io::Result<()> {
         Ok(())
     }
 }
diff --git a/src/libstd/sys/wasm/stdio.rs b/src/libstd/sys/wasm/stdio.rs
@@ -9,23 +9,27 @@ impl Stdin {
     pub fn new() -> io::Result<Stdin> {
         Ok(Stdin)
     }
+}
 
-    pub fn read(&self, data: &mut [u8]) -> io::Result<usize> {
-        Ok(ReadSysCall::perform(0, data))
+impl io::Read for Stdin {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        Ok(ReadSysCall::perform(0, buf))
     }
 }
 
 impl Stdout {
     pub fn new() -> io::Result<Stdout> {
         Ok(Stdout)
     }
+}
 
-    pub fn write(&self, data: &[u8]) -> io::Result<usize> {
-        WriteSysCall::perform(1, data);
-        Ok(data.len())
+impl io::Write for Stdout {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        WriteSysCall::perform(1, buf);
+        Ok(buf.len())
     }
 
-    pub fn flush(&self) -> io::Result<()> {
+    fn flush(&mut self) -> io::Result<()> {
         Ok(())
     }
 }
@@ -34,13 +38,15 @@ impl Stderr {
     pub fn new() -> io::Result<Stderr> {
         Ok(Stderr)
     }
+}
 
-    pub fn write(&self, data: &[u8]) -> io::Result<usize> {
-        WriteSysCall::perform(2, data);
-        Ok(data.len())
+impl io::Write for Stderr {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        WriteSysCall::perform(2, buf);
+        Ok(buf.len())
     }
 
-    pub fn flush(&self) -> io::Result<()> {
+    fn flush(&mut self) -> io::Result<()> {
         Ok(())
     }
 }
diff --git a/src/libstd/sys/windows/stdio.rs b/src/libstd/sys/windows/stdio.rs

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,10 @@ impl Stdin {`
`9`	`9`	`pub fn new() -> io::Result<Stdin> {`
`10`	`10`	`Ok(Stdin(()))`
`11`	`11`	`}`
	`12`	`+}`
`12`	`13`
`13`		`- pub fn read(&self, _: &mut [u8]) -> io::Result<usize> {`
	`14`	`+impl io::Read for Stdin {`
	`15`	`+ fn read(&mut self, _buf: &mut [u8]) -> io::Result<usize> {`
`14`	`16`	`Ok(0)`
`15`	`17`	`}`
`16`	`18`	`}`
`@@ -19,15 +21,17 @@ impl Stdout {`
`19`	`21`	`pub fn new() -> io::Result<Stdout> {`
`20`	`22`	`Ok(Stdout(()))`
`21`	`23`	`}`
	`24`	`+}`
`22`	`25`
`23`		`- pub fn write(&self, _: &[u8]) -> io::Result<usize> {`
	`26`	`+impl io::Write for Stdout {`
	`27`	`+ fn write(&mut self, _buf: &[u8]) -> io::Result<usize> {`
`24`	`28`	`Err(io::Error::new(`
`25`	`29`	`io::ErrorKind::BrokenPipe,`
`26`	`30`	`"Stdout is not connected to any output in this environment",`
`27`	`31`	`))`
`28`	`32`	`}`
`29`	`33`
`30`		`- pub fn flush(&self) -> io::Result<()> {`
	`34`	`+ fn flush(&mut self) -> io::Result<()> {`
`31`	`35`	`Ok(())`
`32`	`36`	`}`
`33`	`37`	`}`
`@@ -36,15 +40,17 @@ impl Stderr {`
`36`	`40`	`pub fn new() -> io::Result<Stderr> {`
`37`	`41`	`Ok(Stderr(()))`
`38`	`42`	`}`
	`43`	`+}`
`39`	`44`
`40`		`- pub fn write(&self, _: &[u8]) -> io::Result<usize> {`
	`45`	`+impl io::Write for Stderr {`
	`46`	`+ fn write(&mut self, _buf: &[u8]) -> io::Result<usize> {`
`41`	`47`	`Err(io::Error::new(`
`42`	`48`	`io::ErrorKind::BrokenPipe,`
`43`	`49`	`"Stderr is not connected to any output in this environment",`
`44`	`50`	`))`
`45`	`51`	`}`
`46`	`52`
`47`		`- pub fn flush(&self) -> io::Result<()> {`
	`53`	`+ fn flush(&mut self) -> io::Result<()> {`
`48`	`54`	`Ok(())`
`49`	`55`	`}`
`50`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,32 +16,38 @@ fn with_std_fd<F: FnOnce(&FileDesc) -> R, R>(fd: abi::Fd, f: F) -> R {`
`16`	`16`
`17`	`17`	`impl Stdin {`
`18`	`18`	`pub fn new() -> io::Result<Stdin> { Ok(Stdin(())) }`
	`19`	`+}`
`19`	`20`
`20`		`- pub fn read(&self, data: &mut [u8]) -> io::Result<usize> {`
`21`		`- with_std_fd(abi::FD_STDIN, \|fd\| fd.read(data))`
	`21`	`+impl io::Read for Stdin {`
	`22`	`+ fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {`
	`23`	`+ with_std_fd(abi::FD_STDIN, \|fd\| fd.read(buf))`
`22`	`24`	`}`
`23`	`25`	`}`
`24`	`26`
`25`	`27`	`impl Stdout {`
`26`	`28`	`pub fn new() -> io::Result<Stdout> { Ok(Stdout(())) }`
	`29`	`+}`
`27`	`30`
`28`		`- pub fn write(&self, data: &[u8]) -> io::Result<usize> {`
`29`		`- with_std_fd(abi::FD_STDOUT, \|fd\| fd.write(data))`
	`31`	`+impl io::Write for Stdout {`
	`32`	`+ fn write(&mut self, buf: &[u8]) -> io::Result<usize> {`
	`33`	`+ with_std_fd(abi::FD_STDOUT, \|fd\| fd.write(buf))`
`30`	`34`	`}`
`31`	`35`
`32`		`- pub fn flush(&self) -> io::Result<()> {`
	`36`	`+ fn flush(&mut self) -> io::Result<()> {`
`33`	`37`	`with_std_fd(abi::FD_STDOUT, \|fd\| fd.flush())`
`34`	`38`	`}`
`35`	`39`	`}`
`36`	`40`
`37`	`41`	`impl Stderr {`
`38`	`42`	`pub fn new() -> io::Result<Stderr> { Ok(Stderr(())) }`
	`43`	`+}`
`39`	`44`
`40`		`- pub fn write(&self, data: &[u8]) -> io::Result<usize> {`
`41`		`- with_std_fd(abi::FD_STDERR, \|fd\| fd.write(data))`
	`45`	`+impl io::Write for Stderr {`
	`46`	`+ fn write(&mut self, buf: &[u8]) -> io::Result<usize> {`
	`47`	`+ with_std_fd(abi::FD_STDERR, \|fd\| fd.write(buf))`
`42`	`48`	`}`
`43`	`49`
`44`		`- pub fn flush(&self) -> io::Result<()> {`
	`50`	`+ fn flush(&mut self) -> io::Result<()> {`
`45`	`51`	`with_std_fd(abi::FD_STDERR, \|fd\| fd.flush())`
`46`	`52`	`}`
`47`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,23 +9,27 @@ impl Stdin {`
`9`	`9`	`pub fn new() -> io::Result<Stdin> {`
`10`	`10`	`Ok(Stdin)`
`11`	`11`	`}`
	`12`	`+}`
`12`	`13`
`13`		`- pub fn read(&self, data: &mut [u8]) -> io::Result<usize> {`
`14`		`- Ok(ReadSysCall::perform(0, data))`
	`14`	`+impl io::Read for Stdin {`
	`15`	`+ fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {`
	`16`	`+ Ok(ReadSysCall::perform(0, buf))`
`15`	`17`	`}`
`16`	`18`	`}`
`17`	`19`
`18`	`20`	`impl Stdout {`
`19`	`21`	`pub fn new() -> io::Result<Stdout> {`
`20`	`22`	`Ok(Stdout)`
`21`	`23`	`}`
	`24`	`+}`
`22`	`25`
`23`		`- pub fn write(&self, data: &[u8]) -> io::Result<usize> {`
`24`		`- WriteSysCall::perform(1, data);`
`25`		`- Ok(data.len())`
	`26`	`+impl io::Write for Stdout {`
	`27`	`+ fn write(&mut self, buf: &[u8]) -> io::Result<usize> {`
	`28`	`+ WriteSysCall::perform(1, buf);`
	`29`	`+ Ok(buf.len())`
`26`	`30`	`}`
`27`	`31`
`28`		`- pub fn flush(&self) -> io::Result<()> {`
	`32`	`+ fn flush(&mut self) -> io::Result<()> {`
`29`	`33`	`Ok(())`
`30`	`34`	`}`
`31`	`35`	`}`
`@@ -34,13 +38,15 @@ impl Stderr {`
`34`	`38`	`pub fn new() -> io::Result<Stderr> {`
`35`	`39`	`Ok(Stderr)`
`36`	`40`	`}`
	`41`	`+}`
`37`	`42`
`38`		`- pub fn write(&self, data: &[u8]) -> io::Result<usize> {`
`39`		`- WriteSysCall::perform(2, data);`
`40`		`- Ok(data.len())`
	`43`	`+impl io::Write for Stderr {`
	`44`	`+ fn write(&mut self, buf: &[u8]) -> io::Result<usize> {`
	`45`	`+ WriteSysCall::perform(2, buf);`
	`46`	`+ Ok(buf.len())`
`41`	`47`	`}`
`42`	`48`
`43`		`- pub fn flush(&self) -> io::Result<()> {`
	`49`	`+ fn flush(&mut self) -> io::Result<()> {`
`44`	`50`	`Ok(())`
`45`	`51`	`}`
`46`	`52`	`}`