about summary refs log tree commit diff
path: root/src/libstd/io
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-12-15 06:23:11 +0000
committerbors <bors@rust-lang.org>2016-12-15 06:23:11 +0000
commitcfa668f3bf8156730b419deec51fb980af23b8bb (patch)
tree00f70114d72e3d944ac12d973ad6db58e91e3770 /src/libstd/io
parent7ad7232422f7e5bbfa0e52dabe36c12677df19e2 (diff)
parent3e15dc108c66891da04aa8c3f77162746fab4277 (diff)
downloadrust-cfa668f3bf8156730b419deec51fb980af23b8bb.tar.gz
rust-cfa668f3bf8156730b419deec51fb980af23b8bb.zip
Auto merge of #37702 - redox-os:redox, r=brson
Redox Support Preview

# Important - This is only a preview of a working `sys::redox`.

Compiling the Redox default distribution with this `libstd` results in a fully functioning distribution. As such, all further changes would be cosmetic or implementing features that have not been used by the default distribution (of which there are only a small number).

I do not expect this to be merged, but would like to discuss how it may be improved and get feedback.

There are a few `unimplemented!()` - `cloexec` for example. I have documented them below. These would be resolved before desiring a merge.

There are also issues with how the Redox syscall library is called - currently I am using a re-export in `libc` but that probably would not be desired.
Diffstat (limited to 'src/libstd/io')
-rw-r--r--src/libstd/io/stdio.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/io/stdio.rs b/src/libstd/io/stdio.rs
index e8b812daed8..6419a9ff683 100644
--- a/src/libstd/io/stdio.rs
+++ b/src/libstd/io/stdio.rs
@@ -81,11 +81,11 @@ impl Read for StdinRaw {
 }
 impl Write for StdoutRaw {
     fn write(&mut self, buf: &[u8]) -> io::Result<usize> { self.0.write(buf) }
-    fn flush(&mut self) -> io::Result<()> { Ok(()) }
+    fn flush(&mut self) -> io::Result<()> { self.0.flush() }
 }
 impl Write for StderrRaw {
     fn write(&mut self, buf: &[u8]) -> io::Result<usize> { self.0.write(buf) }
-    fn flush(&mut self) -> io::Result<()> { Ok(()) }
+    fn flush(&mut self) -> io::Result<()> { self.0.flush() }
 }
 
 enum Maybe<T> {