Rollup merge of rust-lang#88772 - orlp:result-map-or-else-docfix, r=yaahc

workingjubilee · web-flow · commit 2b6d7f75f7f5 · 2021-10-07T20:26:11.000-07:00
Fixed confusing wording on Result::map_or_else. Fixes rust-lang#88195.
diff --git a/library/core/src/result.rs b/library/core/src/result.rs
@@ -795,9 +795,8 @@ impl<T, E> Result<T, E> {
         }
     }
 
-    /// Maps a `Result<T, E>` to `U` by applying a provided default fallback
-    /// function to a contained [`Err`] value, or a provided function to a
-    /// contained [`Ok`] value.
+    /// Maps a `Result<T, E>` to `U` by applying fallback function `default` to
+    /// a contained [`Err`] value, or function `f` to a contained [`Ok`] value.
     ///
     /// This function can be used to unpack a successful result
     /// while handling an error.

Original file line number	Diff line number	Diff line change
`@@ -795,9 +795,8 @@ impl<T, E> Result<T, E> {`
`795`	`795`	`}`
`796`	`796`	`}`
`797`	`797`
`798`		- /// Maps a `Result<T, E>` to `U` by applying a provided default fallback
`799`		- /// function to a contained [`Err`] value, or a provided function to a
`800`		- /// contained [`Ok`] value.
	`798`	+ /// Maps a `Result<T, E>` to `U` by applying fallback function `default` to
	`799`	+ /// a contained [`Err`] value, or function `f` to a contained [`Ok`] value.
`801`	`800`	`///`
`802`	`801`	`/// This function can be used to unpack a successful result`
`803`	`802`	`/// while handling an error.`