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, 2 insertions, 2 deletions

diff --git a/src/libstd/hashmap.rs b/src/libstd/hashmap.rs
index bcd658ece66..fab8299f7a7 100644
--- a/src/libstd/hashmap.rs
+++ b/src/libstd/hashmap.rs
@@ -19,8 +19,8 @@ use container::{Container, Mutable, Map, MutableMap, Set, MutableSet};
 use clone::Clone;
 use cmp::{Eq, Equiv};
 use hash::Hash;
-use iterator::{Iterator, FromIterator, Extendable};
-use iterator::{FilterMap, Chain, Repeat, Zip};
+use iter::{Iterator, FromIterator, Extendable};
+use iter::{FilterMap, Chain, Repeat, Zip};
 use num;
 use option::{None, Option, Some};
 use rand::RngUtil;