Skip to content

Commit 1a46a42

Browse files
authored
Rollup merge of #91368 - ecstatic-morse:mir-pass-reexport, r=cjgillot
Don't re-export `MirPass` `rust-analyzer` wants to use the `rustc_const_eval` one by default, which is weird. r? `@cjgillot`
2 parents 5d4d3f2 + 188d670 commit 1a46a42

File tree

4 files changed

+3
-8
lines changed

4 files changed

+3
-8
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
pub mod check_consts;
22
pub mod promote_consts;
33
pub mod validate;
4-
5-
pub use rustc_middle::mir::MirPass;

compiler/rustc_const_eval/src/transform/promote_consts.rs

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ use std::cell::Cell;
2727
use std::{cmp, iter, mem};
2828

2929
use crate::transform::check_consts::{qualifs, ConstCx};
30-
use crate::transform::MirPass;
3130

3231
/// A `MirPass` for promotion.
3332
///

compiler/rustc_const_eval/src/transform/validate.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
//! Validates the MIR to ensure that invariants are upheld.
22
3-
use super::MirPass;
43
use rustc_index::bit_set::BitSet;
54
use rustc_infer::infer::TyCtxtInferExt;
65
use rustc_middle::mir::interpret::Scalar;
76
use rustc_middle::mir::traversal;
87
use rustc_middle::mir::visit::{PlaceContext, Visitor};
98
use rustc_middle::mir::{
10-
AggregateKind, BasicBlock, Body, BorrowKind, Local, Location, MirPhase, Operand, PlaceElem,
11-
PlaceRef, ProjectionElem, Rvalue, SourceScope, Statement, StatementKind, Terminator,
9+
AggregateKind, BasicBlock, Body, BorrowKind, Local, Location, MirPass, MirPhase, Operand,
10+
PlaceElem, PlaceRef, ProjectionElem, Rvalue, SourceScope, Statement, StatementKind, Terminator,
1211
TerminatorKind, START_BLOCK,
1312
};
1413
use rustc_middle::ty::fold::BottomUpFolder;

compiler/rustc_mir_transform/src/lib.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ use rustc_hir::def_id::{DefId, LocalDefId};
2727
use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
2828
use rustc_index::vec::IndexVec;
2929
use rustc_middle::mir::visit::Visitor as _;
30-
use rustc_middle::mir::{dump_mir, traversal, Body, ConstQualifs, MirPhase, Promoted};
30+
use rustc_middle::mir::{dump_mir, traversal, Body, ConstQualifs, MirPass, MirPhase, Promoted};
3131
use rustc_middle::ty::query::Providers;
3232
use rustc_middle::ty::{self, TyCtxt, TypeFoldable};
3333
use rustc_span::{Span, Symbol};
@@ -78,7 +78,6 @@ mod unreachable_prop;
7878
use rustc_const_eval::transform::check_consts;
7979
use rustc_const_eval::transform::promote_consts;
8080
use rustc_const_eval::transform::validate;
81-
pub use rustc_const_eval::transform::MirPass;
8281
use rustc_mir_dataflow::rustc_peek;
8382

8483
pub fn provide(providers: &mut Providers) {

0 commit comments

Comments
 (0)