about summary refs log tree commit diff
path: root/src/libextra
diff options
context:
space:
mode:
authorjmgrosen <jmgrosen@gmail.com>2013-07-28 13:37:35 -0700
committerjmgrosen <jmgrosen@gmail.com>2013-07-28 13:37:35 -0700
commita0f0f3012eb785063b2dff467b66d28e76d43feb (patch)
treee3021e5ab3b4b06cbd5f5978fd302905eba402ab /src/libextra
parent293ec2c5820e8b5dc4394e2c11ad3d2e9cfb56eb (diff)
downloadrust-a0f0f3012eb785063b2dff467b66d28e76d43feb.tar.gz
rust-a0f0f3012eb785063b2dff467b66d28e76d43feb.zip
Refactored vec and str iterators to remove prefixes
Diffstat (limited to 'src/libextra')
-rw-r--r--src/libextra/smallintmap.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libextra/smallintmap.rs b/src/libextra/smallintmap.rs
index 3c8d289b8b4..92a120592ff 100644
--- a/src/libextra/smallintmap.rs
+++ b/src/libextra/smallintmap.rs
@@ -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)| {