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

Auto merge of #44435 - alexcrichton:in-scope, r=michaelwoerister

Browse source 
rustc: Remove HirId from queries

This'll allow us to reconstruct query parameters purely from the `DepNode`
they're associated with.

Closes #44414
This commit is contained in:
bors 2017-09-11 15:35:35 +00:00
commit efa3ec67e2
16 changed files with 142 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/librustdoc/build.rs
View file

@ -24,6 +24,7 @@ fn main() {
.file("../rt/hoedown/src/html_smartypants.c")
.file("../rt/hoedown/src/stack.c")
.file("../rt/hoedown/src/version.c")
.warnings(false)
.include(src_dir)
.compile("libhoedown.a");
}

8
src/librustdoc/visit_ast.rs
View file

@ -199,8 +199,8 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
self.visit_item(item, None, &mut om);
}
self.inside_public_path = orig_inside_public_path;
let hir_id = self.cx.tcx.hir.node_to_hir_id(id);
if let Some(exports) = self.cx.tcx.module_exports(hir_id) {
let def_id = self.cx.tcx.hir.local_def_id(id);
if let Some(exports) = self.cx.tcx.module_exports(def_id) {
for export in exports.iter() {
if let Def::Macro(def_id, ..) = export.def {
if def_id.krate == LOCAL_CRATE || self.reexported_macros.contains(&def_id) {
@ -372,9 +372,9 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
_ if self.inlining && item.vis != hir::Public => {}
hir::ItemGlobalAsm(..) => {}
hir::ItemExternCrate(ref p) => {
let hir_id = self.cx.tcx.hir.node_to_hir_id(item.id);
let def_id = self.cx.tcx.hir.local_def_id(item.id);
om.extern_crates.push(ExternCrate {
cnum: self.cx.tcx.extern_mod_stmt_cnum(hir_id)
cnum: self.cx.tcx.extern_mod_stmt_cnum(def_id)
.unwrap_or(LOCAL_CRATE),
name,
path: p.map(|x|x.to_string()),