auto merge of #9065 : thestinger/rust/iter, r=alexcrichton

The trait will keep the `Iterator` naming, but a more concise module
name makes using the free functions less verbose. The module will define
iterables in addition to iterators, as it deals with iteration in
general.

1 files changed, 1 insertions, 2 deletions

diff --git a/src/libstd/fmt/parse.rs b/src/libstd/fmt/parse.rs
index 245318c4699..fd0e86d7a31 100644
--- a/src/libstd/fmt/parse.rs
+++ b/src/libstd/fmt/parse.rs
@@ -12,7 +12,6 @@ use prelude::*;
 
 use char;
 use str;
-use iterator;
 
 condition! { pub parse_error: ~str -> (); }
 
@@ -152,7 +151,7 @@ pub struct Parser<'self> {
     priv depth: uint,
 }
 
-impl<'self> iterator::Iterator<Piece<'self>> for Parser<'self> {
+impl<'self> Iterator<Piece<'self>> for Parser<'self> {
     fn next(&mut self) -> Option<Piece<'self>> {
         match self.cur.clone().next() {
             Some((_, '#')) => { self.cur.next(); Some(CurrentArgument) }