Skip to content

Commit 0b69dda

Browse files
committed
rm ExtendedMutableIter
replaced with `xs.mut_iter().enumerate()`
1 parent 3798146 commit 0b69dda

File tree

4 files changed

+0
-13
lines changed

4 files changed

+0
-13
lines changed

src/libstd/old_iter.rs

-4
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,6 @@ pub trait ExtendedIter<A> {
4747
fn flat_map_to_vec<B,IB: BaseIter<B>>(&self, op: &fn(&A) -> IB) -> ~[B];
4848
}
4949

50-
pub trait ExtendedMutableIter<A> {
51-
fn eachi_mut(&mut self, blk: &fn(uint, &mut A) -> bool) -> bool;
52-
}
53-
5450
pub trait EqIter<A:Eq> {
5551
fn contains(&self, x: &A) -> bool;
5652
fn count(&self, x: &A) -> uint;

src/libstd/prelude.rs

-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ pub use container::{Container, Mutable, Map, Set};
4848
pub use hash::Hash;
4949
pub use old_iter::{BaseIter, ReverseIter, MutableIter, ExtendedIter, EqIter};
5050
pub use old_iter::{CopyableIter, CopyableOrderedIter, CopyableNonstrictIter};
51-
pub use old_iter::{ExtendedMutableIter};
5251
pub use iter::{Times, FromIter};
5352
pub use iterator::{Iterator, IteratorUtil};
5453
pub use num::{Num, NumCast};

src/libstd/vec.rs

-7
Original file line numberDiff line numberDiff line change
@@ -2529,13 +2529,6 @@ impl<'self,A> old_iter::ExtendedIter<A> for &'self [A] {
25292529
}
25302530
}
25312531

2532-
impl<'self,A> old_iter::ExtendedMutableIter<A> for &'self mut [A] {
2533-
#[inline(always)]
2534-
pub fn eachi_mut(&mut self, blk: &fn(uint, v: &mut A) -> bool) -> bool {
2535-
self.mut_iter().enumerate().advance(|(i, v)| blk(i, v))
2536-
}
2537-
}
2538-
25392532
// FIXME(#4148): This should be redundant
25402533
impl<A> old_iter::ExtendedIter<A> for ~[A] {
25412534
pub fn eachi(&self, blk: &fn(uint, v: &A) -> bool) -> bool {

src/test/bench/shootout-spectralnorm.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use std::f64;
22
use std::from_str::FromStr;
3-
use std::iter::ExtendedMutableIter;
43
use std::os;
54
use std::vec;
65

0 commit comments

Comments
 (0)