---

yaml
---
r: 146403
b: refs/heads/try2
c: da43676
h: refs/heads/master
i:
  146401: 860cf34
  146399: c0ef563
v: v3

Author: huonw

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: c4c2b38dae5d08d0eda6fbb8736f6295d9fdef9e
+refs/heads/try2: da43676e39b87c766c1041e50c206909bb05bfa6
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/doc/rust.md

@@ -2063,7 +2063,7 @@ The currently implemented features of the compiler are:
 
 * `once_fns` - Onceness guarantees a closure is only executed once. Defining a
                closure as `once` is unlikely to be supported going forward. So
-               they are hidden behind this feature until they are to be removed. 
+               they are hidden behind this feature until they are to be removed.
 
 If a feature is promoted to a language feature, then all existing programs will
 start to receive compilation warnings about #[feature] directives which enabled
@@ -2748,11 +2748,10 @@ do k(3) |j| {
 
 ~~~~ {.ebnf .gram}
 for_expr : "for" pat "in" expr '{' block '}' ;
-~~~~ 
+~~~~
 
-A `for` expression is a syntactic construct for looping
-over elements provided by an implementation of
-`std::iterator::Iterator`.
+A `for` expression is a syntactic construct for looping over elements
+provided by an implementation of `std::iter::Iterator`.
 
 An example of a for loop over the contents of a vector:
 

branches/try2/doc/tutorial-container.md

@@ -69,7 +69,7 @@ heapsort.
 ## Iteration protocol
 
 The iteration protocol is defined by the `Iterator` trait in the
-`std::iterator` module. The minimal implementation of the trait is a `next`
+`std::iter` module. The minimal implementation of the trait is a `next`
 method, yielding the next element from an iterator object:
 
 ~~~

branches/try2/doc/tutorial.md

@@ -759,7 +759,6 @@ different type from `Bar(1, 2)`), and tuple structs' _fields_ do not have
 names.
 
 For example:
-
 ~~~~
 struct MyTup(int, int, f64);
 let mytup: MyTup = MyTup(10, 20, 30.0);

branches/try2/src/libstd/c_str.rs

@@ -330,7 +330,7 @@ fn check_for_null(v: &[u8], buf: *mut libc::c_char) {
 
 /// External iterator for a CString's bytes.
 ///
-/// Use with the `std::iterator` module.
+/// Use with the `std::iter` module.
 pub struct CStringIterator<'self> {
     priv ptr: *libc::c_char,
     priv lifetime: &'self libc::c_char, // FIXME: #5922

branches/try2/src/libstd/str.rs

@@ -352,7 +352,7 @@ Section: Iterators
 */
 
 /// External iterator for a string's characters.
-/// Use with the `std::iterator` module.
+/// Use with the `std::iter` module.
 #[deriving(Clone)]
 pub struct CharIterator<'self> {
     /// The slice remaining to be iterated
@@ -397,7 +397,7 @@ impl<'self> DoubleEndedIterator<char> for CharIterator<'self> {
 }
 
 /// External iterator for a string's characters and their byte offsets.
-/// Use with the `std::iterator` module.
+/// Use with the `std::iter` module.
 #[deriving(Clone)]
 pub struct CharOffsetIterator<'self> {
     /// The original string to be iterated
@@ -439,20 +439,20 @@ impl<'self> DoubleEndedIterator<(uint, char)> for CharOffsetIterator<'self> {
 }
 
 /// External iterator for a string's characters in reverse order.
-/// Use with the `std::iterator` module.
+/// Use with the `std::iter` module.
 pub type CharRevIterator<'self> = Invert<CharIterator<'self>>;
 
 /// External iterator for a string's characters and their byte offsets in reverse order.
-/// Use with the `std::iterator` module.
+/// Use with the `std::iter` module.
 pub type CharOffsetRevIterator<'self> = Invert<CharOffsetIterator<'self>>;
 
 /// External iterator for a string's bytes.
-/// Use with the `std::iterator` module.
+/// Use with the `std::iter` module.
 pub type ByteIterator<'self> =
     Map<'self, &'self u8, u8, vec::VecIterator<'self, u8>>;
 
 /// External iterator for a string's bytes in reverse order.
-/// Use with the `std::iterator` module.
+/// Use with the `std::iter` module.
 pub type ByteRevIterator<'self> = Invert<ByteIterator<'self>>;
 
 /// An iterator over the substrings of a string, separated by `sep`.
@@ -682,7 +682,7 @@ enum NormalizationForm {
 }
 
 /// External iterator for a string's normalization's characters.
-/// Use with the `std::iterator` module.
+/// Use with the `std::iter` module.
 #[deriving(Clone)]
 struct NormalizationIterator<'self> {
     priv kind: NormalizationForm,