Rollup merge of #102259 - gimbles:patch-1, r=joshtriplett

Type-annotate and simplify documentation of Option::unwrap_or_default

Part of #100054

Author: fee1-dead

core/src/option.rs

@@ -842,6 +842,7 @@ impl<T> Option<T> {
     /// ```
     /// 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();
     ///