---

olsonjeffery · brson · commit 5c55f6e534f9 · 2012-05-22T22:29:16.000-07:00
yaml --- r: 12973 b: refs/heads/master c: f2fd3bc h: refs/heads/master i: 12971: e30820d v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 64048d43d6d71d022b8324b36b5132df4099e2ae
+refs/heads/master: f2fd3bcf1740dfb1c8802ef0586b1c38ab171caa
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
diff --git a/trunk/src/libstd/net_ip.rs b/trunk/src/libstd/net_ip.rs
@@ -14,6 +14,7 @@ export v4;
 enum ip_addr {
     #[doc="An IPv4 address"]
     ipv4(u8, u8, u8, u8),
+    ipv6(u16,u16,u16,u16,u16,u16,u16,u16)
 }
 
 #[doc="
@@ -28,6 +29,9 @@ fn format_addr(ip: ip_addr) -> str {
       ipv4(a, b, c, d) {
         #fmt["%u.%u.%u.%u", a as uint, b as uint, c as uint, d as uint]
       }
+      ipv6(a,b,c,d,e,f,g,h) {
+        fail "FIXME impl parsing of ipv6 addr";
+      }
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ export v4;`
`14`	`14`	`enum ip_addr {`
`15`	`15`	`#[doc="An IPv4 address"]`
`16`	`16`	`ipv4(u8, u8, u8, u8),`
	`17`	`+ ipv6(u16,u16,u16,u16,u16,u16,u16,u16)`
`17`	`18`	`}`
`18`	`19`
`19`	`20`	`#[doc="`
`@@ -28,6 +29,9 @@ fn format_addr(ip: ip_addr) -> str {`
`28`	`29`	`ipv4(a, b, c, d) {`
`29`	`30`	`#fmt["%u.%u.%u.%u", a as uint, b as uint, c as uint, d as uint]`
`30`	`31`	`}`
	`32`	`+ ipv6(a,b,c,d,e,f,g,h) {`
	`33`	`+ fail "FIXME impl parsing of ipv6 addr";`
	`34`	`+ }`
`31`	`35`	`}`
`32`	`36`	`}`
`33`	`37`