Skip to content

Commit 544b3a1

Browse files
RalfJungRalfJung
committed
fix rebase fallout
1 parent a413242 commit 544b3a1

23 files changed

+45
-40
lines changed

‎src/librustc_mir/borrow_check/nll/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ pub(in crate::borrow_check) fn compute_regions<'cx, 'gcx, 'tcx>(
209209

210210
fn dump_mir_results<'a, 'gcx, 'tcx>(
211211
infcx: &InferCtxt<'a, 'gcx, 'tcx>,
212-
source: MirSource,
212+
source: MirSource<'tcx>,
213213
mir: &Mir<'tcx>,
214214
regioncx: &RegionInferenceContext<'_>,
215215
closure_region_requirements: &Option<ClosureRegionRequirements<'_>>,

‎src/librustc_mir/borrow_check/nll/type_check/mod.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2427,7 +2427,12 @@ impl<'a, 'gcx, 'tcx> TypeChecker<'a, 'gcx, 'tcx> {
24272427
pub struct TypeckMir;
24282428

24292429
impl MirPass for TypeckMir {
2430-
fn run_pass<'a, 'tcx>(&self, tcx: TyCtxt<'a, 'tcx, 'tcx>, src: MirSource, mir: &mut Mir<'tcx>) {
2430+
fn run_pass<'a, 'tcx>(
2431+
&self,
2432+
tcx: TyCtxt<'a, 'tcx, 'tcx>,
2433+
src: MirSource<'tcx>,
2434+
mir: &mut Mir<'tcx>,
2435+
) {
24312436
let def_id = src.def_id();
24322437
debug!("run_pass: {:?}", def_id);
24332438

‎src/librustc_mir/transform/add_call_guards.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ pub use self::AddCallGuards::*;
3333
impl MirPass for AddCallGuards {
3434
fn run_pass<'a, 'tcx>(&self,
3535
_tcx: TyCtxt<'a, 'tcx, 'tcx>,
36-
_src: MirSource,
36+
_src: MirSource<'tcx>,
3737
mir: &mut Mir<'tcx>) {
3838
self.add_call_guards(mir);
3939
}

‎src/librustc_mir/transform/add_moves_for_packed_drops.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ pub struct AddMovesForPackedDrops;
4242
impl MirPass for AddMovesForPackedDrops {
4343
fn run_pass<'a, 'tcx>(&self,
4444
tcx: TyCtxt<'a, 'tcx, 'tcx>,
45-
src: MirSource,
45+
src: MirSource<'tcx>,
4646
mir: &mut Mir<'tcx>)
4747
{
4848
debug!("add_moves_for_packed_drops({:?} @ {:?})", src, mir.span);

‎src/librustc_mir/transform/add_retag.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ fn may_have_reference<'a, 'gcx, 'tcx>(ty: Ty<'tcx>, tcx: TyCtxt<'a, 'gcx, 'tcx>)
7777
impl MirPass for AddRetag {
7878
fn run_pass<'a, 'tcx>(&self,
7979
tcx: TyCtxt<'a, 'tcx, 'tcx>,
80-
_src: MirSource,
80+
_src: MirSource<'tcx>,
8181
mir: &mut Mir<'tcx>)
8282
{
8383
if !tcx.sess.opts.debugging_opts.mir_emit_retag {

‎src/librustc_mir/transform/cleanup_post_borrowck.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ pub struct DeleteAscribeUserType;
3535
impl MirPass for CleanAscribeUserType {
3636
fn run_pass<'a, 'tcx>(&self,
3737
_tcx: TyCtxt<'a, 'tcx, 'tcx>,
38-
_source: MirSource,
38+
_source: MirSource<'tcx>,
3939
mir: &mut Mir<'tcx>) {
4040
let mut delete = DeleteAscribeUserType;
4141
delete.visit_mir(mir);
@@ -69,7 +69,7 @@ pub struct DeleteFakeBorrows {
6969
impl MirPass for CleanFakeReadsAndBorrows {
7070
fn run_pass<'a, 'tcx>(&self,
7171
_tcx: TyCtxt<'a, 'tcx, 'tcx>,
72-
_source: MirSource,
72+
_source: MirSource<'tcx>,
7373
mir: &mut Mir<'tcx>) {
7474
let mut delete_reads = DeleteAndRecordFakeReads::default();
7575
delete_reads.visit_mir(mir);

‎src/librustc_mir/transform/copy_prop.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ pub struct CopyPropagation;
3030
impl MirPass for CopyPropagation {
3131
fn run_pass<'a, 'tcx>(&self,
3232
tcx: TyCtxt<'a, 'tcx, 'tcx>,
33-
_source: MirSource,
33+
_source: MirSource<'tcx>,
3434
mir: &mut Mir<'tcx>) {
3535
// We only run when the MIR optimization level is > 1.
3636
// This avoids a slow pass, and messing up debug info.

‎src/librustc_mir/transform/deaggregator.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ pub struct Deaggregator;
88
impl MirPass for Deaggregator {
99
fn run_pass<'a, 'tcx>(&self,
1010
tcx: TyCtxt<'a, 'tcx, 'tcx>,
11-
_source: MirSource,
11+
_source: MirSource<'tcx>,
1212
mir: &mut Mir<'tcx>) {
1313
let (basic_blocks, local_decls) = mir.basic_blocks_and_local_decls_mut();
1414
let local_decls = &*local_decls;

‎src/librustc_mir/transform/dump_mir.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ impl MirPass for Marker {
2020

2121
fn run_pass<'a, 'tcx>(&self,
2222
_tcx: TyCtxt<'a, 'tcx, 'tcx>,
23-
_source: MirSource,
23+
_source: MirSource<'tcx>,
2424
_mir: &mut Mir<'tcx>)
2525
{
2626
}
@@ -41,7 +41,7 @@ impl fmt::Display for Disambiguator {
4141
pub fn on_mir_pass<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
4242
pass_num: &dyn fmt::Display,
4343
pass_name: &str,
44-
source: MirSource,
44+
source: MirSource<'tcx>,
4545
mir: &Mir<'tcx>,
4646
is_after: bool) {
4747
if mir_util::dump_enabled(tcx, pass_name, source) {

‎src/librustc_mir/transform/elaborate_drops.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ pub struct ElaborateDrops;
2323
impl MirPass for ElaborateDrops {
2424
fn run_pass<'a, 'tcx>(&self,
2525
tcx: TyCtxt<'a, 'tcx, 'tcx>,
26-
src: MirSource,
26+
src: MirSource<'tcx>,
2727
mir: &mut Mir<'tcx>)
2828
{
2929
debug!("elaborate_drops({:?} @ {:?})", src, mir.span);

‎src/librustc_mir/transform/erase_regions.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ pub struct EraseRegions;
5353
impl MirPass for EraseRegions {
5454
fn run_pass<'a, 'tcx>(&self,
5555
tcx: TyCtxt<'a, 'tcx, 'tcx>,
56-
_: MirSource,
56+
_: MirSource<'tcx>,
5757
mir: &mut Mir<'tcx>) {
5858
EraseRegionsVisitor::new(tcx).visit_mir(mir);
5959
}

‎src/librustc_mir/transform/generator.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ impl<'tcx> Visitor<'tcx> for StorageIgnored {
376376
fn locals_live_across_suspend_points(
377377
tcx: TyCtxt<'a, 'tcx, 'tcx>,
378378
mir: &Mir<'tcx>,
379-
source: MirSource,
379+
source: MirSource<'tcx>,
380380
movable: bool,
381381
) -> (
382382
liveness::LiveVarSet<Local>,
@@ -484,7 +484,7 @@ fn locals_live_across_suspend_points(
484484
}
485485

486486
fn compute_layout<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
487-
source: MirSource,
487+
source: MirSource<'tcx>,
488488
upvars: Vec<Ty<'tcx>>,
489489
interior: Ty<'tcx>,
490490
movable: bool,
@@ -635,7 +635,7 @@ fn create_generator_drop_shim<'a, 'tcx>(
635635
tcx: TyCtxt<'a, 'tcx, 'tcx>,
636636
transform: &TransformVisitor<'a, 'tcx>,
637637
def_id: DefId,
638-
source: MirSource,
638+
source: MirSource<'tcx>,
639639
gen_ty: Ty<'tcx>,
640640
mir: &Mir<'tcx>,
641641
drop_clean: BasicBlock) -> Mir<'tcx> {
@@ -758,7 +758,7 @@ fn create_generator_resume_function<'a, 'tcx>(
758758
tcx: TyCtxt<'a, 'tcx, 'tcx>,
759759
transform: TransformVisitor<'a, 'tcx>,
760760
def_id: DefId,
761-
source: MirSource,
761+
source: MirSource<'tcx>,
762762
mir: &mut Mir<'tcx>) {
763763
// Poison the generator when it unwinds
764764
for block in mir.basic_blocks_mut() {
@@ -869,7 +869,7 @@ fn create_cases<'a, 'tcx, F>(mir: &mut Mir<'tcx>,
869869
impl MirPass for StateTransform {
870870
fn run_pass<'a, 'tcx>(&self,
871871
tcx: TyCtxt<'a, 'tcx, 'tcx>,
872-
source: MirSource,
872+
source: MirSource<'tcx>,
873873
mir: &mut Mir<'tcx>) {
874874
let yield_ty = if let Some(yield_ty) = mir.yield_ty {
875875
yield_ty

‎src/librustc_mir/transform/instcombine.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pub struct InstCombine;
1313
impl MirPass for InstCombine {
1414
fn run_pass<'a, 'tcx>(&self,
1515
tcx: TyCtxt<'a, 'tcx, 'tcx>,
16-
_: MirSource,
16+
_: MirSource<'tcx>,
1717
mir: &mut Mir<'tcx>) {
1818
// We only run when optimizing MIR (at any level).
1919
if tcx.sess.opts.debugging_opts.mir_opt_level == 0 {

‎src/librustc_mir/transform/lower_128bit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pub struct Lower128Bit;
1212
impl MirPass for Lower128Bit {
1313
fn run_pass<'a, 'tcx>(&self,
1414
tcx: TyCtxt<'a, 'tcx, 'tcx>,
15-
_src: MirSource,
15+
_src: MirSource<'tcx>,
1616
mir: &mut Mir<'tcx>) {
1717
let debugging_override = tcx.sess.opts.debugging_opts.lower_128bit_ops;
1818
let target_default = tcx.sess.host.options.i128_lowering;

‎src/librustc_mir/transform/no_landing_pads.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pub struct NoLandingPads;
1111
impl MirPass for NoLandingPads {
1212
fn run_pass<'a, 'tcx>(&self,
1313
tcx: TyCtxt<'a, 'tcx, 'tcx>,
14-
_: MirSource,
14+
_: MirSource<'tcx>,
1515
mir: &mut Mir<'tcx>) {
1616
no_landing_pads(tcx, mir)
1717
}

‎src/librustc_mir/transform/qualify_consts.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1159,7 +1159,7 @@ pub struct QualifyAndPromoteConstants;
11591159
impl MirPass for QualifyAndPromoteConstants {
11601160
fn run_pass<'a, 'tcx>(&self,
11611161
tcx: TyCtxt<'a, 'tcx, 'tcx>,
1162-
src: MirSource,
1162+
src: MirSource<'tcx>,
11631163
mir: &mut Mir<'tcx>) {
11641164
// There's not really any point in promoting errorful MIR.
11651165
if mir.return_ty().references_error() {

‎src/librustc_mir/transform/remove_noop_landing_pads.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub fn remove_noop_landing_pads<'a, 'tcx>(
2424
impl MirPass for RemoveNoopLandingPads {
2525
fn run_pass<'a, 'tcx>(&self,
2626
tcx: TyCtxt<'a, 'tcx, 'tcx>,
27-
_src: MirSource,
27+
_src: MirSource<'tcx>,
2828
mir: &mut Mir<'tcx>) {
2929
remove_noop_landing_pads(tcx, mir);
3030
}

‎src/librustc_mir/transform/rustc_peek.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub struct SanityCheck;
2424

2525
impl MirPass for SanityCheck {
2626
fn run_pass<'a, 'tcx>(&self, tcx: TyCtxt<'a, 'tcx, 'tcx>,
27-
src: MirSource, mir: &mut Mir<'tcx>) {
27+
src: MirSource<'tcx>, mir: &mut Mir<'tcx>) {
2828
let def_id = src.def_id();
2929
let id = tcx.hir().as_local_node_id(def_id).unwrap();
3030
if !tcx.has_attr(def_id, "rustc_mir") {

‎src/librustc_mir/transform/simplify.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ impl MirPass for SimplifyCfg {
5959

6060
fn run_pass<'a, 'tcx>(&self,
6161
_tcx: TyCtxt<'a, 'tcx, 'tcx>,
62-
_src: MirSource,
62+
_src: MirSource<'tcx>,
6363
mir: &mut Mir<'tcx>) {
6464
debug!("SimplifyCfg({:?}) - simplifying {:?}", self.label, mir);
6565
simplify_cfg(mir);
@@ -298,7 +298,7 @@ pub struct SimplifyLocals;
298298
impl MirPass for SimplifyLocals {
299299
fn run_pass<'a, 'tcx>(&self,
300300
tcx: TyCtxt<'a, 'tcx, 'tcx>,
301-
_: MirSource,
301+
_: MirSource<'tcx>,
302302
mir: &mut Mir<'tcx>) {
303303
let mut marker = DeclMarker { locals: BitSet::new_empty(mir.local_decls.len()) };
304304
marker.visit_mir(mir);

‎src/librustc_mir/transform/simplify_branches.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ impl MirPass for SimplifyBranches {
2121

2222
fn run_pass<'a, 'tcx>(&self,
2323
tcx: TyCtxt<'a, 'tcx, 'tcx>,
24-
_src: MirSource,
24+
_src: MirSource<'tcx>,
2525
mir: &mut Mir<'tcx>) {
2626
for block in mir.basic_blocks_mut() {
2727
let terminator = block.terminator_mut();

‎src/librustc_mir/transform/uniform_array_move_out.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ pub struct UniformArrayMoveOut;
3939
impl MirPass for UniformArrayMoveOut {
4040
fn run_pass<'a, 'tcx>(&self,
4141
tcx: TyCtxt<'a, 'tcx, 'tcx>,
42-
_src: MirSource,
42+
_src: MirSource<'tcx>,
4343
mir: &mut Mir<'tcx>) {
4444
let mut patch = MirPatch::new(mir);
4545
{
@@ -161,7 +161,7 @@ pub struct RestoreSubsliceArrayMoveOut;
161161
impl MirPass for RestoreSubsliceArrayMoveOut {
162162
fn run_pass<'a, 'tcx>(&self,
163163
tcx: TyCtxt<'a, 'tcx, 'tcx>,
164-
_src: MirSource,
164+
_src: MirSource<'tcx>,
165165
mir: &mut Mir<'tcx>) {
166166
let mut patch = MirPatch::new(mir);
167167
{

‎src/librustc_mir/util/liveness.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ fn block<'tcx, V: Idx>(
307307
pub fn dump_mir<'a, 'tcx, V: Idx>(
308308
tcx: TyCtxt<'a, 'tcx, 'tcx>,
309309
pass_name: &str,
310-
source: MirSource,
310+
source: MirSource<'tcx>,
311311
mir: &Mir<'tcx>,
312312
map: &impl LiveVariableMap<LiveVar = V>,
313313
result: &LivenessResult<V>,
@@ -326,7 +326,7 @@ fn dump_matched_mir_node<'a, 'tcx, V: Idx>(
326326
tcx: TyCtxt<'a, 'tcx, 'tcx>,
327327
pass_name: &str,
328328
node_path: &str,
329-
source: MirSource,
329+
source: MirSource<'tcx>,
330330
mir: &Mir<'tcx>,
331331
map: &dyn LiveVariableMap<LiveVar = V>,
332332
result: &LivenessResult<V>,
@@ -348,7 +348,7 @@ fn dump_matched_mir_node<'a, 'tcx, V: Idx>(
348348

349349
pub fn write_mir_fn<'a, 'tcx, V: Idx>(
350350
tcx: TyCtxt<'a, 'tcx, 'tcx>,
351-
src: MirSource,
351+
src: MirSource<'tcx>,
352352
mir: &Mir<'tcx>,
353353
map: &dyn LiveVariableMap<LiveVar = V>,
354354
w: &mut dyn Write,

‎src/librustc_mir/util/pretty.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ pub fn dump_mir<'a, 'gcx, 'tcx, F>(
6868
pass_num: Option<&dyn Display>,
6969
pass_name: &str,
7070
disambiguator: &dyn Display,
71-
source: MirSource,
71+
source: MirSource<'tcx>,
7272
mir: &Mir<'tcx>,
7373
extra_data: F,
7474
) where
@@ -97,7 +97,7 @@ pub fn dump_mir<'a, 'gcx, 'tcx, F>(
9797
pub fn dump_enabled<'a, 'gcx, 'tcx>(
9898
tcx: TyCtxt<'a, 'gcx, 'tcx>,
9999
pass_name: &str,
100-
source: MirSource,
100+
source: MirSource<'tcx>,
101101
) -> bool {
102102
let filters = match tcx.sess.opts.debugging_opts.dump_mir {
103103
None => return false,
@@ -124,7 +124,7 @@ fn dump_matched_mir_node<'a, 'gcx, 'tcx, F>(
124124
pass_name: &str,
125125
node_path: &str,
126126
disambiguator: &dyn Display,
127-
source: MirSource,
127+
source: MirSource<'tcx>,
128128
mir: &Mir<'tcx>,
129129
mut extra_data: F,
130130
) where
@@ -164,7 +164,7 @@ fn dump_path(
164164
pass_num: Option<&dyn Display>,
165165
pass_name: &str,
166166
disambiguator: &dyn Display,
167-
source: MirSource,
167+
source: MirSource<'tcx>,
168168
) -> PathBuf {
169169
let promotion_id = match source.promoted {
170170
Some(id) => format!("-{:?}", id),
@@ -231,7 +231,7 @@ pub(crate) fn create_dump_file(
231231
pass_num: Option<&dyn Display>,
232232
pass_name: &str,
233233
disambiguator: &dyn Display,
234-
source: MirSource,
234+
source: MirSource<'tcx>,
235235
) -> io::Result<fs::File> {
236236
let file_path = dump_path(tcx, extension, pass_num, pass_name, disambiguator, source);
237237
if let Some(parent) = file_path.parent() {
@@ -282,7 +282,7 @@ pub fn write_mir_pretty<'a, 'gcx, 'tcx>(
282282

283283
pub fn write_mir_fn<'a, 'gcx, 'tcx, F>(
284284
tcx: TyCtxt<'a, 'gcx, 'tcx>,
285-
src: MirSource,
285+
src: MirSource<'tcx>,
286286
mir: &Mir<'tcx>,
287287
extra_data: &mut F,
288288
w: &mut dyn Write,
@@ -546,7 +546,7 @@ fn write_scope_tree(
546546
/// local variables (both user-defined bindings and compiler temporaries).
547547
pub fn write_mir_intro<'a, 'gcx, 'tcx>(
548548
tcx: TyCtxt<'a, 'gcx, 'tcx>,
549-
src: MirSource,
549+
src: MirSource<'tcx>,
550550
mir: &Mir<'_>,
551551
w: &mut dyn Write,
552552
) -> io::Result<()> {
@@ -588,7 +588,7 @@ pub fn write_mir_intro<'a, 'gcx, 'tcx>(
588588

589589
fn write_mir_sig(
590590
tcx: TyCtxt<'_, '_, '_>,
591-
src: MirSource,
591+
src: MirSource<'tcx>,
592592
mir: &Mir<'_>,
593593
w: &mut dyn Write,
594594
) -> io::Result<()> {

0 commit comments

Comments
 (0)