Skip to content

Commit

Permalink
Rollup merge of rust-lang#102283 - GuillaumeGomez:option-code-example…
Browse files Browse the repository at this point in the history
…-unwrap-or-default, r=thomcc

Improve code example for Option::unwrap_or_default

Fixes rust-lang#100054.
Follow-up of rust-lang#102259.

r? `@thomcc`
  • Loading branch information
notriddle authored Sep 26, 2022
2 parents 1d1f142 + 475aeab commit e096298
Showing 1 changed file with 4 additions and 12 deletions.
16 changes: 4 additions & 12 deletions library/core/src/option.rs
Original file line number Diff line number Diff line change
Expand Up @@ -834,20 +834,12 @@ impl<T> Option<T> {
///
/// # Examples
///
/// Converts a string to an integer, turning poorly-formed strings
/// into 0 (the default value for integers). [`parse`] converts
/// a string to any other type that implements [`FromStr`], returning
/// [`None`] on error.
///
/// ```
/// let good_year_from_input = "1909";
/// let bad_year_from_input = "190blarg";
/// // Result::ok() converts a Result<T> to an Option<T>
/// let good_year = good_year_from_input.parse().ok().unwrap_or_default();
/// let bad_year = bad_year_from_input.parse().ok().unwrap_or_default();
/// let x: Option<u32> = None;
/// let y: Option<u32> = Some(12);
///
/// assert_eq!(1909, good_year);
/// assert_eq!(0, bad_year);
/// assert_eq!(x.unwrap_or_default(), 0);
/// assert_eq!(y.unwrap_or_default(), 12);
/// ```
///
/// [default value]: Default::default
Expand Down

0 comments on commit e096298

Please sign in to comment.