about summary refs log tree commit diff
path: root/src/libstd/std.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-09-09 00:26:07 -0700
committerbors <bors@rust-lang.org>2013-09-09 00:26:07 -0700
commitd09f569aac99a4ef2f577d288d547504e3dcf588 (patch)
tree339ac953153d71da8730569b8bd26b41dc081539 /src/libstd/std.rs
parenteae327032c775813eeb101233a4f7df24eab0a6a (diff)
parent6919cf5fe14701621437fcb57f3a0c38fb394c65 (diff)
downloadrust-d09f569aac99a4ef2f577d288d547504e3dcf588.tar.gz
rust-d09f569aac99a4ef2f577d288d547504e3dcf588.zip
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.
Diffstat (limited to 'src/libstd/std.rs')
-rw-r--r--src/libstd/std.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/std.rs b/src/libstd/std.rs
index ce0202ded7e..65fd24b7219 100644
--- a/src/libstd/std.rs
+++ b/src/libstd/std.rs
@@ -140,7 +140,7 @@ pub mod borrow;
 pub mod from_str;
 #[path = "num/num.rs"]
 pub mod num;
-pub mod iterator;
+pub mod iter;
 pub mod to_str;
 pub mod to_bytes;
 pub mod clone;