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

matthiaskrgr · web-flow · commit d8d24d498f54 · 2023-04-30T16:25:48.000+02:00
Remove unneeded function call in `core::option`.

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

Original file line number	Diff line number	Diff line change
`@@ -1007,7 +1007,7 @@ impl<T> Option<T> {`
`1007`	`1007`	`{`
`1008`	`1008`	`match self {`
`1009`	`1009`	`Some(x) => x,`
`1010`		`- None => Default::default(),`
	`1010`	`+ None => T::default(),`
`1011`	`1011`	`}`
`1012`	`1012`	`}`
`1013`	`1013`
`@@ -1615,11 +1615,7 @@ impl<T> Option<T> {`
`1615`	`1615`	`where`
`1616`	`1616`	`T: Default,`
`1617`	`1617`	`{`
`1618`		`- fn default<T: Default>() -> T {`
`1619`		`- T::default()`
`1620`		`- }`
`1621`		`-`
`1622`		`- self.get_or_insert_with(default)`
	`1618`	`+ self.get_or_insert_with(T::default)`
`1623`	`1619`	`}`
`1624`	`1620`
`1625`	`1621`	/// Inserts a value computed from `f` into the option if it is [`None`],