Skip to content

Commit

Permalink
Rollup merge of rust-lang#89400 - Nitepone:nitepone/map-or-else-docfi…
Browse files Browse the repository at this point in the history
…x, r=dtolnay

Improve wording of `map_or_else` docs

Changes doc text to refer to the "default" parameter as the "default"
function.

Previously, the doc text referred to the "f" parameter as the "default" function; and the "default" parameter as the "fallback" function.
  • Loading branch information
Manishearth committed Oct 4, 2021
2 parents b5301d8 + 35b0015 commit fd4974b
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions library/core/src/result.rs
Original file line number Diff line number Diff line change
Expand Up @@ -329,8 +329,8 @@
//! [`Ok`], or returns the provided default value if the [`Result`] is
//! [`Err`]
//! * [`map_or_else`] applies the provided function to the contained value
//! of [`Ok`], or applies the provided fallback function to the contained
//! value of [`Err`]
//! of [`Ok`], or applies the provided default fallback function to the
//! contained value of [`Err`]
//!
//! [`map_or`]: Result::map_or
//! [`map_or_else`]: Result::map_or_else
Expand Down Expand Up @@ -795,8 +795,8 @@ impl<T, E> Result<T, E> {
}
}

/// Maps a `Result<T, E>` to `U` by applying a fallback function to a
/// contained [`Err`] value, or a default function to a
/// 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.
///
/// This function can be used to unpack a successful result
Expand Down

0 comments on commit fd4974b

Please sign in to comment.