diff --git a/src/libstd/io/net/tcp.rs b/src/libstd/io/net/tcp.rs index 6d03d4a8eed..5c91c48c55d 100644 --- a/src/libstd/io/net/tcp.rs +++ b/src/libstd/io/net/tcp.rs @@ -109,7 +109,7 @@ impl TcpStream { pub fn connect_timeout(addr: SocketAddr, timeout: Duration) -> IoResult { if timeout <= Duration::milliseconds(0) { - return standard_error(TimedOut); + return Err(standard_error(TimedOut)); } let SocketAddr { ip, port } = addr; diff --git a/src/libstd/io/net/unix.rs b/src/libstd/io/net/unix.rs index 99e4822afeb..d88af8dd30a 100644 --- a/src/libstd/io/net/unix.rs +++ b/src/libstd/io/net/unix.rs @@ -75,7 +75,7 @@ impl UnixStream { pub fn connect_timeout(path: &P, timeout: Duration) -> IoResult { if timeout <= Duration::milliseconds(0) { - return standard_error(TimedOut); + return Err(standard_error(TimedOut)); } LocalIo::maybe_raise(|io| { diff --git a/src/libstd/time/duration.rs b/src/libstd/time/duration.rs index 30e5ea44385..c8c319f4121 100644 --- a/src/libstd/time/duration.rs +++ b/src/libstd/time/duration.rs @@ -16,7 +16,7 @@ use {fmt, i32}; use ops::{Add, Sub, Mul, Div, Neg}; use option::{Option, Some, None}; use num; -use num::{CheckedAdd, CheckedMul, ToPrimitive}; +use num::{CheckedAdd, CheckedMul}; use result::{Result, Ok, Err};