Skip to content

Commit 48d0fc6

Browse files
committed
Auto merge of #125521 - matthiaskrgr:rollup-ph2bz3h, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #125467 (Only suppress binop error in favor of semicolon suggestion if we're in an assignment statement) - #125483 (compiler: validate.rs belongs next to what it validates) - #125485 (Migrate `run-make/rustdoc-with-output-dir-option` to `rmake.rs`) - #125497 (Fix some SIMD intrinsics documentation) - #125501 (Resolve anon const's parent predicates to direct parent instead of opaque's parent) - #125503 (rustdoc-json: Add test for keywords with `--document-private-items`) - #125519 (tag more stuff with `WG-trait-system-refactor`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 7960cd7 + 3c57285 commit 48d0fc6

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

clippy_utils/src/qualify_min_const_fn.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use clippy_config::msrvs::{self, Msrv};
77
use hir::LangItem;
88
use rustc_attr::StableSince;
9-
use rustc_const_eval::transform::check_consts::ConstCx;
9+
use rustc_const_eval::check_consts::ConstCx;
1010
use rustc_hir as hir;
1111
use rustc_hir::def_id::DefId;
1212
use rustc_infer::infer::TyCtxtInferExt;

0 commit comments

Comments
 (0)