mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #111000 - JohnBobbo96:core_option_unneeded_function, r=jyn514

Browse Source 
Remove unneeded function call in `core::option`.

r? `@jyn514`
This commit is contained in:
Matthias Krüger 2023-04-30 16:25:48 +02:00 committed by GitHub
commit d8d24d498f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/core/src/option.rs
View File

@ -1007,7 +1007,7 @@ impl<T> Option<T> {
{ {
match self { match self {
Some(x) => x, Some(x) => x,
None => Default::default(), None => T::default(),
} }
} }
@ -1615,11 +1615,7 @@ impl<T> Option<T> {
where where
T: Default, T: Default,
{ {
fn default<T: Default>() -> T { self.get_or_insert_with(T::default)
T::default()
}
self.get_or_insert_with(default)
} }
/// Inserts a value computed from `f` into the option if it is [`None`], /// Inserts a value computed from `f` into the option if it is [`None`],