bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Remove in_band_lifetimes from rustc_incremental

Browse source
This commit is contained in:
Peter Jaszkowiak 2021-12-13 21:49:21 -07:00
parent 8f117a77d0
commit 5e22500754
4 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_incremental/src/assert_dep_graph.rs
View file

@ -103,7 +103,7 @@ struct IfThisChanged<'tcx> {
then_this_would_need: Targets, then_this_would_need: Targets,
} }
impl IfThisChanged<'tcx> { impl<'tcx> IfThisChanged<'tcx> {
fn argument(&self, attr: &ast::Attribute) -> Option<Symbol> { fn argument(&self, attr: &ast::Attribute) -> Option<Symbol> {
let mut value = None; let mut value = None;
for list_item in attr.meta_item_list().unwrap_or_default() { for list_item in attr.meta_item_list().unwrap_or_default() {
@ -172,7 +172,7 @@ impl IfThisChanged<'tcx> {
} }
} }
impl Visitor<'tcx> for IfThisChanged<'tcx> { impl<'tcx> Visitor<'tcx> for IfThisChanged<'tcx> {
type Map = Map<'tcx>; type Map = Map<'tcx>;
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> { fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {

2
compiler/rustc_incremental/src/assert_module_sources.rs
View file

@ -56,7 +56,7 @@ struct AssertModuleSource<'tcx> {
available_cgus: BTreeSet<String>, available_cgus: BTreeSet<String>,
} }
impl AssertModuleSource<'tcx> { impl<'tcx> AssertModuleSource<'tcx> {
fn check_attr(&self, attr: &ast::Attribute) { fn check_attr(&self, attr: &ast::Attribute) {
let (expected_reuse, comp_kind) = if attr.has_name(sym::rustc_partition_reused) { let (expected_reuse, comp_kind) = if attr.has_name(sym::rustc_partition_reused) {
(CguReuse::PreLto, ComparisonKind::AtLeast) (CguReuse::PreLto, ComparisonKind::AtLeast)

1
compiler/rustc_incremental/src/lib.rs
View file

@ -2,7 +2,6 @@
#![deny(missing_docs)] #![deny(missing_docs)]
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")] #![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
#![feature(in_band_lifetimes)]
#![feature(let_else)] #![feature(let_else)]
#![feature(nll)] #![feature(nll)]
#![recursion_limit = "256"] #![recursion_limit = "256"]

8
compiler/rustc_incremental/src/persist/dirty_clean.rs
View file

@ -155,7 +155,7 @@ pub struct DirtyCleanVisitor<'tcx> {
checked_attrs: FxHashSet<ast::AttrId>, checked_attrs: FxHashSet<ast::AttrId>,
} }
impl DirtyCleanVisitor<'tcx> { impl<'tcx> DirtyCleanVisitor<'tcx> {
/// Possibly "deserialize" the attribute into a clean/dirty assertion /// Possibly "deserialize" the attribute into a clean/dirty assertion
fn assertion_maybe(&mut self, item_id: LocalDefId, attr: &Attribute) -> Option<Assertion> { fn assertion_maybe(&mut self, item_id: LocalDefId, attr: &Attribute) -> Option<Assertion> {
if !attr.has_name(sym::rustc_clean) { if !attr.has_name(sym::rustc_clean) {
@ -352,7 +352,7 @@ impl DirtyCleanVisitor<'tcx> {
} }
} }
impl ItemLikeVisitor<'tcx> for DirtyCleanVisitor<'tcx> { impl<'tcx> ItemLikeVisitor<'tcx> for DirtyCleanVisitor<'tcx> {
fn visit_item(&mut self, item: &'tcx hir::Item<'tcx>) { fn visit_item(&mut self, item: &'tcx hir::Item<'tcx>) {
self.check_item(item.def_id, item.span); self.check_item(item.def_id, item.span);
} }
@ -415,7 +415,7 @@ pub struct FindAllAttrs<'tcx> {
found_attrs: Vec<&'tcx Attribute>, found_attrs: Vec<&'tcx Attribute>,
} }
impl FindAllAttrs<'tcx> { impl<'tcx> FindAllAttrs<'tcx> {
fn is_active_attr(&mut self, attr: &Attribute) -> bool { fn is_active_attr(&mut self, attr: &Attribute) -> bool {
if attr.has_name(sym::rustc_clean) && check_config(self.tcx, attr) { if attr.has_name(sym::rustc_clean) && check_config(self.tcx, attr) {
return true; return true;
@ -434,7 +434,7 @@ impl FindAllAttrs<'tcx> {
} }
} }
impl intravisit::Visitor<'tcx> for FindAllAttrs<'tcx> { impl<'tcx> intravisit::Visitor<'tcx> for FindAllAttrs<'tcx> {
type Map = Map<'tcx>; type Map = Map<'tcx>;
fn nested_visit_map(&mut self) -> intravisit::NestedVisitorMap<Self::Map> { fn nested_visit_map(&mut self) -> intravisit::NestedVisitorMap<Self::Map> {