std: pushing existing code in net.rs -> net_ip.rs and re-import/exporting

3 files changed, 80 insertions, 47 deletions

diff --git a/src/libstd/net.rs b/src/libstd/net.rs
index 07bb87d6a06..9d56bef657d 100644
--- a/src/libstd/net.rs
+++ b/src/libstd/net.rs
@@ -1,49 +1,7 @@
-import vec;
-import uint;
+#[doc="
+Top-level module for network-related functionality
+"];
 
-#[doc = "An IP address"]
-enum ip_addr {
-    /*
-    Variant: ipv4
 
-    An IPv4 address
-    */
-    ipv4(u8, u8, u8, u8),
-}
-
-#[doc = "Convert an `ip_addr` to a str"]
-fn format_addr(ip: ip_addr) -> str {
-    alt ip {
-      ipv4(a, b, c, d) {
-        #fmt["%u.%u.%u.%u", a as uint, b as uint, c as uint, d as uint]
-      }
-    }
-}
-
-#[doc = "
-Convert a str to `ip_addr`
-
-Converts a string of the format `x.x.x.x` into an ip_addr enum.
-
-Fails if the string is not a valid IPv4 address
-"]
-fn parse_addr(ip: str) -> ip_addr {
-    let parts = vec::map(str::split_char(ip, '.'), {|s|
-        alt uint::from_str(s) {
-          some(n) if n <= 255u { n }
-          _ { fail "Invalid IP Address part." }
-        }
-    });
-    if vec::len(parts) != 4u { fail "Too many dots in IP address"; }
-    ipv4(parts[0] as u8, parts[1] as u8, parts[2] as u8, parts[3] as u8)
-}
-
-#[test]
-fn test_format_ip() {
-    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));
-}
+import ip = net_ip;
+export ip; 
diff --git a/src/libstd/net_ip.rs b/src/libstd/net_ip.rs
new file mode 100644
index 00000000000..ed8fc622b94
--- /dev/null
+++ b/src/libstd/net_ip.rs
@@ -0,0 +1,74 @@
+#[doc="
+Types/fns concerning Internet Protocol (IP), versions 4 & 6
+"];
+
+import vec;
+import uint;
+
+export ip_addr;
+export v4;
+//format_addr, parse_addr;
+
+#[doc = "An IP address"]
+enum ip_addr {
+    #[doc="An IPv4 address"]
+    ipv4(u8, u8, u8, u8),
+}
+
+#[doc="
+Convert a `ip_addr` to a str
+
+# Arguments
+
+* ip - a `std::net::ip::ip_addr`
+"]
+fn format_addr(ip: ip_addr) -> str {
+    alt ip {
+      ipv4(a, b, c, d) {
+        #fmt["%u.%u.%u.%u", a as uint, b as uint, c as uint, d as uint]
+      }
+    }
+}
+
+mod v4 {
+    #[doc = "
+    Convert a str to `ip_addr`
+
+    # Failure
+
+j    Fails if the string is not a valid IPv4 address
+
+    # Arguments
+
+    * ip - a string of the format `x.x.x.x`
+
+    # Returns
+
+    * an `ip_addr` of the `ipv4` variant
+    "]
+    fn parse_addr(ip: str) -> ip_addr {
+        let parts = vec::map(str::split_char(ip, '.'), {|s|
+            alt uint::from_str(s) {
+              some(n) if n <= 255u { n }
+              _ { fail "Invalid IP Address part." }
+            }
+        });
+        if vec::len(parts) != 4u { fail "Too many dots in IP address"; }
+        ipv4(parts[0] as u8, parts[1] as u8, parts[2] as u8, parts[3] as u8)
+    }
+}
+
+#[cfg(test)]
+mod test {
+    #[test]
+    fn test_format_ip() {
+        assert (format_addr(ipv4(127u8, 0u8, 0u8, 1u8))
+                == "127.0.0.1")
+    }
+
+    #[test]
+    fn test_parse_ip() {
+        assert (v4::parse_addr("127.0.0.1") ==
+                ipv4(127u8, 0u8, 0u8, 1u8));
+    }
+}
\ No newline at end of file
diff --git a/src/libstd/std.rc b/src/libstd/std.rc
index 99011c5d649..7e2d3b86a41 100644
--- a/src/libstd/std.rc
+++ b/src/libstd/std.rc
@@ -23,6 +23,7 @@ export test, tempfile, serialization;
 // General io and system-services modules
 
 mod net;
+mod net_ip;
 mod net_tcp;
 
 // libuv modules