Merge branches 'master' and 'master' of https://github.com/t-webber/rust-clippy into fix_manual_unwrap_or_default

Author: t-webber

clippy_lints/src/manual_unwrap_or_default.rs

@@ -131,18 +131,13 @@ fn handle<'tcx>(cx: &LateContext<'tcx>, if_let_or_match: IfLetOrMatch<'tcx>, exp
         },
     };
 
-    // We check if the condition is not a None variant
-    let none_def_id = cx.tcx.lang_items().option_none_variant().unwrap();
-    if let ExprKind::Path(QPath::Resolved(_, path)) = &condition.kind {
-        if let Some(def_id) = path.res.opt_def_id() {
-            if cx.tcx.parent(def_id) == none_def_id {
-                dbg!("found none");
-<<<<<<< HEAD
-                 return;
->>>>>>> b9dcd2785 (Fix manual_unwrap_or_default)
-=======
-                return;
->>>>>>> dcaf974c8 (fix merge)
+    // We check if the expression is not a None variant
+    if let Some(none_def_id) = cx.tcx.lang_items().option_none_variant() {
+        if let ExprKind::Path(QPath::Resolved(_, path)) = &condition.kind {
+            if let Some(def_id) = path.res.opt_def_id() {
+                if cx.tcx.parent(def_id) == none_def_id {
+                    return;
+                }
             }
         }
     }

tests/ui/manual_unwrap_or_default.fixed

@@ -72,3 +72,12 @@ fn issue_12569() {
         0
     };
 }
+
+fn issue_16937() {
+    // pass
+    let _ = if let Some(x) = None { x } else { i32::default() };
+    // fail
+    let a: Option<i32> = None;
+    let _ = a.unwrap_or_default();
+    let _ = Some(99).unwrap_or_default();
+}

tests/ui/manual_unwrap_or_default.rs

@@ -96,3 +96,12 @@ fn issue_12569() {
         0
     };
 }
+
+fn issue_16937() {
+    // pass
+    let _ = if let Some(x) = None { x } else { i32::default() };
+    // fail
+    let a: Option<i32> = None;
+    let _ = if let Some(x) = a { x } else { i32::default() };
+    let _ = if let Some(x) = Some(99) { x } else { i32::default() };
+}

tests/ui/manual_unwrap_or_default.stderr

@@ -62,5 +62,17 @@ LL | |             _ => 0,
 LL | |         },
    | |_________^ help: replace it with: `(*b).unwrap_or_default()`
 
-error: aborting due to 6 previous errors
+error: if let can be simplified with `.unwrap_or_default()`
+  --> tests/ui/manual_unwrap_or_default.rs:105:13
+   |
+LL |     let _ = if let Some(x) = a { x } else { i32::default() };
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: replace it with: `a.unwrap_or_default()`
+
+error: if let can be simplified with `.unwrap_or_default()`
+  --> tests/ui/manual_unwrap_or_default.rs:106:13
+   |
+LL |     let _ = if let Some(x) = Some(99) { x } else { i32::default() };
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: replace it with: `Some(99).unwrap_or_default()`
+
+error: aborting due to 8 previous errors