use syntax::ast::{self, NodeId};
use rustc_front::hir;
-use rustc_front::visit::{self, Visitor, FnKind};
+use rustc_front::intravisit::{self, Visitor, FnKind};
use rustc_front::hir::{Block, Item, FnDecl, Arm, Pat, Stmt, Expr, Local};
use rustc_front::util::stmt_id;
{
// This block should be kept approximately in sync with
- // `visit::walk_block`. (We manually walk the block, rather
+ // `intravisit::walk_block`. (We manually walk the block, rather
// than call `walk_block`, in order to maintain precise
// index information.)
visitor.terminating_scopes.insert(expr.id);
}
- visit::walk_arm(visitor, arm);
+ intravisit::walk_arm(visitor, arm);
}
fn resolve_pat(visitor: &mut RegionResolutionVisitor, pat: &hir::Pat) {
_ => { }
}
- visit::walk_pat(visitor, pat);
+ intravisit::walk_pat(visitor, pat);
}
fn resolve_stmt(visitor: &mut RegionResolutionVisitor, stmt: &hir::Stmt) {
let prev_parent = visitor.cx.parent;
visitor.cx.parent = stmt_extent;
- visit::walk_stmt(visitor, stmt);
+ intravisit::walk_stmt(visitor, stmt);
visitor.cx.parent = prev_parent;
}
}
}
- visit::walk_expr(visitor, expr);
+ intravisit::walk_expr(visitor, expr);
visitor.cx = prev_cx;
}
None => { }
}
- visit::walk_local(visitor, local);
+ intravisit::walk_local(visitor, local);
/// True if `pat` match the `P&` nonterminal:
///
var_parent: ROOT_CODE_EXTENT,
parent: ROOT_CODE_EXTENT
};
- visit::walk_item(visitor, item);
+ intravisit::walk_item(visitor, item);
visitor.create_item_scope_if_needed(item.id);
visitor.cx = prev_cx;
visitor.terminating_scopes = prev_ts;
var_parent: fn_decl_scope,
};
- visit::walk_fn_decl(visitor, decl);
- visit::walk_fn_kind(visitor, kind);
+ intravisit::walk_fn_decl(visitor, decl);
+ intravisit::walk_fn_kind(visitor, kind);
// The body of the every fn is a root scope.
visitor.cx = Context {
}
fn visit_impl_item(&mut self, ii: &hir::ImplItem) {
- visit::walk_impl_item(self, ii);
+ intravisit::walk_impl_item(self, ii);
self.create_item_scope_if_needed(ii.id);
}
fn visit_trait_item(&mut self, ti: &hir::TraitItem) {
- visit::walk_trait_item(self, ti);
+ intravisit::walk_trait_item(self, ti);
self.create_item_scope_if_needed(ti.id);
}
},
terminating_scopes: NodeSet()
};
- visit::walk_crate(&mut visitor, krate);
+ krate.visit_all_items(&mut visitor);
}
return maps;
}