about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-11-26 07:40:43 -0600
committerGitHub <noreply@github.com>2016-11-26 07:40:43 -0600
commit7e39c0ede524e491cfd1898649115e03d4b22b53 (patch)
tree1a5de822f4ab8986d731f642a7ff0ab92b9307cf /src/libcore
parent73e98a0210f0afdec28b4f5bc0f7327d6a5a8555 (diff)
parent44b926a6bbe3b8a48d077a72126b5921f87ece65 (diff)
downloadrust-7e39c0ede524e491cfd1898649115e03d4b22b53.tar.gz
rust-7e39c0ede524e491cfd1898649115e03d4b22b53.zip
Auto merge of #38015 - sanxiyn:rollup, r=sanxiyn
Rollup of 7 pull requests

- Successful merges: #37962, #37963, #37967, #37978, #37985, #38001, #38010
- Failed merges:
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/iter/mod.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libcore/iter/mod.rs b/src/libcore/iter/mod.rs
index 2e08508de67..3999db0d63c 100644
--- a/src/libcore/iter/mod.rs
+++ b/src/libcore/iter/mod.rs
@@ -225,12 +225,12 @@
 //! often called 'iterator adapters', as they're a form of the 'adapter
 //! pattern'.
 //!
-//! Common iterator adapters include [`map()`], [`take()`], and [`collect()`].
+//! Common iterator adapters include [`map()`], [`take()`], and [`filter()`].
 //! For more, see their documentation.
 //!
 //! [`map()`]: trait.Iterator.html#method.map
 //! [`take()`]: trait.Iterator.html#method.take
-//! [`collect()`]: trait.Iterator.html#method.collect
+//! [`filter()`]: trait.Iterator.html#method.filter
 //!
 //! # Laziness
 //!
@@ -268,7 +268,7 @@
 //! [`map()`]: trait.Iterator.html#method.map
 //!
 //! The two most common ways to evaluate an iterator are to use a `for` loop
-//! like this, or using the [`collect()`] adapter to produce a new collection.
+//! like this, or using the [`collect()`] method to produce a new collection.
 //!
 //! [`collect()`]: trait.Iterator.html#method.collect
 //!
@@ -937,7 +937,7 @@ unsafe impl<A, B> TrustedLen for Zip<A, B>
 /// you can also [`map()`] backwards:
 ///
 /// ```rust
-/// let v: Vec<i32> = vec![1, 2, 3].into_iter().rev().map(|x| x + 1).collect();
+/// let v: Vec<i32> = vec![1, 2, 3].into_iter().map(|x| x + 1).rev().collect();
 ///
 /// assert_eq!(v, [4, 3, 2]);
 /// ```