---

yaml
---
r: 127748
b: refs/heads/snap-stage3
c: 31281b4
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 49a970f2449a78f28b6c301e542d38593094ca77
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 500b600362b4e119dd1725fd99db745341459f82
+refs/heads/snap-stage3: 31281b4bd12bb4bbd52a23a29f59a3398cca1a8f
 refs/heads/try: d9c23fcbaea89871667272a67ecb8d3a512162f3
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/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;

branches/snap-stage3/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| {

branches/snap-stage3/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};