rm ExtendedMutableIter

replaced with `xs.mut_iter().enumerate()`

diff --git a/src/libstd/old_iter.rs b/src/libstd/old_iter.rs
index 22ca356fa9b18b08f271a14d61f2af67962af6be..db4da833dd87f99df00fc5375af49d7fa51f1a67 100644 (file)
--- a/src/libstd/old_iter.rs
+++ b/src/libstd/old_iter.rs
@@ -47,10 +47,6 @@ pub trait ExtendedIter<A> {
     fn flat_map_to_vec<B,IB: BaseIter<B>>(&self, op: &fn(&A) -> IB) -> ~[B];
 }
 
-pub trait ExtendedMutableIter<A> {
-    fn eachi_mut(&mut self, blk: &fn(uint, &mut A) -> bool) -> bool;
-}
-
 pub trait EqIter<A:Eq> {
     fn contains(&self, x: &A) -> bool;
     fn count(&self, x: &A) -> uint;

diff --git a/src/libstd/prelude.rs b/src/libstd/prelude.rs
index bb9cf724af1ea37fdac14a95f99304e6b3021307..ec0269fc462f313b8a2529df0e2202e5d1350c23 100644 (file)
--- a/src/libstd/prelude.rs
+++ b/src/libstd/prelude.rs
@@ -48,7 +48,6 @@
 pub use hash::Hash;
 pub use old_iter::{BaseIter, ReverseIter, MutableIter, ExtendedIter, EqIter};
 pub use old_iter::{CopyableIter, CopyableOrderedIter, CopyableNonstrictIter};
-pub use old_iter::{ExtendedMutableIter};
 pub use iter::{Times, FromIter};
 pub use iterator::{Iterator, IteratorUtil};
 pub use num::{Num, NumCast};

diff --git a/src/libstd/vec.rs b/src/libstd/vec.rs
index 19233c533481e01a9542d55129f8f15eb6751f57..d139bcb40f467379e3df40fe1f89314404b87f18 100644 (file)
--- a/src/libstd/vec.rs
+++ b/src/libstd/vec.rs
@@ -2535,13 +2535,6 @@ fn flat_map_to_vec<B,IB:BaseIter<B>>(&self, op: &fn(&A) -> IB)
     }
 }
 
-impl<'self,A> old_iter::ExtendedMutableIter<A> for &'self mut [A] {
-    #[inline(always)]
-    pub fn eachi_mut(&mut self, blk: &fn(uint, v: &mut A) -> bool) -> bool {
-        self.mut_iter().enumerate().advance(|(i, v)| blk(i, v))
-    }
-}
-
 // FIXME(#4148): This should be redundant
 impl<A> old_iter::ExtendedIter<A> for ~[A] {
     pub fn eachi(&self, blk: &fn(uint, v: &A) -> bool) -> bool {

diff --git a/src/test/bench/shootout-spectralnorm.rs b/src/test/bench/shootout-spectralnorm.rs
index acf39a15e5fdf4fd4c6b0889760951ffd87001b4..95139239517ab99ba25be518a69a49522f2d341b 100644 (file)
--- a/src/test/bench/shootout-spectralnorm.rs
+++ b/src/test/bench/shootout-spectralnorm.rs
@@ -1,6 +1,5 @@
 use std::f64;
 use std::from_str::FromStr;
-use std::iter::ExtendedMutableIter;
 use std::os;
 use std::vec;