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, 1 deletions

diff --git a/src/libstd/either.rs b/src/libstd/either.rs
index 5d988965e8c..ec9e6d1ca4b 100644
--- a/src/libstd/either.rs
+++ b/src/libstd/either.rs
@@ -16,7 +16,7 @@ use option::{Some, None};
 use clone::Clone;
 use container::Container;
 use cmp::Eq;
-use iterator::{Iterator, FilterMap};
+use iter::{Iterator, FilterMap};
 use result::Result;
 use result;
 use str::StrSlice;