diff options
| author | Daniel Micay <danielmicay@gmail.com> | 2013-06-12 21:47:04 -0400 |
|---|---|---|
| committer | Daniel Micay <danielmicay@gmail.com> | 2013-06-14 23:15:42 -0400 |
| commit | 8111701604976d3b0e9e70db621784aefda456b0 (patch) | |
| tree | eceaaa33dc03c2a1d49273a32fb45a2f8cc1a872 | |
| parent | 585f5f7f794c5f181ff351cb82a4c692cf61caa3 (diff) | |
| download | rust-8111701604976d3b0e9e70db621784aefda456b0.tar.gz rust-8111701604976d3b0e9e70db621784aefda456b0.zip | |
rm ExtendedMutableIter
replaced with `xs.mut_iter().enumerate()`
| -rw-r--r-- | src/libstd/old_iter.rs | 4 | ||||
| -rw-r--r-- | src/libstd/prelude.rs | 1 | ||||
| -rw-r--r-- | src/libstd/vec.rs | 7 | ||||
| -rw-r--r-- | src/test/bench/shootout-spectralnorm.rs | 1 |
4 files changed, 0 insertions, 13 deletions
diff --git a/src/libstd/old_iter.rs b/src/libstd/old_iter.rs index 22ca356fa9b..db4da833dd8 100644 --- 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 bb9cf724af1..ec0269fc462 100644 --- a/src/libstd/prelude.rs +++ b/src/libstd/prelude.rs @@ -48,7 +48,6 @@ pub use container::{Container, Mutable, Map, Set}; 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 19233c53348..d139bcb40f4 100644 --- a/src/libstd/vec.rs +++ b/src/libstd/vec.rs @@ -2535,13 +2535,6 @@ impl<'self,A> old_iter::ExtendedIter<A> for &'self [A] { } } -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 acf39a15e5f..95139239517 100644 --- 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; |
