1
Fork 0

Stop using walk_crate.

This commit is contained in:
Camille GILLOT 2021-08-26 18:42:08 +02:00
parent ad3407f482
commit 7ec973d9ce
15 changed files with 45 additions and 39 deletions

View file

@ -775,5 +775,5 @@ pub fn check_crate(tcx: TyCtxt<'_>) {
let krate = tcx.hir().krate();
let live_symbols = find_live(tcx, access_levels, krate);
let mut visitor = DeadVisitor { tcx, live_symbols };
intravisit::walk_crate(&mut visitor, krate);
tcx.hir().walk_crate(&mut visitor);
}

View file

@ -36,7 +36,7 @@ pub fn print_hir_stats(krate: &hir::Crate<'_>) {
data: FxHashMap::default(),
seen: FxHashSet::default(),
};
hir_visit::walk_crate(&mut collector, krate);
hir_visit::walk_crate_and_attributes(&mut collector, krate);
collector.print("HIR STATS");
}

View file

@ -6,7 +6,7 @@
use rustc_ast::{Attribute, MetaItem, MetaItemKind};
use rustc_errors::struct_span_err;
use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
use rustc_hir::intravisit::{NestedVisitorMap, Visitor};
use rustc_middle::hir::map::Map;
use rustc_middle::middle::lib_features::LibFeatures;
use rustc_middle::ty::query::Providers;
@ -126,9 +126,7 @@ impl Visitor<'tcx> for LibFeatureCollector<'tcx> {
fn get_lib_features(tcx: TyCtxt<'_>, (): ()) -> LibFeatures {
let mut collector = LibFeatureCollector::new(tcx);
let krate = tcx.hir().krate();
intravisit::walk_crate(&mut collector, krate);
tcx.hir().walk_attributes(&mut collector);
collector.lib_features
}

View file

@ -8,6 +8,7 @@ use rustc_errors::struct_span_err;
use rustc_hir as hir;
use rustc_hir::def::{DefKind, Res};
use rustc_hir::def_id::{DefId, LocalDefId, CRATE_DEF_ID, CRATE_DEF_INDEX, LOCAL_CRATE};
use rustc_hir::hir_id::CRATE_HIR_ID;
use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
use rustc_hir::{FieldDef, Generics, HirId, Item, TraitRef, Ty, TyKind, Variant};
use rustc_middle::hir::map::Map;
@ -678,7 +679,6 @@ fn stability_index(tcx: TyCtxt<'tcx>, (): ()) -> Index<'tcx> {
.collect();
{
let krate = tcx.hir().krate();
let mut annotator = Annotator {
tcx,
index: &mut index,
@ -711,13 +711,13 @@ fn stability_index(tcx: TyCtxt<'tcx>, (): ()) -> Index<'tcx> {
annotator.annotate(
CRATE_DEF_ID,
krate.module().inner,
tcx.hir().span(CRATE_HIR_ID),
None,
AnnotationKind::Required,
InheritDeprecation::Yes,
InheritConstStability::No,
InheritStability::No,
|v| intravisit::walk_crate(v, krate),
|v| tcx.hir().walk_crate(v),
);
}
index
@ -908,8 +908,8 @@ pub fn check_unused_or_stable_features(tcx: TyCtxt<'_>) {
if tcx.stability().staged_api[&LOCAL_CRATE] {
let krate = tcx.hir().krate();
let mut missing = MissingStabilityAnnotations { tcx, access_levels };
missing.check_missing_stability(CRATE_DEF_ID, krate.module().inner);
intravisit::walk_crate(&mut missing, krate);
missing.check_missing_stability(CRATE_DEF_ID, tcx.hir().span(CRATE_HIR_ID));
tcx.hir().walk_crate(&mut missing);
krate.visit_all_item_likes(&mut missing.as_deep_visitor());
}