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/rt/args.rs b/src/libstd/rt/args.rs
index e5075f8818a..afa8d3261fc 100644
--- a/src/libstd/rt/args.rs
+++ b/src/libstd/rt/args.rs
@@ -55,7 +55,7 @@ pub fn clone() -> Option<~[~str]> {
 mod imp {
     use libc;
     use option::{Option, Some, None};
-    use iterator::Iterator;
+    use iter::Iterator;
     use str;
     use unstable::finally::Finally;
     use util;