about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-09-26 23:17:52 +0000
committerbors <bors@rust-lang.org>2022-09-26 23:17:52 +0000
commitf3a6fbf2f2e898ca4d788b3e686726fa9770c676 (patch)
treedf94ed03e7157a987412802296e24674a4f80612
parent8b705839cd656d202e920efa8769cbe43a5ee269 (diff)
parent475aeab79e7d9b0fcdc4fef7bc13e98772d24a94 (diff)
downloadrust-f3a6fbf2f2e898ca4d788b3e686726fa9770c676.tar.gz
rust-f3a6fbf2f2e898ca4d788b3e686726fa9770c676.zip
Auto merge of #102283 - GuillaumeGomez:option-code-example-unwrap-or-default, r=thomcc
Improve code example for Option::unwrap_or_default

Fixes #100054.
Follow-up of #102259.

r? `@thomcc`
-rw-r--r--library/core/src/option.rs16
1 files changed, 4 insertions, 12 deletions
diff --git a/library/core/src/option.rs b/library/core/src/option.rs
index ed7703befcf..4a93df4591b 100644
--- a/library/core/src/option.rs
+++ b/library/core/src/option.rs
@@ -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