Skip to content

Commit 8039087

Browse files
authored
Rollup merge of #91894 - pitaj:91867-incremental, r=Aaron1011
Remove `in_band_lifetimes` from `rustc_incremental` #91867
2 parents 3f4013d + 5e22500 commit 8039087

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

compiler/rustc_incremental/src/assert_dep_graph.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ struct IfThisChanged<'tcx> {
103103
then_this_would_need: Targets,
104104
}
105105

106-
impl IfThisChanged<'tcx> {
106+
impl<'tcx> IfThisChanged<'tcx> {
107107
fn argument(&self, attr: &ast::Attribute) -> Option<Symbol> {
108108
let mut value = None;
109109
for list_item in attr.meta_item_list().unwrap_or_default() {
@@ -172,7 +172,7 @@ impl IfThisChanged<'tcx> {
172172
}
173173
}
174174

175-
impl Visitor<'tcx> for IfThisChanged<'tcx> {
175+
impl<'tcx> Visitor<'tcx> for IfThisChanged<'tcx> {
176176
type Map = Map<'tcx>;
177177

178178
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {

compiler/rustc_incremental/src/assert_module_sources.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ struct AssertModuleSource<'tcx> {
5656
available_cgus: BTreeSet<String>,
5757
}
5858

59-
impl AssertModuleSource<'tcx> {
59+
impl<'tcx> AssertModuleSource<'tcx> {
6060
fn check_attr(&self, attr: &ast::Attribute) {
6161
let (expected_reuse, comp_kind) = if attr.has_name(sym::rustc_partition_reused) {
6262
(CguReuse::PreLto, ComparisonKind::AtLeast)

compiler/rustc_incremental/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
33
#![deny(missing_docs)]
44
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
5-
#![feature(in_band_lifetimes)]
65
#![feature(let_else)]
76
#![feature(nll)]
87
#![recursion_limit = "256"]

compiler/rustc_incremental/src/persist/dirty_clean.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ pub struct DirtyCleanVisitor<'tcx> {
155155
checked_attrs: FxHashSet<ast::AttrId>,
156156
}
157157

158-
impl DirtyCleanVisitor<'tcx> {
158+
impl<'tcx> DirtyCleanVisitor<'tcx> {
159159
/// Possibly "deserialize" the attribute into a clean/dirty assertion
160160
fn assertion_maybe(&mut self, item_id: LocalDefId, attr: &Attribute) -> Option<Assertion> {
161161
if !attr.has_name(sym::rustc_clean) {
@@ -352,7 +352,7 @@ impl DirtyCleanVisitor<'tcx> {
352352
}
353353
}
354354

355-
impl ItemLikeVisitor<'tcx> for DirtyCleanVisitor<'tcx> {
355+
impl<'tcx> ItemLikeVisitor<'tcx> for DirtyCleanVisitor<'tcx> {
356356
fn visit_item(&mut self, item: &'tcx hir::Item<'tcx>) {
357357
self.check_item(item.def_id, item.span);
358358
}
@@ -415,7 +415,7 @@ pub struct FindAllAttrs<'tcx> {
415415
found_attrs: Vec<&'tcx Attribute>,
416416
}
417417

418-
impl FindAllAttrs<'tcx> {
418+
impl<'tcx> FindAllAttrs<'tcx> {
419419
fn is_active_attr(&mut self, attr: &Attribute) -> bool {
420420
if attr.has_name(sym::rustc_clean) && check_config(self.tcx, attr) {
421421
return true;
@@ -434,7 +434,7 @@ impl FindAllAttrs<'tcx> {
434434
}
435435
}
436436

437-
impl intravisit::Visitor<'tcx> for FindAllAttrs<'tcx> {
437+
impl<'tcx> intravisit::Visitor<'tcx> for FindAllAttrs<'tcx> {
438438
type Map = Map<'tcx>;
439439

440440
fn nested_visit_map(&mut self) -> intravisit::NestedVisitorMap<Self::Map> {

0 commit comments

Comments
 (0)