Skip to content

Commit

Permalink
Rollup merge of rust-lang#74428 - tshepang:better-filter-map-doc, r=j…
Browse files Browse the repository at this point in the history
…onas-schievink

docs: better demonstrate that None values are skipped as many times a…

…s needed
  • Loading branch information
Manishearth committed Jul 17, 2020
2 parents 1117375 + 08b4b54 commit cfb6619
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions src/libcore/iter/traits/iterator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -746,23 +746,21 @@ pub trait Iterator {
/// Basic usage:
///
/// ```
/// let a = ["1", "lol", "3", "NaN", "5"];
/// let a = ["1", "two", "NaN", "four", "5"];
///
/// let mut iter = a.iter().filter_map(|s| s.parse().ok());
///
/// assert_eq!(iter.next(), Some(1));
/// assert_eq!(iter.next(), Some(3));
/// assert_eq!(iter.next(), Some(5));
/// assert_eq!(iter.next(), None);
/// ```
///
/// Here's the same example, but with [`filter`] and [`map`]:
///
/// ```
/// let a = ["1", "lol", "3", "NaN", "5"];
/// let a = ["1", "two", "NaN", "four", "5"];
/// let mut iter = a.iter().map(|s| s.parse()).filter(|s| s.is_ok()).map(|s| s.unwrap());
/// assert_eq!(iter.next(), Some(1));
/// assert_eq!(iter.next(), Some(3));
/// assert_eq!(iter.next(), Some(5));
/// assert_eq!(iter.next(), None);
/// ```
Expand Down

0 comments on commit cfb6619

Please sign in to comment.