Auto merge of #5254 - JohnTitor:sugg, r=flip1995

bors · bors · commit 8b7f7e667268 · 2020-03-02T20:00:31.000Z
Rustup to rust-lang/rust#69469 changelog: none
diff --git a/clippy_lints/src/non_copy_const.rs b/clippy_lints/src/non_copy_const.rs
@@ -128,7 +128,7 @@ fn verify_ty_bound<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, ty: Ty<'tcx>, source: S
                 db.span_label(const_kw_span, "make this a static item (maybe with lazy_static)");
             },
             Source::Assoc { ty: ty_span, .. } => {
-                if ty.flags.contains(TypeFlags::HAS_FREE_LOCAL_NAMES) {
+                if ty.flags.intersects(TypeFlags::HAS_FREE_LOCAL_NAMES) {
                     db.span_label(ty_span, &format!("consider requiring `{}` to be `Copy`", ty));
                 }
             },

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ fn verify_ty_bound<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, ty: Ty<'tcx>, source: S`
`128`	`128`	`db.span_label(const_kw_span, "make this a static item (maybe with lazy_static)");`
`129`	`129`	`},`
`130`	`130`	`Source::Assoc { ty: ty_span, .. } => {`
`131`		`- if ty.flags.contains(TypeFlags::HAS_FREE_LOCAL_NAMES) {`
	`131`	`+ if ty.flags.intersects(TypeFlags::HAS_FREE_LOCAL_NAMES) {`
`132`	`132`	db.span_label(ty_span, &format!("consider requiring `{}` to be `Copy`", ty));
`133`	`133`	`}`
`134`	`134`	`},`