Rollup merge of rust-lang#88963 - fee1-dead:const-iterator, r=oli-obk

Manishearth · web-flow · commit 6d18c9912f83 · 2021-10-01T14:46:48.000-07:00
Coerce const FnDefs to implement const Fn traits

You can now pass a FnDef to a function expecting `F` where `F: ~const FnTrait`.

r? ``@oli-obk``

``@rustbot`` label T-compiler F-const_trait_impl
diff --git a/clippy_utils/src/lib.rs b/clippy_utils/src/lib.rs
@@ -18,7 +18,6 @@
 extern crate rustc_ast;
 extern crate rustc_ast_pretty;
 extern crate rustc_attr;
-extern crate rustc_const_eval;
 extern crate rustc_data_structures;
 extern crate rustc_errors;
 extern crate rustc_hir;
diff --git a/clippy_utils/src/qualify_min_const_fn.rs b/clippy_utils/src/qualify_min_const_fn.rs
@@ -364,7 +364,7 @@ fn check_terminator(
 }
 
 fn is_const_fn(tcx: TyCtxt<'_>, def_id: DefId, msrv: Option<&RustcVersion>) -> bool {
-    rustc_const_eval::const_eval::is_const_fn(tcx, def_id)
+    tcx.is_const_fn(def_id)
         && tcx.lookup_const_stability(def_id).map_or(true, |const_stab| {
             if let rustc_attr::StabilityLevel::Stable { since } = const_stab.level {
                 // Checking MSRV is manually necessary because `rustc` has no such concept. This entire

Original file line number	Diff line number	Diff line change
`@@ -364,7 +364,7 @@ fn check_terminator(`
`364`	`364`	`}`
`365`	`365`
`366`	`366`	`fn is_const_fn(tcx: TyCtxt<'_>, def_id: DefId, msrv: Option<&RustcVersion>) -> bool {`
`367`		`- rustc_const_eval::const_eval::is_const_fn(tcx, def_id)`
	`367`	`+ tcx.is_const_fn(def_id)`
`368`	`368`	`&& tcx.lookup_const_stability(def_id).map_or(true, \|const_stab\| {`
`369`	`369`	`if let rustc_attr::StabilityLevel::Stable { since } = const_stab.level {`
`370`	`370`	// Checking MSRV is manually necessary because `rustc` has no such concept. This entire