From da43676e39b87c766c1041e50c206909bb05bfa6 Mon Sep 17 00:00:00 2001 From: Huon Wilson Date: Mon, 4 Nov 2013 10:01:00 +1100 Subject: [PATCH] docs: Replace std::iterator with std::iter. --- doc/rust.md | 9 ++++----- doc/tutorial-container.md | 2 +- src/libstd/c_str.rs | 2 +- src/libstd/str.rs | 14 +++++++------- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/doc/rust.md b/doc/rust.md index 0023e65cd83..1e1a21c8ee9 100644 --- a/doc/rust.md +++ b/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: diff --git a/doc/tutorial-container.md b/doc/tutorial-container.md index fc5f4b86eb4..bd0510c4fb3 100644 --- a/doc/tutorial-container.md +++ b/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: ~~~ diff --git a/src/libstd/c_str.rs b/src/libstd/c_str.rs index b2e68c8d20f..6166bbaaaa3 100644 --- a/src/libstd/c_str.rs +++ b/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 diff --git a/src/libstd/str.rs b/src/libstd/str.rs index 053076c5d89..f376a30efa7 100644 --- a/src/libstd/str.rs +++ b/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 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>; /// 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>; /// 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>; /// 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,