user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactored vec and str iterators to remove prefixes

Browse source
This commit is contained in:
jmgrosen 2013-07-28 13:37:35 -07:00
parent 293ec2c582
commit a0f0f3012e
4 changed files with 90 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libextra/smallintmap.rs
View file

@ -18,7 +18,8 @@
use std::iterator::{Iterator, IteratorUtil, EnumerateIterator, FilterMapIterator, InvertIterator};
use std::uint;
use std::util::replace;
use std::vec::{VecIterator, VecMutIterator, VecConsumeIterator};
use std::vec::{VecIterator, VecMutIterator};
use std::vec;
#[allow(missing_doc)]
pub struct SmallIntMap<T> {
@ -204,7 +205,7 @@ impl<V> SmallIntMap<V> {
/// Empties the hash map, moving all values into the specified closure
pub fn consume(&mut self)
-> FilterMapIterator<(uint, Option<V>), (uint, V),
EnumerateIterator<VecConsumeIterator<Option<V>>>>
EnumerateIterator<vec::ConsumeIterator<Option<V>>>>
{
let values = replace(&mut self.v, ~[]);
values.consume_iter().enumerate().filter_map(|(i, v)| {