Auto merge of #41919 - nrc:save-crate, r=eddyb
Include the crate's root module in save-analysis r? @eddyb
This commit is contained in:
commit
93dd1cab5d
|
@ -1055,7 +1055,7 @@ impl<'a> ast_visit::Visitor<'a> for EarlyContext<'a> {
|
|||
run_lints!(self, check_ident, early_passes, sp, id);
|
||||
}
|
||||
|
||||
fn visit_mod(&mut self, m: &'a ast::Mod, s: Span, n: ast::NodeId) {
|
||||
fn visit_mod(&mut self, m: &'a ast::Mod, s: Span, _a: &[ast::Attribute], n: ast::NodeId) {
|
||||
run_lints!(self, check_mod, early_passes, m, s, n);
|
||||
ast_visit::walk_mod(self, m);
|
||||
run_lints!(self, check_mod_post, early_passes, m, s, n);
|
||||
|
|
|
@ -252,7 +252,7 @@ impl<'v> hir_visit::Visitor<'v> for StatCollector<'v> {
|
|||
|
||||
impl<'v> ast_visit::Visitor<'v> for StatCollector<'v> {
|
||||
|
||||
fn visit_mod(&mut self, m: &'v ast::Mod, _s: Span, _n: NodeId) {
|
||||
fn visit_mod(&mut self, m: &'v ast::Mod, _s: Span, _a: &[ast::Attribute], _n: NodeId) {
|
||||
self.record("Mod", Id::None, m);
|
||||
ast_visit::walk_mod(self, m)
|
||||
}
|
||||
|
|
|
@ -267,7 +267,7 @@ pub struct ModData {
|
|||
pub items: Vec<NodeId>,
|
||||
pub visibility: Visibility,
|
||||
pub docs: String,
|
||||
pub sig: Signature,
|
||||
pub sig: Option<Signature>,
|
||||
pub attributes: Vec<Attribute>,
|
||||
}
|
||||
|
||||
|
|
|
@ -1211,6 +1211,31 @@ impl<'l, 'tcx: 'l, 'll, D: Dump + 'll> DumpVisitor<'l, 'tcx, 'll, D> {
|
|||
}
|
||||
|
||||
impl<'l, 'tcx: 'l, 'll, D: Dump +'ll> Visitor<'l> for DumpVisitor<'l, 'tcx, 'll, D> {
|
||||
fn visit_mod(&mut self, m: &'l ast::Mod, span: Span, attrs: &[ast::Attribute], id: NodeId) {
|
||||
// Since we handle explicit modules ourselves in visit_item, this should
|
||||
// only get called for the root module of a crate.
|
||||
assert_eq!(id, ast::CRATE_NODE_ID);
|
||||
|
||||
let qualname = format!("::{}", self.tcx.node_path_str(id));
|
||||
|
||||
let cm = self.tcx.sess.codemap();
|
||||
let filename = cm.span_to_filename(span);
|
||||
self.dumper.mod_data(ModData {
|
||||
id: id,
|
||||
name: String::new(),
|
||||
qualname: qualname,
|
||||
span: span,
|
||||
scope: id,
|
||||
filename: filename,
|
||||
items: m.items.iter().map(|i| i.id).collect(),
|
||||
visibility: Visibility::Public,
|
||||
docs: docs_for_attrs(attrs),
|
||||
sig: None,
|
||||
attributes: attrs.to_owned(),
|
||||
}.lower(self.tcx));
|
||||
self.nest_scope(id, |v| visit::walk_mod(v, m));
|
||||
}
|
||||
|
||||
fn visit_item(&mut self, item: &'l ast::Item) {
|
||||
use syntax::ast::ItemKind::*;
|
||||
self.process_macro_use(item.span, item.id);
|
||||
|
|
|
@ -392,7 +392,7 @@ pub struct ModData {
|
|||
pub items: Vec<DefId>,
|
||||
pub visibility: Visibility,
|
||||
pub docs: String,
|
||||
pub sig: Signature,
|
||||
pub sig: Option<Signature>,
|
||||
pub attributes: Vec<Attribute>,
|
||||
}
|
||||
|
||||
|
@ -410,7 +410,7 @@ impl Lower for data::ModData {
|
|||
items: self.items.into_iter().map(|id| make_def_id(id, &tcx.hir)).collect(),
|
||||
visibility: self.visibility,
|
||||
docs: self.docs,
|
||||
sig: self.sig.lower(tcx),
|
||||
sig: self.sig.map(|s| s.lower(tcx)),
|
||||
attributes: self.attributes.lower(tcx),
|
||||
}
|
||||
}
|
||||
|
|
|
@ -293,7 +293,7 @@ impl Into<Option<Def>> for ModData {
|
|||
parent: None,
|
||||
decl_id: None,
|
||||
docs: self.docs,
|
||||
sig: Some(self.sig.into()),
|
||||
sig: self.sig.map(|s| s.into()),
|
||||
attributes: vec![],
|
||||
}),
|
||||
_ => None,
|
||||
|
|
|
@ -121,7 +121,7 @@ impl<'b, O: DumpOutput + 'b> Dump for JsonDumper<O> {
|
|||
children: data.items.into_iter().map(|id| id_from_def_id(id)).collect(),
|
||||
decl_id: None,
|
||||
docs: data.docs,
|
||||
sig: Some(data.sig.into()),
|
||||
sig: data.sig.map(|s| s.into()),
|
||||
attributes: data.attributes.into_iter().map(|a| a.into()).collect(),
|
||||
};
|
||||
if def.span.file_name.to_str().unwrap() != def.value {
|
||||
|
|
|
@ -258,7 +258,7 @@ impl<'l, 'tcx: 'l> SaveContext<'l, 'tcx> {
|
|||
items: m.items.iter().map(|i| i.id).collect(),
|
||||
visibility: From::from(&item.vis),
|
||||
docs: docs_for_attrs(&item.attrs),
|
||||
sig: self.sig_base(item),
|
||||
sig: Some(self.sig_base(item)),
|
||||
attributes: item.attrs.clone(),
|
||||
}))
|
||||
}
|
||||
|
|
|
@ -31,7 +31,7 @@ impl<'ast> Visitor<'ast> for NodeCounter {
|
|||
self.count += 1;
|
||||
walk_ident(self, span, ident);
|
||||
}
|
||||
fn visit_mod(&mut self, m: &Mod, _s: Span, _n: NodeId) {
|
||||
fn visit_mod(&mut self, m: &Mod, _s: Span, _a: &[Attribute], _n: NodeId) {
|
||||
self.count += 1;
|
||||
walk_mod(self, m)
|
||||
}
|
||||
|
|
|
@ -56,7 +56,9 @@ pub trait Visitor<'ast>: Sized {
|
|||
fn visit_ident(&mut self, span: Span, ident: Ident) {
|
||||
walk_ident(self, span, ident);
|
||||
}
|
||||
fn visit_mod(&mut self, m: &'ast Mod, _s: Span, _n: NodeId) { walk_mod(self, m) }
|
||||
fn visit_mod(&mut self, m: &'ast Mod, _s: Span, _attrs: &[Attribute], _n: NodeId) {
|
||||
walk_mod(self, m);
|
||||
}
|
||||
fn visit_foreign_item(&mut self, i: &'ast ForeignItem) { walk_foreign_item(self, i) }
|
||||
fn visit_global_asm(&mut self, ga: &'ast GlobalAsm) { walk_global_asm(self, ga) }
|
||||
fn visit_item(&mut self, i: &'ast Item) { walk_item(self, i) }
|
||||
|
@ -172,7 +174,7 @@ pub fn walk_ident<'a, V: Visitor<'a>>(visitor: &mut V, span: Span, ident: Ident)
|
|||
}
|
||||
|
||||
pub fn walk_crate<'a, V: Visitor<'a>>(visitor: &mut V, krate: &'a Crate) {
|
||||
visitor.visit_mod(&krate.module, krate.span, CRATE_NODE_ID);
|
||||
visitor.visit_mod(&krate.module, krate.span, &krate.attrs, CRATE_NODE_ID);
|
||||
walk_list!(visitor, visit_attribute, &krate.attrs);
|
||||
}
|
||||
|
||||
|
@ -249,7 +251,7 @@ pub fn walk_item<'a, V: Visitor<'a>>(visitor: &mut V, item: &'a Item) {
|
|||
item.id)
|
||||
}
|
||||
ItemKind::Mod(ref module) => {
|
||||
visitor.visit_mod(module, item.span, item.id)
|
||||
visitor.visit_mod(module, item.span, &item.attrs, item.id)
|
||||
}
|
||||
ItemKind::ForeignMod(ref foreign_module) => {
|
||||
walk_list!(visitor, visit_foreign_item, &foreign_module.items);
|
||||
|
|
|
@ -329,7 +329,7 @@ impl<'a> Visitor<'a> for CollectProcMacros<'a> {
|
|||
visit::walk_item(self, item);
|
||||
}
|
||||
|
||||
fn visit_mod(&mut self, m: &'a ast::Mod, _s: Span, id: NodeId) {
|
||||
fn visit_mod(&mut self, m: &'a ast::Mod, _s: Span, _a: &[ast::Attribute], id: NodeId) {
|
||||
let mut prev_in_root = self.in_root;
|
||||
if id != ast::CRATE_NODE_ID {
|
||||
prev_in_root = mem::replace(&mut self.in_root, false);
|
||||
|
|
Loading…
Reference in New Issue