---

yaml
---
r: 4713
b: refs/heads/master
c: 88a4702
h: refs/heads/master
i:
  4711: 5faf180
v: v3

Author: Eric Holk

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf2def46c120d8d6ef8a98571a39bef478c8c2a9
+refs/heads/master: 88a47020cf13e0884a83343c1b7cb3c0312f48a0

trunk/src/lib/aio.rs

@@ -130,7 +130,6 @@ fn request_task(c: _chan[ctx]) {
     let req: request;
     while (true) {
         req = p.recv();
-        log_err req;
         alt req {
           quit. {
             log "got quit message";

trunk/src/test/run-pass/sio-read.rs

@@ -1,13 +1,13 @@
 // xfail-stage1
 // xfail-stage2
 // xfail-stage3
-
 use std;
 import std::sio;
 import std::task;
 import std::str;
+import std::net;
 
-fn connectTask(cx: sio::ctx, ip: str, portnum: int) {
+fn connectTask(cx: sio::ctx, ip: net::ip_addr, portnum: int) {
   let client: sio::client;
   client = sio::connect_to(cx, ip, portnum);
   let data = sio::read(client);
@@ -16,11 +16,14 @@ fn connectTask(cx: sio::ctx, ip: str, portnum: int) {
 
 fn main() {
   let cx: sio::ctx = sio::new();
-  let srv: sio::server = sio::create_server(cx, "0.0.0.0", 9090);
-  let child: task = spawn connectTask(cx, "127.0.0.1", 9090);
+  let srv: sio::server = sio::create_server(cx,
+                                            net::parse_addr("0.0.0.0"), 9090);
+  let child = task::_spawn(bind connectTask(cx,
+                                            net::parse_addr("127.0.0.1"),
+                                            9090));
   let client: sio::client = sio::accept_from(srv);
   sio::write_data(client, str::bytes("hello, world\n"));
-  task::join(child);
+  task::join_id(child);
   sio::close_client(client);
   sio::close_server(srv);
   sio::destroy(cx);

trunk/src/test/run-pass/sio-srv.rs

@@ -1,13 +1,14 @@
-xfail-stage1
-xfail-stage2
-xfail-stage3
-
+// xfail-stage1
+// xfail-stage2
+// xfail-stage3
 use std;
 import std::sio;
+import std::net;
 
 fn main() {
   let cx: sio::ctx = sio::new();
-  let srv: sio::server = sio::create_server(cx, "127.0.0.1", 9090);
+  let srv: sio::server = sio::create_server(cx, net::parse_addr("127.0.0.1"),
+                                            9090);
   sio::close_server(srv);
   sio::destroy(cx);
 }

trunk/src/test/run-pass/sio-write.rs

@@ -1,25 +1,27 @@
 // xfail-stage1
 // xfail-stage2
 // xfail-stage3
-
 use std;
 import std::sio;
 import std::task;
 import std::str;
+import std::net;
 
-fn connectTask(cx: sio::ctx, ip: str, portnum: int) {
+fn connectTask(cx: sio::ctx, ip: net::ip_addr, portnum: int) {
   let client: sio::client;
   client = sio::connect_to(cx, ip, portnum);
   sio::close_client(client);
 }
 
 fn main() {
   let cx: sio::ctx = sio::new();
-  let srv: sio::server = sio::create_server(cx, "0.0.0.0", 9090);
-  let child: task = spawn connectTask(cx, "127.0.0.1", 9090);
+  let srv: sio::server = sio::create_server(cx, net::parse_addr("0.0.0.0"),
+                                            9090);
+  let child = task::_spawn(bind connectTask(cx, net::parse_addr("127.0.0.1"),
+                                            9090));
   let client: sio::client = sio::accept_from(srv);
   sio::write_data(client, str::bytes("hello, world\n"));
-  task::join(child);
+  task::join_id(child);
   sio::close_client(client);
   sio::close_server(srv);
   sio::destroy(cx);