about summary refs log tree commit diff
path: root/src/libstd/sys
diff options
context:
space:
mode:
authorjD91mZM2 <me@krake.one>2018-06-14 11:17:08 +0200
committerjD91mZM2 <me@krake.one>2018-06-26 20:31:34 +0200
commit3b866b0ea44a27e8fa1f7bedabb42c92b670d467 (patch)
tree04d00a684472c28c511dee9ba69ad0a4578296cf /src/libstd/sys
parent2394549af5fafa0eb7e52ff291970be5b35af7cf (diff)
downloadrust-3b866b0ea44a27e8fa1f7bedabb42c92b670d467.tar.gz
rust-3b866b0ea44a27e8fa1f7bedabb42c92b670d467.zip
Make UnixStream::take_error return None on redox
Diffstat (limited to 'src/libstd/sys')
-rw-r--r--src/libstd/sys/redox/ext/net.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/sys/redox/ext/net.rs b/src/libstd/sys/redox/ext/net.rs
index 78ed8194088..abfbfaa8dbb 100644
--- a/src/libstd/sys/redox/ext/net.rs
+++ b/src/libstd/sys/redox/ext/net.rs
@@ -352,7 +352,7 @@ impl UnixStream {
     /// ```
     #[stable(feature = "unix_socket", since = "1.10.0")]
     pub fn take_error(&self) -> io::Result<Option<io::Error>> {
-        Err(Error::new(ErrorKind::Other, "UnixStream::take_error unimplemented on redox"))
+        Ok(None)
     }
 
     /// Shuts down the read, write, or both halves of this connection.
@@ -373,7 +373,7 @@ impl UnixStream {
     /// socket.shutdown(Shutdown::Both).expect("shutdown function failed");
     /// ```
     #[stable(feature = "unix_socket", since = "1.10.0")]
-    pub fn shutdown(&self, how: Shutdown) -> io::Result<()> {
+    pub fn shutdown(&self, _how: Shutdown) -> io::Result<()> {
         Err(Error::new(ErrorKind::Other, "UnixStream::shutdown unimplemented on redox"))
     }
 }
@@ -607,7 +607,7 @@ impl UnixListener {
     /// ```
     #[stable(feature = "unix_socket", since = "1.10.0")]
     pub fn take_error(&self) -> io::Result<Option<io::Error>> {
-        Err(Error::new(ErrorKind::Other, "UnixListener::take_error unimplemented on redox"))
+        Ok(None)
     }
 
     /// Returns an iterator over incoming connections.