Skip to content

Commit f0b7142

Browse files
committed
Remove in_band_lifetimes for rustc_monomorphize
1 parent 8f117a7 commit f0b7142

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

Diff for: compiler/rustc_monomorphize/src/collector.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ fn record_accesses<'a, 'tcx: 'a>(
498498
/// the user's terminal with thousands of lines of type-name.
499499
///
500500
/// If the type name is longer than before+after, it will be written to a file.
501-
fn shrunk_instance_name(
501+
fn shrunk_instance_name<'tcx>(
502502
tcx: TyCtxt<'tcx>,
503503
instance: &Instance<'tcx>,
504504
before: usize,
@@ -1145,7 +1145,7 @@ struct RootCollector<'a, 'tcx> {
11451145
entry_fn: Option<(DefId, EntryFnType)>,
11461146
}
11471147

1148-
impl ItemLikeVisitor<'v> for RootCollector<'_, 'v> {
1148+
impl<'v> ItemLikeVisitor<'v> for RootCollector<'_, 'v> {
11491149
fn visit_item(&mut self, item: &'v hir::Item<'v>) {
11501150
match item.kind {
11511151
hir::ItemKind::ExternCrate(..)
@@ -1225,7 +1225,7 @@ impl ItemLikeVisitor<'v> for RootCollector<'_, 'v> {
12251225
fn visit_foreign_item(&mut self, _foreign_item: &'v hir::ForeignItem<'v>) {}
12261226
}
12271227

1228-
impl RootCollector<'_, 'v> {
1228+
impl<'v> RootCollector<'_, 'v> {
12291229
fn is_root(&self, def_id: LocalDefId) -> bool {
12301230
!item_requires_monomorphization(self.tcx, def_id)
12311231
&& match self.mode {

Diff for: compiler/rustc_monomorphize/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#![feature(crate_visibility_modifier)]
44
#![feature(control_flow_enum)]
55
#![feature(let_else)]
6-
#![feature(in_band_lifetimes)]
76
#![recursion_limit = "256"]
87

98
#[macro_use]

Diff for: compiler/rustc_monomorphize/src/partitioning/default.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ fn fallback_cgu_name(name_builder: &mut CodegenUnitNameBuilder<'_>) -> Symbol {
378378
name_builder.build_cgu_name(LOCAL_CRATE, &["fallback"], Some("cgu"))
379379
}
380380

381-
fn mono_item_linkage_and_visibility(
381+
fn mono_item_linkage_and_visibility<'tcx>(
382382
tcx: TyCtxt<'tcx>,
383383
mono_item: &MonoItem<'tcx>,
384384
can_be_internalized: &mut bool,
@@ -393,7 +393,7 @@ fn mono_item_linkage_and_visibility(
393393

394394
type CguNameCache = FxHashMap<(DefId, bool), Symbol>;
395395

396-
fn mono_item_visibility(
396+
fn mono_item_visibility<'tcx>(
397397
tcx: TyCtxt<'tcx>,
398398
mono_item: &MonoItem<'tcx>,
399399
can_be_internalized: &mut bool,

Diff for: compiler/rustc_monomorphize/src/util.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use std::io::prelude::*;
77
///
88
/// During the same compile all closures dump the information in the same file
99
/// "closure_profile_XXXXX.csv", which is created in the directory where the compiler is invoked.
10-
crate fn dump_closure_profile(tcx: TyCtxt<'tcx>, closure_instance: Instance<'tcx>) {
10+
crate fn dump_closure_profile<'tcx>(tcx: TyCtxt<'tcx>, closure_instance: Instance<'tcx>) {
1111
let mut file = if let Ok(file) = OpenOptions::new()
1212
.create(true)
1313
.append(true)

0 commit comments

Comments
 (0)