Skip to content

Commit 2cb37a1

Browse files
committed
Auto merge of rust-lang#89449 - Manishearth:rollup-3alb61f, r=Manishearth
Rollup of 7 pull requests Successful merges: - rust-lang#85223 (rustdoc: Clarified the attribute which prompts the warning) - rust-lang#88847 (platform-support.md: correct ARMv7+MUSL platform triple notes) - rust-lang#88963 (Coerce const FnDefs to implement const Fn traits ) - rust-lang#89376 (Fix use after drop in self-profile with llvm events) - rust-lang#89422 (Replace whitespaces in doctests' name with dashes) - rust-lang#89440 (Clarify a sentence in the documentation of Vec (rust-lang#84488)) - rust-lang#89441 (Normalize after substituting via `field.ty()`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 72bf97f + 6d18c99 commit 2cb37a1

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

clippy_utils/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
extern crate rustc_ast;
1919
extern crate rustc_ast_pretty;
2020
extern crate rustc_attr;
21-
extern crate rustc_const_eval;
2221
extern crate rustc_data_structures;
2322
extern crate rustc_errors;
2423
extern crate rustc_hir;

clippy_utils/src/qualify_min_const_fn.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ fn check_terminator(
364364
}
365365

366366
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)
368368
&& tcx.lookup_const_stability(def_id).map_or(true, |const_stab| {
369369
if let rustc_attr::StabilityLevel::Stable { since } = const_stab.level {
370370
// Checking MSRV is manually necessary because `rustc` has no such concept. This entire

0 commit comments

Comments
 (0)