Convert std::net to istrs. Issue #855

7 files changed, 21 insertions, 17 deletions

diff --git a/src/lib/aio.rs b/src/lib/aio.rs
index 92738d01f92..791480a7a86 100644
--- a/src/lib/aio.rs
+++ b/src/lib/aio.rs
@@ -45,7 +45,7 @@ tag request {
 type ctx = chan<request>;
 
 fn ip_to_sbuf(ip: net::ip_addr) -> *u8 {
-    vec::unsafe::to_ptr(str::bytes(net::format_addr(ip)))
+    vec::to_ptr(istr::bytes(net::format_addr(ip)))
 }
 
 fn connect_task(ip: net::ip_addr, portnum: int, evt: chan<socket_event>) {
diff --git a/src/lib/net.rs b/src/lib/net.rs
index dde47906f2b..425ae9741f3 100644
--- a/src/lib/net.rs
+++ b/src/lib/net.rs
@@ -4,19 +4,20 @@ import uint;
 
 tag ip_addr { ipv4(u8, u8, u8, u8); }
 
-fn format_addr(ip: ip_addr) -> str {
+fn format_addr(ip: ip_addr) -> istr {
     alt ip {
       ipv4(a, b, c, d) {
-        #fmt["%u.%u.%u.%u", a as uint, b as uint, c as uint, d as uint]
+        istr::from_estr(
+            #fmt["%u.%u.%u.%u", a as uint, b as uint, c as uint, d as uint])
       }
       _ { fail "Unsupported address type"; }
     }
 }
 
-fn parse_addr(ip: str) -> ip_addr {
+fn parse_addr(ip: &istr) -> ip_addr {
     let parts = vec::map(
-        { |&s| uint::from_str(istr::from_estr(s)) },
-        str::split(ip, "."[0]));
+        { |&s| uint::from_str(s) },
+        istr::split(ip, ~"."[0]));
     if vec::len(parts) != 4u { fail "Too many dots in IP address"; }
     for i in parts { if i > 255u { fail "Invalid IP Address part."; } }
     ipv4(parts[0] as u8, parts[1] as u8, parts[2] as u8, parts[3] as u8)
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));
 }