From c94d4cff0314459f93e086b3ef0fd89f3f368f35 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Sat, 27 Aug 2011 23:35:16 -0700
Subject: Convert std::net to istrs. Issue #855

---
 src/lib/aio.rs |  2 +-
 src/lib/net.rs | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/lib')

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)
-- 
cgit 1.4.1-3-g733a5