---

yaml
---
r: 127820
b: refs/heads/master
c: 075256a
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 02e39b05c6d3b9f553076af7273233e161bb76a3
+refs/heads/master: 075256a0701e23ce56e9c09206d6c8f581c46115
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: aa98b25c4f0c10729dff37c699904ad57b8fbda8
 refs/heads/try: d9c23fcbaea89871667272a67ecb8d3a512162f3

trunk/src/test/run-pass/tcp-connect-timeouts.rs

@@ -99,11 +99,11 @@ iotest!(fn timeout_error() {
 
     iotest!(fn connect_timeout_zero() {
         let addr = next_test_ip4();
-        assert!(TcpStream::connect_timeout(&addr, Duration::milliseconds(0)).is_err());
+        assert!(TcpStream::connect_timeout(addr, Duration::milliseconds(0)).is_err());
     })
 
     iotest!(fn connect_timeout_negative() {
         let addr = next_test_ip4();
-        assert!(TcpStream::connect_timeout(&addr, Duration::milliseconds(-1)).is_err());
+        assert!(TcpStream::connect_timeout(addr, Duration::milliseconds(-1)).is_err());
     })
 

trunk/src/test/run-pass/tcp-stress.rs

@@ -23,6 +23,7 @@ extern crate debug;
 use std::io::net::tcp::{TcpListener, TcpStream};
 use std::io::{Acceptor, Listener};
 use std::task::TaskBuilder;
+use std::time::Duration;
 
 #[start]
 fn start(argc: int, argv: *const *const u8) -> int {
@@ -33,7 +34,7 @@ fn main() {
     // This test has a chance to time out, try to not let it time out
     spawn(proc() {
         use std::io::timer;
-        timer::sleep(30 * 1000);
+        timer::sleep(Duration::milliseconds(30 * 1000));
         println!("timed out!");
         unsafe { libc::exit(1) }
     });