about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2014-08-07 16:00:22 -0700
committerBrian Anderson <banderson@mozilla.com>2014-08-13 11:31:48 -0700
commit31281b4bd12bb4bbd52a23a29f59a3398cca1a8f (patch)
tree0b076360ae2cbc2349178b8db63efbcc605b7817 /src/libstd
parent500b600362b4e119dd1725fd99db745341459f82 (diff)
downloadrust-31281b4bd12bb4bbd52a23a29f59a3398cca1a8f.tar.gz
rust-31281b4bd12bb4bbd52a23a29f59a3398cca1a8f.zip
std: Fix build errors
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/io/net/tcp.rs2
-rw-r--r--src/libstd/io/net/unix.rs2
-rw-r--r--src/libstd/time/duration.rs2
3 files changed, 3 insertions, 3 deletions
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<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 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<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 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};