---

yaml
---
r: 101677
b: refs/heads/master
c: 838c62b
h: refs/heads/master
i:
  101675: 633a2b6
v: v3

Author: bors

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: cb1fad3b28475eceff3de26380297a2c92fe5deb
+refs/heads/master: 838c62bb288d0fa6b395a9807ad8a519406e48c3
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6e7f170fedd3c526a643c0b2d13863acd982be02
 refs/heads/try: a97642026c18a624ff6ea01075dd9550f8ed07ff

trunk/src/libstd/io/net/ip.rs

@@ -14,11 +14,12 @@ use iter::Iterator;
 use option::{Option, None, Some};
 use str::StrSlice;
 use to_str::ToStr;
+use to_bytes::IterBytes;
 use vec::{MutableCloneableVector, ImmutableVector, MutableVector};
 
 pub type Port = u16;
 
-#[deriving(Eq, TotalEq, Clone)]
+#[deriving(Eq, TotalEq, Clone, IterBytes)]
 pub enum IpAddr {
     Ipv4Addr(u8, u8, u8, u8),
     Ipv6Addr(u16, u16, u16, u16, u16, u16, u16, u16)
@@ -48,7 +49,7 @@ impl ToStr for IpAddr {
     }
 }
 
-#[deriving(Eq, TotalEq, Clone)]
+#[deriving(Eq, TotalEq, Clone, IterBytes)]
 pub struct SocketAddr {
     ip: IpAddr,
     port: Port,
@@ -339,6 +340,7 @@ impl FromStr for SocketAddr {
 mod test {
     use prelude::*;
     use super::*;
+    use to_bytes::ToBytes;
 
     #[test]
     fn test_from_str_ipv4() {
@@ -441,4 +443,13 @@ mod test {
         assert_eq!(Ipv6Addr(8, 9, 10, 11, 12, 13, 14, 15).to_str(), ~"8:9:a:b:c:d:e:f");
     }
 
+    #[test]
+    fn ipv4_addr_to_bytes() {
+        Ipv4Addr(123, 20, 12, 56).to_bytes(true);
+    }
+
+    #[test]
+    fn socket_addr_to_bytes() {
+        SocketAddr { ip: Ipv4Addr(1, 2, 3, 4), port: 1234 }.to_bytes(true);
+    }
 }

trunk/src/test/compile-fail/regions-variance-contravariant-use-covariant.rs

@@ -15,8 +15,8 @@
 // variance inference works in the first place.
 
 // This is contravariant with respect to 'a, meaning that
-// Contravariant<'foo> <: Contravariant<'static> because
-// 'foo <= 'static
+// Contravariant<'long> <: Contravariant<'short> iff
+// 'short <= 'long
 struct Contravariant<'a> {
     f: &'a int
 }