Merge pull request #3009 from dwijnand/option-map_or

oli-obk · web-flow · commit 77025557f9de · 2018-08-07T13:11:30.000+02:00
Use Option::map_or
diff --git a/clippy_lints/src/mem_forget.rs b/clippy_lints/src/mem_forget.rs
@@ -37,10 +37,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MemForget {
                     if match_def_path(cx.tcx, def_id, &paths::MEM_FORGET) {
                         let forgot_ty = cx.tables.expr_ty(&args[0]);
 
-                        if match forgot_ty.ty_adt_def() {
-                            Some(def) => def.has_dtor(cx.tcx),
-                            _ => false,
-                        } {
+                        if forgot_ty.ty_adt_def().map_or(false, |def| def.has_dtor(cx.tcx)) {
                             span_lint(cx, MEM_FORGET, e.span, "usage of mem::forget on Drop type");
                         }
                     }

Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MemForget {`
`37`	`37`	`if match_def_path(cx.tcx, def_id, &paths::MEM_FORGET) {`
`38`	`38`	`let forgot_ty = cx.tables.expr_ty(&args[0]);`
`39`	`39`
`40`		`- if match forgot_ty.ty_adt_def() {`
`41`		`- Some(def) => def.has_dtor(cx.tcx),`
`42`		`- _ => false,`
`43`		`- } {`
	`40`	`+ if forgot_ty.ty_adt_def().map_or(false, \|def\| def.has_dtor(cx.tcx)) {`
`44`	`41`	`span_lint(cx, MEM_FORGET, e.span, "usage of mem::forget on Drop type");`
`45`	`42`	`}`
`46`	`43`	`}`