Rollup merge of #74428 - tshepang:better-filter-map-doc, r=jonas-schievink

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

…s needed
This commit is contained in:
Manish Goregaokar
2020-07-17 14:09:28 -07:00
committed by GitHub
+2 -4
View File
@@ -746,12 +746,11 @@ fn filter<P>(self, predicate: P) -> Filter<Self, P>
/// 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);
/// ```
@@ -759,10 +758,9 @@ fn filter<P>(self, predicate: P) -> Filter<Self, P>
/// 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);
/// ```