rm MutableIter

replaced with mutable implementations of Iterator

diff --git a/doc/tutorial-tasks.md b/doc/tutorial-tasks.md
index 6d3e83a810542f2d7305a2886824e1cddd70d082..b00cd665271f63cd959c8ae40c8a2bafad5631ea 100644 (file)
--- a/doc/tutorial-tasks.md
+++ b/doc/tutorial-tasks.md
@@ -327,7 +327,7 @@ fn main() {
     let mut futures = vec::from_fn(1000, |ind| do extra::future::spawn { partial_sum(ind) });
 
     let mut final_res = 0f64;
-    for futures.each_mut |ft|  {
+    for futures.mut_iter().advance |ft|  {
         final_res += ft.get();
     }
     println(fmt!("π^2/6 is not far from : %?", final_res));

diff --git a/src/libextra/deque.rs b/src/libextra/deque.rs
index a8accc50eab01969fc9cbee95fd8675450b85ee3..89e23a3a77ffb95eb4fdc8ee61cbb747debe41e5 100644 (file)
--- a/src/libextra/deque.rs
+++ b/src/libextra/deque.rs
@@ -37,7 +37,7 @@ fn is_empty(&const self) -> bool { self.len() == 0 }
 impl<T> Mutable for Deque<T> {
     /// Clear the deque, removing all values.
     fn clear(&mut self) {
-        for self.elts.each_mut |x| { *x = None }
+        for self.elts.mut_iter().advance |x| { *x = None }
         self.nelts = 0;
         self.lo = 0;
         self.hi = 0;

diff --git a/src/libstd/old_iter.rs b/src/libstd/old_iter.rs
index db4da833dd87f99df00fc5375af49d7fa51f1a67..e0a01a41f0a3f77541f1dc777cdb52b4496ad6e7 100644 (file)
--- a/src/libstd/old_iter.rs
+++ b/src/libstd/old_iter.rs
@@ -33,10 +33,6 @@ pub trait ReverseIter<A>: BaseIter<A> {
     fn each_reverse(&self, blk: &fn(&A) -> bool) -> bool;
 }
 
-pub trait MutableIter<A>: BaseIter<A> {
-    fn each_mut(&mut self, blk: &fn(&mut A) -> bool) -> bool;
-}
-
 pub trait ExtendedIter<A> {
     fn eachi(&self, blk: &fn(uint, v: &A) -> bool) -> bool;
     fn all(&self, blk: &fn(&A) -> bool) -> bool;

diff --git a/src/libstd/prelude.rs b/src/libstd/prelude.rs
index ec0269fc462f313b8a2529df0e2202e5d1350c23..c61995619a46398c6319096994c100a3282ef25b 100644 (file)
--- a/src/libstd/prelude.rs
+++ b/src/libstd/prelude.rs
@@ -46,7 +46,7 @@
 pub use char::Char;
 pub use container::{Container, Mutable, Map, Set};
 pub use hash::Hash;
-pub use old_iter::{BaseIter, ReverseIter, MutableIter, ExtendedIter, EqIter};
+pub use old_iter::{BaseIter, ReverseIter, ExtendedIter, EqIter};
 pub use old_iter::{CopyableIter, CopyableOrderedIter, CopyableNonstrictIter};
 pub use iter::{Times, FromIter};
 pub use iterator::{Iterator, IteratorUtil};

diff --git a/src/libstd/vec.rs b/src/libstd/vec.rs
index d139bcb40f467379e3df40fe1f89314404b87f18..b5ae605e03cd10ef4cb867f9aff0738e78391664 100644 (file)
--- a/src/libstd/vec.rs
+++ b/src/libstd/vec.rs
@@ -2487,29 +2487,6 @@ fn each<'a>(&'a self, blk: &fn(v: &'a A) -> bool) -> bool {
     fn size_hint(&self) -> Option<uint> { Some(self.len()) }
 }
 
-impl<'self,A> old_iter::MutableIter<A> for &'self mut [A] {
-    #[inline(always)]
-    fn each_mut<'a>(&'a mut self, blk: &fn(v: &'a mut A) -> bool) -> bool {
-        self.mut_iter().advance(blk)
-    }
-}
-
-// FIXME(#4148): This should be redundant
-impl<A> old_iter::MutableIter<A> for ~[A] {
-    #[inline(always)]
-    fn each_mut<'a>(&'a mut self, blk: &fn(v: &'a mut A) -> bool) -> bool {
-        self.mut_iter().advance(blk)
-    }
-}
-
-// FIXME(#4148): This should be redundant
-impl<A> old_iter::MutableIter<A> for @mut [A] {
-    #[inline(always)]
-    fn each_mut(&mut self, blk: &fn(v: &mut A) -> bool) -> bool {
-        self.mut_iter().advance(blk)
-    }
-}
-
 impl<'self,A> old_iter::ExtendedIter<A> for &'self [A] {
     pub fn eachi(&self, blk: &fn(uint, v: &A) -> bool) -> bool {
         old_iter::eachi(self, blk)

diff --git a/src/test/bench/msgsend-ring-mutex-arcs.rs b/src/test/bench/msgsend-ring-mutex-arcs.rs
index 020b53b9d9ae1ac886a2032ab16b258e835c2f8c..2bd53f81b0581cf74b5d80aeb632decca277a872 100644 (file)
--- a/src/test/bench/msgsend-ring-mutex-arcs.rs
+++ b/src/test/bench/msgsend-ring-mutex-arcs.rs
@@ -109,7 +109,7 @@ fn main() {
     thread_ring(0, msg_per_task, num_chan.take(), num_port);
 
     // synchronize
-    for futures.each_mut |f| {
+    for futures.mut_iter().advance |f| {
         f.get()
     }
 

diff --git a/src/test/bench/msgsend-ring-pipes.rs b/src/test/bench/msgsend-ring-pipes.rs
index d7b05ea635065fc7c8f63f29d9ad4a75d1cc1a92..f2bb77b26ef55b9cf660354de7d061f44a137ee9 100644 (file)
--- a/src/test/bench/msgsend-ring-pipes.rs
+++ b/src/test/bench/msgsend-ring-pipes.rs
@@ -99,7 +99,7 @@ fn main() {
     thread_ring(0, msg_per_task, num_chan.take(), num_port);
 
     // synchronize
-    for futures.each_mut |f| {
+    for futures.mut_iter().advance |f| {
         let _ = f.get();
     }
 

diff --git a/src/test/bench/msgsend-ring-rw-arcs.rs b/src/test/bench/msgsend-ring-rw-arcs.rs
index f2fe45ac5bdbe608112f09e24f6d1b88b659c26e..b5b5b685d87c48939ed3ec42fb082551323811dc 100644 (file)
--- a/src/test/bench/msgsend-ring-rw-arcs.rs
+++ b/src/test/bench/msgsend-ring-rw-arcs.rs
@@ -105,7 +105,7 @@ fn main() {
     thread_ring(0, msg_per_task, num_chan.take(), num_port);
 
     // synchronize
-    for futures.each_mut |f| {
+    for futures.mut_iter().advance |f| {
         let _ = f.get();
     }