user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Split nested_visit_mode function off from nested_visit_map

Browse source 
... and make the latter mandatory to implement.
This commit is contained in:
Florian Diebold 2016-11-24 20:15:11 +01:00 • committed by Florian Diebold
parent 725cffb1d5
commit f0ce5bb66b
35 changed files with 160 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/librustc_metadata/astencode.rs
View file

@ -11,7 +11,7 @@
use rustc::hir;
use rustc::hir::map as ast_map;
use rustc::hir::intravisit::{Visitor, IdRangeComputingVisitor, IdRange, NestedVisitMode};
use rustc::hir::intravisit::{Visitor, IdRangeComputingVisitor, IdRange};
use cstore::CrateMetadata;
use encoder::EncodeContext;
@ -75,8 +75,8 @@ struct SideTableEncodingIdVisitor<'a, 'b: 'a, 'tcx: 'b> {
}
impl<'a, 'b, 'tcx> Visitor<'tcx> for SideTableEncodingIdVisitor<'a, 'b, 'tcx> {
fn nested_visit_map(&mut self) -> Option<(&hir::map::Map<'tcx>, NestedVisitMode)> {
Some((&self.ecx.tcx.map, NestedVisitMode::OnlyBodies))
fn nested_visit_map(&mut self) -> Option<&hir::map::Map<'tcx>> {
Some(&self.ecx.tcx.map)
}
fn visit_id(&mut self, id: ast::NodeId) {

6
src/librustc_metadata/encoder.rs
View file

@ -39,7 +39,7 @@ use syntax_pos;
use rustc::hir::{self, PatKind};
use rustc::hir::itemlikevisit::ItemLikeVisitor;
use rustc::hir::intravisit::{Visitor, NestedVisitMode};
use rustc::hir::intravisit::{Visitor};
use rustc::hir::intravisit;
use super::index_builder::{FromId, IndexBuilder, Untracked};
@ -983,8 +983,8 @@ struct EncodeVisitor<'a, 'b: 'a, 'tcx: 'b> {
}
impl<'a, 'b, 'tcx> Visitor<'tcx> for EncodeVisitor<'a, 'b, 'tcx> {
fn nested_visit_map(&mut self) -> Option<(&hir::map::Map<'tcx>, NestedVisitMode)> {
Some((&self.index.tcx.map, NestedVisitMode::OnlyBodies))
fn nested_visit_map(&mut self) -> Option<&hir::map::Map<'tcx>> {
Some(&self.index.tcx.map)
}
fn visit_expr(&mut self, ex: &'tcx hir::Expr) {
intravisit::walk_expr(self, ex);