---

yaml
---
r: 106477
b: refs/heads/try
c: d681907
h: refs/heads/master
i:
  106475: d674e8b
v: v3

Author: brunoabinader

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: b8ef9fd9c9f642ce7b8aed82782a1ed745d08d64
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: b8601a3d8b91ad3b653d143307611f2f5c75617e
-refs/heads/try: a09a4b882d415ea764f58816b963de0203c4e9f0
+refs/heads/try: d68190706448b5a1ca09be690f360c08a7a4f831
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libcollections/list.rs

@@ -53,26 +53,6 @@ impl<T> List<T> {
     }
 }
 
-/**
- * Search for an element that matches a given predicate
- *
- * Apply function `f` to each element of `list`, starting from the first.
- * When function `f` returns true then an option containing the element
- * is returned. If `f` matches no elements then none is returned.
- */
-pub fn find<T:Clone>(list: @List<T>, f: |&T| -> bool) -> Option<T> {
-    let mut list = list;
-    loop {
-        list = match *list {
-          Cons(ref head, tail) => {
-            if f(head) { return Some((*head).clone()); }
-            tail
-          }
-          Nil => return None
-        }
-    };
-}
-
 /**
  * Returns true if a list contains an element that matches a given predicate
  *
@@ -196,8 +176,6 @@ mod tests {
     use list::{List, Nil, head, is_empty, tail};
     use list;
 
-    use std::option;
-
     #[test]
     fn test_iter() {
         let list = List::from_vec([0, 1, 2]);
@@ -254,18 +232,21 @@ mod tests {
 
     #[test]
     fn test_find_success() {
-        fn match_(i: &int) -> bool { return *i == 2; }
-        let list = @List::from_vec([0, 1, 2]);
-        assert_eq!(list::find(list, match_), option::Some(2));
+        fn match_(i: & &int) -> bool { **i == 2 }
+
+        let list = List::from_vec([0, 1, 2]);
+        assert_eq!(list.iter().find(match_).unwrap(), &2);
     }
 
     #[test]
     fn test_find_fail() {
-        fn match_(_i: &int) -> bool { return false; }
-        let list = @List::from_vec([0, 1, 2]);
-        let empty = @list::Nil::<int>;
-        assert_eq!(list::find(list, match_), option::None::<int>);
-        assert_eq!(list::find(empty, match_), option::None::<int>);
+        fn match_(_i: & &int) -> bool { false }
+
+        let empty = Nil::<int>;
+        assert_eq!(empty.iter().find(match_), None);
+
+        let list = List::from_vec([0, 1, 2]);
+        assert_eq!(list.iter().find(match_), None);
     }
 
     #[test]