From 109055c7d3831f0a5a771e6f946e876dd8434223 Mon Sep 17 00:00:00 2001
From: Niko Matsakis <niko@alum.mit.edu>
Date: Thu, 13 Sep 2012 09:13:03 -0700
Subject: [PATCH] make iter::position() not require Eq

---
 src/libcore/iter-trait.rs | 6 +++---
 src/libcore/iter.rs       | 5 +++--
 src/libcore/vec.rs        | 6 +++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/libcore/iter-trait.rs b/src/libcore/iter-trait.rs
index 55a13fab8e4..27b525cba90 100644
--- a/src/libcore/iter-trait.rs
+++ b/src/libcore/iter-trait.rs
@@ -18,14 +18,14 @@ impl<A> IMPL_T<A>: iter::ExtendedIter<A> {
     pure fn foldl<B>(+b0: B, blk: fn(B, A) -> B) -> B {
         iter::foldl(self, move b0, blk)
     }
+    pure fn position(f: fn(A) -> bool) -> Option<uint> {
+        iter::position(self, f)
+    }
 }
 
 impl<A: Eq> IMPL_T<A>: iter::EqIter<A> {
     pure fn contains(x: A) -> bool { iter::contains(self, x) }
     pure fn count(x: A) -> uint { iter::count(self, x) }
-    pure fn position(f: fn(A) -> bool) -> Option<uint> {
-        iter::position(self, f)
-    }
 }
 
 impl<A: Copy> IMPL_T<A>: iter::CopyableIter<A> {
diff --git a/src/libcore/iter.rs b/src/libcore/iter.rs
index 1e05965925c..66c5b2b234a 100644
--- a/src/libcore/iter.rs
+++ b/src/libcore/iter.rs
@@ -13,12 +13,12 @@ trait ExtendedIter<A> {
     pure fn all(blk: fn(A) -> bool) -> bool;
     pure fn any(blk: fn(A) -> bool) -> bool;
     pure fn foldl<B>(+b0: B, blk: fn(B, A) -> B) -> B;
+    pure fn position(f: fn(A) -> bool) -> Option<uint>;
 }
 
 trait EqIter<A:Eq> {
     pure fn contains(x: A) -> bool;
     pure fn count(x: A) -> uint;
-    pure fn position(f: fn(A) -> bool) -> Option<uint>;
 }
 
 trait Times {
@@ -142,7 +142,8 @@ pure fn count<A:Eq,IA:BaseIter<A>>(self: IA, x: A) -> uint {
 }
 
 pure fn position<A,IA:BaseIter<A>>(self: IA, f: fn(A) -> bool)
-        -> Option<uint> {
+    -> Option<uint>
+{
     let mut i = 0;
     for self.each |a| {
         if f(a) { return Some(i); }
diff --git a/src/libcore/vec.rs b/src/libcore/vec.rs
index 626cb886fb3..0f512b4ec56 100644
--- a/src/libcore/vec.rs
+++ b/src/libcore/vec.rs
@@ -2019,14 +2019,14 @@ impl<A> &[A]: iter::ExtendedIter<A> {
     pure fn foldl<B>(+b0: B, blk: fn(B, A) -> B) -> B {
         iter::foldl(self, move b0, blk)
     }
+    pure fn position(f: fn(A) -> bool) -> Option<uint> {
+        iter::position(self, f)
+    }
 }
 
 impl<A: Eq> &[A]: iter::EqIter<A> {
     pure fn contains(x: A) -> bool { iter::contains(self, x) }
     pure fn count(x: A) -> uint { iter::count(self, x) }
-    pure fn position(f: fn(A) -> bool) -> Option<uint> {
-        iter::position(self, f)
-    }
 }
 
 impl<A: Copy> &[A]: iter::CopyableIter<A> {