From 3fd8c8b3306ae33bdc85811aa410ba01967922bc Mon Sep 17 00:00:00 2001 From: Palmer Cox Date: Tue, 14 Jan 2014 22:32:24 -0500 Subject: Rename iterators for consistency Rename existing iterators to get rid of the Iterator suffix and to give them names that better describe the things being iterated over. --- src/libsyntax/util/small_vector.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/libsyntax/util/small_vector.rs') diff --git a/src/libsyntax/util/small_vector.rs b/src/libsyntax/util/small_vector.rs index 51656160d31..6803bb1eaf9 100644 --- a/src/libsyntax/util/small_vector.rs +++ b/src/libsyntax/util/small_vector.rs @@ -7,7 +7,7 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. -use std::vec::MoveIterator; +use std::vec; use std::util; /// A vector type optimized for cases where the size is almost always 0 or 1 @@ -80,7 +80,7 @@ impl SmallVector { } } - pub fn move_iter(self) -> SmallVectorMoveIterator { + pub fn move_iter(self) -> MoveItems { match self { Zero => ZeroIterator, One(v) => OneIterator(v), @@ -89,13 +89,13 @@ impl SmallVector { } } -pub enum SmallVectorMoveIterator { +pub enum MoveItems { priv ZeroIterator, priv OneIterator(T), - priv ManyIterator(MoveIterator), + priv ManyIterator(vec::MoveItems), } -impl Iterator for SmallVectorMoveIterator { +impl Iterator for MoveItems { fn next(&mut self) -> Option { match *self { ZeroIterator => None, -- cgit 1.4.1-3-g733a5