From d68be89e6912a394beb12c2731bdc6240a81655b Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Wed, 12 Jun 2013 21:56:16 -0400 Subject: [PATCH] rm MutableIter replaced with mutable implementations of Iterator --- doc/tutorial-tasks.md | 2 +- src/libextra/deque.rs | 2 +- src/libstd/old_iter.rs | 4 ---- src/libstd/prelude.rs | 2 +- src/libstd/vec.rs | 23 ----------------------- src/test/bench/msgsend-ring-mutex-arcs.rs | 2 +- src/test/bench/msgsend-ring-pipes.rs | 2 +- src/test/bench/msgsend-ring-rw-arcs.rs | 2 +- 8 files changed, 6 insertions(+), 33 deletions(-) diff --git a/doc/tutorial-tasks.md b/doc/tutorial-tasks.md index 6d3e83a8105..b00cd665271 100644 --- 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 a8accc50eab..89e23a3a77f 100644 --- a/src/libextra/deque.rs +++ b/src/libextra/deque.rs @@ -37,7 +37,7 @@ impl Container for Deque { impl Mutable for Deque { /// 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 db4da833dd8..e0a01a41f0a 100644 --- a/src/libstd/old_iter.rs +++ b/src/libstd/old_iter.rs @@ -33,10 +33,6 @@ pub trait ReverseIter: BaseIter { fn each_reverse(&self, blk: &fn(&A) -> bool) -> bool; } -pub trait MutableIter: BaseIter { - fn each_mut(&mut self, blk: &fn(&mut A) -> bool) -> bool; -} - pub trait ExtendedIter { 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 ec0269fc462..c61995619a4 100644 --- a/src/libstd/prelude.rs +++ b/src/libstd/prelude.rs @@ -46,7 +46,7 @@ pub use cmp::{Eq, ApproxEq, Ord, TotalEq, TotalOrd, Ordering, Less, Equal, Great 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 d139bcb40f4..b5ae605e03c 100644 --- a/src/libstd/vec.rs +++ b/src/libstd/vec.rs @@ -2487,29 +2487,6 @@ impl old_iter::BaseIter for @[A] { fn size_hint(&self) -> Option { Some(self.len()) } } -impl<'self,A> old_iter::MutableIter 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 old_iter::MutableIter 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 old_iter::MutableIter 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 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 020b53b9d9a..2bd53f81b05 100644 --- 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 d7b05ea6350..f2bb77b26ef 100644 --- 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 f2fe45ac5bd..b5b5b685d87 100644 --- 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(); }