diff --git a/src/doc/guide-container.md b/src/doc/guide-container.md index dbf8c6512d43c..861aba57ec39e 100644 --- a/src/doc/guide-container.md +++ b/src/doc/guide-container.md @@ -278,7 +278,7 @@ vectors is as follows: ~~~ {.ignore} impl FromIterator for ~[A] { - pub fn from_iterator>(iterator: &mut T) -> ~[A] { + pub fn from_iter>(iterator: &mut T) -> ~[A] { let (lower, _) = iterator.size_hint(); let mut xs = with_capacity(lower); for x in iterator { diff --git a/src/libcollections/dlist.rs b/src/libcollections/dlist.rs index a8126125cb1f9..570f88112315c 100644 --- a/src/libcollections/dlist.rs +++ b/src/libcollections/dlist.rs @@ -582,7 +582,7 @@ impl DoubleEndedIterator for MoveItems { } impl FromIterator for DList { - fn from_iterator>(iterator: T) -> DList { + fn from_iter>(iterator: T) -> DList { let mut ret = DList::new(); ret.extend(iterator); ret diff --git a/src/libcollections/hashmap.rs b/src/libcollections/hashmap.rs index 2d3f7d512c3d8..1868abbbcc4a4 100644 --- a/src/libcollections/hashmap.rs +++ b/src/libcollections/hashmap.rs @@ -1356,7 +1356,7 @@ pub type Values<'a, K, V> = iter::Map<'static, (&'a K, &'a V), &'a V, Entries<'a, K, V>>; impl, V, S, H: Hasher + Default> FromIterator<(K, V)> for HashMap { - fn from_iterator>(iter: T) -> HashMap { + fn from_iter>(iter: T) -> HashMap { let (lower, _) = iter.size_hint(); let mut map = HashMap::with_capacity_and_hasher(lower, Default::default()); map.extend(iter); @@ -1540,7 +1540,7 @@ impl + fmt::Show, S, H: Hasher> fmt::Show for HashSet, S, H: Hasher + Default> FromIterator for HashSet { - fn from_iterator>(iter: I) -> HashSet { + fn from_iter>(iter: I) -> HashSet { let (lower, _) = iter.size_hint(); let mut set = HashSet::with_capacity_and_hasher(lower, Default::default()); set.extend(iter); diff --git a/src/libcollections/priority_queue.rs b/src/libcollections/priority_queue.rs index 3d2f260d3809c..78bc72e77e2e2 100644 --- a/src/libcollections/priority_queue.rs +++ b/src/libcollections/priority_queue.rs @@ -193,7 +193,7 @@ impl<'a, T> Iterator<&'a T> for Items<'a, T> { } impl FromIterator for PriorityQueue { - fn from_iterator>(iter: Iter) -> PriorityQueue { + fn from_iter>(iter: Iter) -> PriorityQueue { let mut q = PriorityQueue::new(); q.extend(iter); q diff --git a/src/libcollections/ringbuf.rs b/src/libcollections/ringbuf.rs index 3abeeb21695a9..5da7a33eef2c8 100644 --- a/src/libcollections/ringbuf.rs +++ b/src/libcollections/ringbuf.rs @@ -386,7 +386,7 @@ impl Eq for RingBuf { } impl FromIterator for RingBuf { - fn from_iterator>(iterator: T) -> RingBuf { + fn from_iter>(iterator: T) -> RingBuf { let (lower, _) = iterator.size_hint(); let mut deq = RingBuf::with_capacity(lower); deq.extend(iterator); @@ -778,7 +778,7 @@ mod tests { } #[test] - fn test_from_iterator() { + fn test_from_iter() { use std::iter; let v = ~[1,2,3,4,5,6,7]; let deq: RingBuf = v.iter().map(|&x| x).collect(); diff --git a/src/libcollections/treemap.rs b/src/libcollections/treemap.rs index 80886f9608686..96392894692f9 100644 --- a/src/libcollections/treemap.rs +++ b/src/libcollections/treemap.rs @@ -971,7 +971,7 @@ fn remove(node: &mut Option<~TreeNode>, } impl FromIterator<(K, V)> for TreeMap { - fn from_iterator>(iter: T) -> TreeMap { + fn from_iter>(iter: T) -> TreeMap { let mut map = TreeMap::new(); map.extend(iter); map @@ -988,7 +988,7 @@ impl Extendable<(K, V)> for TreeMap { } impl FromIterator for TreeSet { - fn from_iterator>(iter: Iter) -> TreeSet { + fn from_iter>(iter: Iter) -> TreeSet { let mut set = TreeSet::new(); set.extend(iter); set diff --git a/src/libcollections/trie.rs b/src/libcollections/trie.rs index f1cc9367509ad..a5124312dc9f8 100644 --- a/src/libcollections/trie.rs +++ b/src/libcollections/trie.rs @@ -261,7 +261,7 @@ impl TrieMap { } impl FromIterator<(uint, T)> for TrieMap { - fn from_iterator>(iter: Iter) -> TrieMap { + fn from_iter>(iter: Iter) -> TrieMap { let mut map = TrieMap::new(); map.extend(iter); map @@ -346,7 +346,7 @@ impl TrieSet { } impl FromIterator for TrieSet { - fn from_iterator>(iter: Iter) -> TrieSet { + fn from_iter>(iter: Iter) -> TrieSet { let mut set = TrieSet::new(); set.extend(iter); set diff --git a/src/libstd/iter.rs b/src/libstd/iter.rs index f4a7e3c5769aa..3e3766f1c1100 100644 --- a/src/libstd/iter.rs +++ b/src/libstd/iter.rs @@ -76,7 +76,7 @@ use mem; /// Conversion from an `Iterator` pub trait FromIterator { /// Build a container with elements from an external iterator. - fn from_iterator>(iterator: T) -> Self; + fn from_iter>(iterator: T) -> Self; } /// A type growable from an `Iterator` implementation @@ -460,7 +460,7 @@ pub trait Iterator { /// ``` #[inline] fn collect>(&mut self) -> B { - FromIterator::from_iterator(self.by_ref()) + FromIterator::from_iter(self.by_ref()) } /// Loops through `n` iterations, returning the `n`th element of the @@ -2336,7 +2336,7 @@ mod tests { #[test] fn test_counter_from_iter() { let it = count(0, 5).take(10); - let xs: ~[int] = FromIterator::from_iterator(it); + let xs: ~[int] = FromIterator::from_iter(it); assert_eq!(xs, ~[0, 5, 10, 15, 20, 25, 30, 35, 40, 45]); } diff --git a/src/libstd/option.rs b/src/libstd/option.rs index a1b7060018641..19b7a5ca6735e 100644 --- a/src/libstd/option.rs +++ b/src/libstd/option.rs @@ -593,7 +593,7 @@ pub fn collect>, V: FromIterator>(iter: Iter) -> } }); - let v: V = FromIterator::from_iterator(iter.by_ref()); + let v: V = FromIterator::from_iter(iter.by_ref()); if iter.state { None diff --git a/src/libstd/result.rs b/src/libstd/result.rs index df1c4ae60ba0b..fa16b6f6eeb6e 100644 --- a/src/libstd/result.rs +++ b/src/libstd/result.rs @@ -230,7 +230,7 @@ pub fn collect>, V: FromIterator>(iter: Ite } }); - let v: V = FromIterator::from_iterator(iter.by_ref()); + let v: V = FromIterator::from_iter(iter.by_ref()); match iter.state { Some(err) => Err(err), diff --git a/src/libstd/slice.rs b/src/libstd/slice.rs index 4a720aefa4eb6..19bb9e728ae0a 100644 --- a/src/libstd/slice.rs +++ b/src/libstd/slice.rs @@ -2891,7 +2891,7 @@ impl Drop for MoveItems { pub type RevMoveItems = Rev>; impl FromIterator for ~[A] { - fn from_iterator>(mut iterator: T) -> ~[A] { + fn from_iter>(mut iterator: T) -> ~[A] { let (lower, _) = iterator.size_hint(); let mut xs = with_capacity(lower); for x in iterator { diff --git a/src/libstd/str.rs b/src/libstd/str.rs index 5ef3e67c208bc..6d23877b02b7d 100644 --- a/src/libstd/str.rs +++ b/src/libstd/str.rs @@ -3019,7 +3019,7 @@ impl Clone for ~str { impl FromIterator for ~str { #[inline] - fn from_iterator>(iterator: T) -> ~str { + fn from_iter>(iterator: T) -> ~str { let (lower, _) = iterator.size_hint(); let mut buf = with_capacity(lower); buf.extend(iterator); diff --git a/src/libstd/vec.rs b/src/libstd/vec.rs index 11fd2b8ee225d..6265171f7d747 100644 --- a/src/libstd/vec.rs +++ b/src/libstd/vec.rs @@ -305,7 +305,7 @@ impl Clone for Vec { } impl FromIterator for Vec { - fn from_iterator>(mut iterator: I) -> Vec { + fn from_iter>(mut iterator: I) -> Vec { let (lower, _) = iterator.size_hint(); let mut vector = Vec::with_capacity(lower); for element in iterator { diff --git a/src/libsyntax/owned_slice.rs b/src/libsyntax/owned_slice.rs index 33829212686c7..e5e3a05f99883 100644 --- a/src/libsyntax/owned_slice.rs +++ b/src/libsyntax/owned_slice.rs @@ -126,7 +126,7 @@ impl Container for OwnedSlice { } impl FromIterator for OwnedSlice { - fn from_iterator>(mut iter: I) -> OwnedSlice { + fn from_iter>(mut iter: I) -> OwnedSlice { OwnedSlice::from_vec(iter.collect()) } } diff --git a/src/libsyntax/util/small_vector.rs b/src/libsyntax/util/small_vector.rs index 9d6295e3f2801..1dcebd7a01617 100644 --- a/src/libsyntax/util/small_vector.rs +++ b/src/libsyntax/util/small_vector.rs @@ -29,7 +29,7 @@ impl Container for SmallVector { } impl FromIterator for SmallVector { - fn from_iterator>(iter: I) -> SmallVector { + fn from_iter>(iter: I) -> SmallVector { let mut v = Zero; v.extend(iter); v @@ -167,7 +167,7 @@ mod test { } #[test] - fn test_from_iterator() { + fn test_from_iter() { let v: SmallVector = (vec!(1, 2, 3)).move_iter().collect(); assert_eq!(3, v.len()); assert_eq!(&1, v.get(0));