std: Fix build errors

diff --git a/src/libstd/io/net/tcp.rs b/src/libstd/io/net/tcp.rs
index 6d03d4a8eed6dba4a6da425f8fa0f6e085aa11d0..5c91c48c55d5bf6123a62890a38f0c9f40dd01fe 100644 (file)
--- a/src/libstd/io/net/tcp.rs
+++ b/src/libstd/io/net/tcp.rs
@@ -109,7 +109,7 @@ pub fn connect(host: &str, port: u16) -> IoResult<TcpStream> {
     pub fn connect_timeout(addr: SocketAddr,
                            timeout: Duration) -> IoResult<TcpStream> {
         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 99e4822afeb9e7d776f8f7105912b2cd2b99b1a8..d88af8dd30aa36ae4e0df1e75a820a923d87ed89 100644 (file)
--- a/src/libstd/io/net/unix.rs
+++ b/src/libstd/io/net/unix.rs
@@ -75,7 +75,7 @@ pub fn connect<P: ToCStr>(path: &P) -> IoResult<UnixStream> {
     pub fn connect_timeout<P: ToCStr>(path: &P,
                                       timeout: Duration) -> IoResult<UnixStream> {
         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 30e5ea44385d7c5c13a182ba6883fc2649e5db3b..c8c319f4121b5d68ebd8313f9ba11ccf1f7aa2bd 100644 (file)
--- a/src/libstd/time/duration.rs
+++ b/src/libstd/time/duration.rs
@@ -16,7 +16,7 @@
 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};