Rollup merge of #43202 - jackpot51:patch-1, r=sfackler

Fix sys::redox::net::tcp

A change to the upper level API needed to be filtered down

Author: frewsxcv

src/libstd/sys/redox/net/tcp.rs

@@ -32,7 +32,7 @@ impl TcpStream {
         Ok(TcpStream(File::open(&Path::new(path.as_str()), &options)?))
     }
 
-    pub fn connect_timeout(_addr: &SocketAddr, _timeout: Duration) -> Result<()> {
+    pub fn connect_timeout(_addr: &SocketAddr, _timeout: Duration) -> Result<TcpStream> {
         Err(Error::new(ErrorKind::Other, "TcpStream::connect_timeout not implemented"))
     }