auto merge of #8116 : toddaaro/rust/tls-tk-pr-pre, r=brson

Merged with task killing code this time around.

2 files changed, 40 insertions, 40 deletions

diff --git a/src/libstd/rt/io/net/tcp.rs b/src/libstd/rt/io/net/tcp.rs
index 1d7dafc4302..2daa64e8085 100644
--- a/src/libstd/rt/io/net/tcp.rs
+++ b/src/libstd/rt/io/net/tcp.rs
@@ -186,7 +186,7 @@ mod test {
         do run_in_newsched_task {
             let addr = next_test_ip4();
 
-            do spawntask_immediately {
+            do spawntask {
                 let mut listener = TcpListener::bind(addr);
                 let mut stream = listener.accept();
                 let mut buf = [0];
@@ -194,7 +194,7 @@ mod test {
                 assert!(buf[0] == 99);
             }
 
-            do spawntask_immediately {
+            do spawntask {
                 let mut stream = TcpStream::connect(addr);
                 stream.write([99]);
             }
@@ -206,7 +206,7 @@ mod test {
         do run_in_newsched_task {
             let addr = next_test_ip6();
 
-            do spawntask_immediately {
+            do spawntask {
                 let mut listener = TcpListener::bind(addr);
                 let mut stream = listener.accept();
                 let mut buf = [0];
@@ -214,7 +214,7 @@ mod test {
                 assert!(buf[0] == 99);
             }
 
-            do spawntask_immediately {
+            do spawntask {
                 let mut stream = TcpStream::connect(addr);
                 stream.write([99]);
             }
@@ -226,7 +226,7 @@ mod test {
         do run_in_newsched_task {
             let addr = next_test_ip4();
 
-            do spawntask_immediately {
+            do spawntask {
                 let mut listener = TcpListener::bind(addr);
                 let mut stream = listener.accept();
                 let mut buf = [0];
@@ -234,7 +234,7 @@ mod test {
                 assert!(nread.is_none());
             }
 
-            do spawntask_immediately {
+            do spawntask {
                 let _stream = TcpStream::connect(addr);
                 // Close
             }
@@ -246,7 +246,7 @@ mod test {
         do run_in_newsched_task {
             let addr = next_test_ip6();
 
-            do spawntask_immediately {
+            do spawntask {
                 let mut listener = TcpListener::bind(addr);
                 let mut stream = listener.accept();
                 let mut buf = [0];
@@ -254,7 +254,7 @@ mod test {
                 assert!(nread.is_none());
             }
 
-            do spawntask_immediately {
+            do spawntask {
                 let _stream = TcpStream::connect(addr);
                 // Close
             }
@@ -266,7 +266,7 @@ mod test {
         do run_in_newsched_task {
             let addr = next_test_ip4();
 
-            do spawntask_immediately {
+            do spawntask {
                 let mut listener = TcpListener::bind(addr);
                 let mut stream = listener.accept();
                 let mut buf = [0];
@@ -276,7 +276,7 @@ mod test {
                 assert!(nread.is_none());
             }
 
-            do spawntask_immediately {
+            do spawntask {
                 let _stream = TcpStream::connect(addr);
                 // Close
             }
@@ -288,7 +288,7 @@ mod test {
         do run_in_newsched_task {
             let addr = next_test_ip6();
 
-            do spawntask_immediately {
+            do spawntask {
                 let mut listener = TcpListener::bind(addr);
                 let mut stream = listener.accept();
                 let mut buf = [0];
@@ -298,7 +298,7 @@ mod test {
                 assert!(nread.is_none());
             }
 
-            do spawntask_immediately {
+            do spawntask {
                 let _stream = TcpStream::connect(addr);
                 // Close
             }
@@ -310,7 +310,7 @@ mod test {
         do run_in_newsched_task {
             let addr = next_test_ip4();
 
-            do spawntask_immediately {
+            do spawntask {
                 let mut listener = TcpListener::bind(addr);
                 let mut stream = listener.accept();
                 let buf = [0];
@@ -327,7 +327,7 @@ mod test {
                 }
             }
 
-            do spawntask_immediately {
+            do spawntask {
                 let _stream = TcpStream::connect(addr);
                 // Close
             }
@@ -339,7 +339,7 @@ mod test {
         do run_in_newsched_task {
             let addr = next_test_ip6();
 
-            do spawntask_immediately {
+            do spawntask {
                 let mut listener = TcpListener::bind(addr);
                 let mut stream = listener.accept();
                 let buf = [0];
@@ -356,7 +356,7 @@ mod test {
                 }
             }
 
-            do spawntask_immediately {
+            do spawntask {
                 let _stream = TcpStream::connect(addr);
                 // Close
             }
@@ -369,7 +369,7 @@ mod test {
             let addr = next_test_ip4();
             let max = 10;
 
-            do spawntask_immediately {
+            do spawntask {
                 let mut listener = TcpListener::bind(addr);
                 do max.times {
                     let mut stream = listener.accept();
@@ -379,7 +379,7 @@ mod test {
                 }
             }
 
-            do spawntask_immediately {
+            do spawntask {
                 do max.times {
                     let mut stream = TcpStream::connect(addr);
                     stream.write([99]);
@@ -394,7 +394,7 @@ mod test {
             let addr = next_test_ip6();
             let max = 10;
 
-            do spawntask_immediately {
+            do spawntask {
                 let mut listener = TcpListener::bind(addr);
                 do max.times {
                     let mut stream = listener.accept();
@@ -404,7 +404,7 @@ mod test {
                 }
             }
 
-            do spawntask_immediately {
+            do spawntask {
                 do max.times {
                     let mut stream = TcpStream::connect(addr);
                     stream.write([99]);
@@ -419,13 +419,13 @@ mod test {
             let addr = next_test_ip4();
             static MAX: int = 10;
 
-            do spawntask_immediately {
+            do spawntask {
                 let mut listener = TcpListener::bind(addr);
                 for int::range(0, MAX) |i| {
                     let stream = Cell::new(listener.accept());
                     rtdebug!("accepted");
                     // Start another task to handle the connection
-                    do spawntask_immediately {
+                    do spawntask {
                         let mut stream = stream.take();
                         let mut buf = [0];
                         stream.read(buf);
@@ -440,7 +440,7 @@ mod test {
             fn connect(i: int, addr: IpAddr) {
                 if i == MAX { return }
 
-                do spawntask_immediately {
+                do spawntask {
                     rtdebug!("connecting");
                     let mut stream = TcpStream::connect(addr);
                     // Connect again before writing
@@ -458,13 +458,13 @@ mod test {
             let addr = next_test_ip6();
             static MAX: int = 10;
 
-            do spawntask_immediately {
+            do spawntask {
                 let mut listener = TcpListener::bind(addr);
                 for int::range(0, MAX) |i| {
                     let stream = Cell::new(listener.accept());
                     rtdebug!("accepted");
                     // Start another task to handle the connection
-                    do spawntask_immediately {
+                    do spawntask {
                         let mut stream = stream.take();
                         let mut buf = [0];
                         stream.read(buf);
@@ -479,7 +479,7 @@ mod test {
             fn connect(i: int, addr: IpAddr) {
                 if i == MAX { return }
 
-                do spawntask_immediately {
+                do spawntask {
                     rtdebug!("connecting");
                     let mut stream = TcpStream::connect(addr);
                     // Connect again before writing
@@ -497,7 +497,7 @@ mod test {
             let addr = next_test_ip4();
             static MAX: int = 10;
 
-            do spawntask_immediately {
+            do spawntask {
                 let mut listener = TcpListener::bind(addr);
                 for int::range(0, MAX) |_| {
                     let stream = Cell::new(listener.accept());
@@ -535,7 +535,7 @@ mod test {
             let addr = next_test_ip6();
             static MAX: int = 10;
 
-            do spawntask_immediately {
+            do spawntask {
                 let mut listener = TcpListener::bind(addr);
                 for int::range(0, MAX) |_| {
                     let stream = Cell::new(listener.accept());
@@ -571,7 +571,7 @@ mod test {
     #[cfg(test)]
     fn socket_name(addr: IpAddr) {
         do run_in_newsched_task {
-            do spawntask_immediately {
+            do spawntask {
                 let listener = TcpListener::bind(addr);
 
                 assert!(listener.is_some());
@@ -590,13 +590,13 @@ mod test {
     #[cfg(test)]
     fn peer_name(addr: IpAddr) {
         do run_in_newsched_task {
-            do spawntask_immediately {
+            do spawntask {
                 let mut listener = TcpListener::bind(addr);
 
                 listener.accept();
             }
 
-            do spawntask_immediately {
+            do spawntask {
                 let stream = TcpStream::connect(addr);
 
                 assert!(stream.is_some());
diff --git a/src/libstd/rt/io/net/udp.rs b/src/libstd/rt/io/net/udp.rs
index d186ad15f4a..c04abfa899b 100644
--- a/src/libstd/rt/io/net/udp.rs
+++ b/src/libstd/rt/io/net/udp.rs
@@ -132,7 +132,7 @@ mod test {
             let server_ip = next_test_ip4();
             let client_ip = next_test_ip4();
 
-            do spawntask_immediately {
+            do spawntask {
                 match UdpSocket::bind(server_ip) {
                     Some(ref mut server) => {
                         let mut buf = [0];
@@ -149,7 +149,7 @@ mod test {
                 }
             }
 
-            do spawntask_immediately {
+            do spawntask {
                 match UdpSocket::bind(client_ip) {
                     Some(ref mut client) => client.sendto([99], server_ip),
                     None => fail!()
@@ -164,7 +164,7 @@ mod test {
             let server_ip = next_test_ip6();
             let client_ip = next_test_ip6();
 
-            do spawntask_immediately {
+            do spawntask {
                 match UdpSocket::bind(server_ip) {
                     Some(ref mut server) => {
                         let mut buf = [0];
@@ -181,7 +181,7 @@ mod test {
                 }
             }
 
-            do spawntask_immediately {
+            do spawntask {
                 match UdpSocket::bind(client_ip) {
                     Some(ref mut client) => client.sendto([99], server_ip),
                     None => fail!()
@@ -196,7 +196,7 @@ mod test {
             let server_ip = next_test_ip4();
             let client_ip = next_test_ip4();
 
-            do spawntask_immediately {
+            do spawntask {
                 match UdpSocket::bind(server_ip) {
                     Some(server) => {
                         let server = ~server;
@@ -214,7 +214,7 @@ mod test {
                 }
             }
 
-            do spawntask_immediately {
+            do spawntask {
                 match UdpSocket::bind(client_ip) {
                     Some(client) => {
                         let client = ~client;
@@ -233,7 +233,7 @@ mod test {
             let server_ip = next_test_ip6();
             let client_ip = next_test_ip6();
 
-            do spawntask_immediately {
+            do spawntask {
                 match UdpSocket::bind(server_ip) {
                     Some(server) => {
                         let server = ~server;
@@ -251,7 +251,7 @@ mod test {
                 }
             }
 
-            do spawntask_immediately {
+            do spawntask {
                 match UdpSocket::bind(client_ip) {
                     Some(client) => {
                         let client = ~client;
@@ -267,7 +267,7 @@ mod test {
     #[cfg(test)]
     fn socket_name(addr: IpAddr) {
         do run_in_newsched_task {
-            do spawntask_immediately {
+            do spawntask {
                 let server = UdpSocket::bind(addr);
 
                 assert!(server.is_some());