---

yaml
---
r: 132733
b: refs/heads/dist-snap
c: 31281b4
h: refs/heads/master
i:
  132731: 397fcd4
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 457a3c991d79b971be07fce75f9d0c12848fb37c
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 500b600362b4e119dd1725fd99db745341459f82
+refs/heads/dist-snap: 31281b4bd12bb4bbd52a23a29f59a3398cca1a8f
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

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