diff options
| author | Brian Anderson <banderson@mozilla.com> | 2011-08-27 23:35:16 -0700 |
|---|---|---|
| committer | Brian Anderson <andersrb@gmail.com> | 2011-08-30 21:08:07 -0700 |
| commit | c94d4cff0314459f93e086b3ef0fd89f3f368f35 (patch) | |
| tree | 234096ef1b7aa1c89d426083db16d3e7630691fe /src/test | |
| parent | 0abec867c346a73e72410cbe9360eb16c2fbdd22 (diff) | |
| download | rust-c94d4cff0314459f93e086b3ef0fd89f3f368f35.tar.gz rust-c94d4cff0314459f93e086b3ef0fd89f3f368f35.zip | |
Convert std::net to istrs. Issue #855
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/run-pass/sio-client.rs | 6 | ||||
| -rw-r--r-- | src/test/run-pass/sio-read.rs | 6 | ||||
| -rw-r--r-- | src/test/run-pass/sio-srv.rs | 3 | ||||
| -rw-r--r-- | src/test/run-pass/sio-write.rs | 4 | ||||
| -rw-r--r-- | src/test/stdtest/net.rs | 6 |
5 files changed, 14 insertions, 11 deletions
diff --git a/src/test/run-pass/sio-client.rs b/src/test/run-pass/sio-client.rs index a5667ff0616..f2039013fd0 100644 --- a/src/test/run-pass/sio-client.rs +++ b/src/test/run-pass/sio-client.rs @@ -14,10 +14,10 @@ fn connectTask(cx: sio::ctx, ip: net::ip_addr, portnum: int) { fn main() { let cx: sio::ctx = sio::new(); - let srv: sio::server = sio::create_server(cx, - net::parse_addr("0.0.0.0"), 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"), + net::parse_addr(~"127.0.0.1"), 9090)); let client: sio::client = sio::accept_from(srv); task::join_id(child); diff --git a/src/test/run-pass/sio-read.rs b/src/test/run-pass/sio-read.rs index 01978590d31..688aec7a40f 100644 --- a/src/test/run-pass/sio-read.rs +++ b/src/test/run-pass/sio-read.rs @@ -16,10 +16,10 @@ fn connectTask(cx: sio::ctx, ip: net::ip_addr, portnum: int) { fn main() { let cx: sio::ctx = sio::new(); - let srv: sio::server = sio::create_server(cx, - net::parse_addr("0.0.0.0"), 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"), + 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")); diff --git a/src/test/run-pass/sio-srv.rs b/src/test/run-pass/sio-srv.rs index 815b769f4e6..a6ff53598ca 100644 --- a/src/test/run-pass/sio-srv.rs +++ b/src/test/run-pass/sio-srv.rs @@ -7,7 +7,8 @@ import std::net; fn main() { let cx: sio::ctx = sio::new(); - let srv: sio::server = sio::create_server(cx, net::parse_addr("127.0.0.1"), + let srv: sio::server = sio::create_server(cx, + net::parse_addr(~"127.0.0.1"), 9090); sio::close_server(srv); sio::destroy(cx); diff --git a/src/test/run-pass/sio-write.rs b/src/test/run-pass/sio-write.rs index 4274d54d869..bdce70b97a1 100644 --- a/src/test/run-pass/sio-write.rs +++ b/src/test/run-pass/sio-write.rs @@ -15,9 +15,9 @@ fn connectTask(cx: sio::ctx, ip: net::ip_addr, portnum: int) { fn main() { let cx: sio::ctx = sio::new(); - let srv: sio::server = sio::create_server(cx, net::parse_addr("0.0.0.0"), + 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"), + 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")); diff --git a/src/test/stdtest/net.rs b/src/test/stdtest/net.rs index 9da7a12a060..d2f185a4fde 100644 --- a/src/test/stdtest/net.rs +++ b/src/test/stdtest/net.rs @@ -3,10 +3,12 @@ import std::net; #[test] fn test_format_ip() { - assert (net::format_addr(net::ipv4(127u8, 0u8, 0u8, 1u8)) == "127.0.0.1") + assert (net::format_addr(net::ipv4( + 127u8, 0u8, 0u8, 1u8)) == ~"127.0.0.1") } #[test] fn test_parse_ip() { - assert (net::parse_addr("127.0.0.1") == net::ipv4(127u8, 0u8, 0u8, 1u8)); + assert (net::parse_addr(~"127.0.0.1") + == net::ipv4(127u8, 0u8, 0u8, 1u8)); } |