mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rollup merge of #47497 - goffrie:patch-1, r=dtolnay

Browse source 
Remove incorrect `Default::default` links, add a new one

`map_or` and `map_or_else` don't use `Default::default`, but `unwrap_or_default` does.
This commit is contained in:
kennytm 2018-01-18 01:57:28 +08:00 • committed by GitHub
commit a588dcff28
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/libcore/option.rs
View file

@ -407,9 +407,7 @@ impl<T> Option<T> {
} }
/// Applies a function to the contained value (if any), /// Applies a function to the contained value (if any),
/// or returns a [`default`][] (if not). /// or returns the provided default (if not).
///
/// [`default`]: ../default/trait.Default.html#tymethod.default
/// ///
/// # Examples /// # Examples
/// ///
@ -430,9 +428,7 @@ impl<T> Option<T> {
} }
/// Applies a function to the contained value (if any), /// Applies a function to the contained value (if any),
/// or computes a [`default`][] (if not). /// or computes a default (if not).
///
/// [`default`]: ../default/trait.Default.html#tymethod.default
/// ///
/// # Examples /// # Examples
/// ///
@ -850,7 +846,7 @@ impl<T: Default> Option<T> {
/// Returns the contained value or a default /// Returns the contained value or a default
/// ///
/// Consumes the `self` argument then, if [`Some`], returns the contained /// Consumes the `self` argument then, if [`Some`], returns the contained
/// value, otherwise if [`None`], returns the default value for that /// value, otherwise if [`None`], returns the [default value] for that
/// type. /// type.
/// ///
/// # Examples /// # Examples
@ -872,6 +868,7 @@ impl<T: Default> Option<T> {
/// ///
/// [`Some`]: #variant.Some /// [`Some`]: #variant.Some
/// [`None`]: #variant.None /// [`None`]: #variant.None
/// [default value]: ../default/trait.Default.html#tymethod.default
/// [`parse`]: ../../std/primitive.str.html#method.parse /// [`parse`]: ../../std/primitive.str.html#method.parse
/// [`FromStr`]: ../../std/str/trait.FromStr.html /// [`FromStr`]: ../../std/str/trait.FromStr.html
#[inline] #[inline]