diff options
| author | Corey Farwell <coreyf@rwell.org> | 2017-07-14 20:57:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-14 20:57:16 -0700 |
| commit | 351c476f6de31d4f5a651a74418236a97e477d20 (patch) | |
| tree | a58d9a9699870518831c196993ba5c0dd8400279 /src/libstd | |
| parent | 721f736b1b5a6b80c58dcd302c0200e831320ec9 (diff) | |
| parent | 0d617ce4c9a798697d32bf8272e9d2d04213457f (diff) | |
| download | rust-351c476f6de31d4f5a651a74418236a97e477d20.tar.gz rust-351c476f6de31d4f5a651a74418236a97e477d20.zip | |
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
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/sys/redox/net/tcp.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys/redox/net/tcp.rs b/src/libstd/sys/redox/net/tcp.rs index 5d1067e4039..98ec3aa3e29 100644 --- a/src/libstd/sys/redox/net/tcp.rs +++ b/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")) } |