---

yaml
---
r: 149065
b: refs/heads/try2
c: 1f245cc
h: refs/heads/master
i:
  149063: c071740
v: v3

Author: bors

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 1b969e11881eab81b9364fc4304dfdfcd2da1128
+refs/heads/try2: 1f245cc7ea72bc8eeddd12cc9f8e753f3ca71910
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libcollections/list.rs

@@ -63,6 +63,26 @@ pub fn find<T:Clone>(ls: @List<T>, f: |&T| -> bool) -> Option<T> {
     };
 }
 
+/**
+ * Returns true if a list contains an element that matches a given predicate
+ *
+ * Apply function `f` to each element of `ls`, starting from the first.
+ * When function `f` returns true then it also returns true. If `f` matches no
+ * elements then false is returned.
+ */
+pub fn any<T>(ls: @List<T>, f: |&T| -> bool) -> bool {
+    let mut ls = ls;
+    loop {
+        ls = match *ls {
+            Cons(ref hd, tl) => {
+                if f(hd) { return true; }
+                tl
+            }
+            Nil => return false
+        }
+    };
+}
+
 /// Returns true if a list contains an element with the given value
 pub fn has<T:Eq>(ls: @List<T>, elt: T) -> bool {
     let mut found = false;
@@ -222,6 +242,15 @@ mod tests {
         assert_eq!(list::find(empty, match_), option::None::<int>);
     }
 
+    #[test]
+    fn test_any() {
+        fn match_(i: &int) -> bool { return *i == 2; }
+        let l = from_vec([0, 1, 2]);
+        let empty = @list::Nil::<int>;
+        assert_eq!(list::any(l, match_), true);
+        assert_eq!(list::any(empty, match_), false);
+    }
+
     #[test]
     fn test_has() {
         let l = from_vec([5, 8, 6]);

branches/try2/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);
+    }
 }

branches/try2/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
 }