Auto merge of #5025 - JohnTitor:rustup-0109, r=phansch

bors · bors · commit e214dd4aafea · 2020-01-09T05:40:41.000Z
Rustup to rust-lang/rust#67781 changelog: none
diff --git a/clippy_lints/src/missing_const_for_fn.rs b/clippy_lints/src/missing_const_for_fn.rs
@@ -109,7 +109,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MissingConstForFn {
         let mir = cx.tcx.optimized_mir(def_id);
 
         if let Err((span, err)) = is_min_const_fn(cx.tcx, def_id, &mir) {
-            if cx.tcx.is_min_const_fn(def_id) {
+            if rustc_mir::const_eval::is_min_const_fn(cx.tcx, def_id) {
                 cx.tcx.sess.span_err(span, &err);
             }
         } else {

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MissingConstForFn {`
`109`	`109`	`let mir = cx.tcx.optimized_mir(def_id);`
`110`	`110`
`111`	`111`	`if let Err((span, err)) = is_min_const_fn(cx.tcx, def_id, &mir) {`
`112`		`- if cx.tcx.is_min_const_fn(def_id) {`
	`112`	`+ if rustc_mir::const_eval::is_min_const_fn(cx.tcx, def_id) {`
`113`	`113`	`cx.tcx.sess.span_err(span, &err);`
`114`	`114`	`}`
`115`	`115`	`} else {`