Rollup merge of rust-lang#65638 - dsincl12:master, r=Centril

Rename the default argument 'def' to 'default' Fixes: rust-lang#65492
Centril · Oct 20, 2019 · 5a29bd9 · 5a29bd9
2 parents 8bdae3a + 2a5c31c
commit 5a29bd9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/libcore/option.rs b/src/libcore/option.rs
@@ -395,10 +395,10 @@ impl<T> Option<T> {
     /// ```
     #[inline]
     #[stable(feature = "rust1", since = "1.0.0")]
-    pub fn unwrap_or(self, def: T) -> T {
+    pub fn unwrap_or(self, default: T) -> T {
         match self {
             Some(x) => x,
-            None => def,
+            None => default,
         }
     }