bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #46368 - michaelwoerister:incr-comp-type-debuginfo-spans, r=eddyb

Browse source 
incr.comp.: Remove an unnecessary HIR access which enables hashing spans for type definitions.

r? @nikomatsakis
This commit is contained in:
bors 2017-12-02 17:37:56 +00:00
commit 377decc352
2 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/librustc/ich/impls_hir.rs
View file

@ -884,13 +884,13 @@ impl<'gcx> HashStable<StableHashingContext<'gcx>> for hir::Item {
fn hash_stable<W: StableHasherResult>(&self, fn hash_stable<W: StableHasherResult>(&self,
hcx: &mut StableHashingContext<'gcx>, hcx: &mut StableHashingContext<'gcx>,
hasher: &mut StableHasher<W>) { hasher: &mut StableHasher<W>) {
let (is_const, hash_spans) = match self.node { let is_const = match self.node {
hir::ItemStatic(..) | hir::ItemStatic(..) |
hir::ItemConst(..) => { hir::ItemConst(..) => {
(true, hcx.hash_spans()) true
} }
hir::ItemFn(_, _, constness, ..) => { hir::ItemFn(_, _, constness, ..) => {
(constness == hir::Constness::Const, hcx.hash_spans()) constness == hir::Constness::Const
} }
hir::ItemUse(..) | hir::ItemUse(..) |
hir::ItemExternCrate(..) | hir::ItemExternCrate(..) |
@ -904,7 +904,7 @@ impl<'gcx> HashStable<StableHashingContext<'gcx>> for hir::Item {
hir::ItemEnum(..) | hir::ItemEnum(..) |
hir::ItemStruct(..) | hir::ItemStruct(..) |
hir::ItemUnion(..) => { hir::ItemUnion(..) => {
(false, false) false
} }
}; };
@ -919,13 +919,11 @@ impl<'gcx> HashStable<StableHashingContext<'gcx>> for hir::Item {
} = *self; } = *self;
hcx.hash_hir_item_like(attrs, is_const, |hcx| { hcx.hash_hir_item_like(attrs, is_const, |hcx| {
hcx.while_hashing_spans(hash_spans, |hcx| { name.hash_stable(hcx, hasher);
name.hash_stable(hcx, hasher); attrs.hash_stable(hcx, hasher);
attrs.hash_stable(hcx, hasher); node.hash_stable(hcx, hasher);
node.hash_stable(hcx, hasher); vis.hash_stable(hcx, hasher);
vis.hash_stable(hcx, hasher); span.hash_stable(hcx, hasher);
span.hash_stable(hcx, hasher);
});
}); });
} }
} }

4
src/librustc/ty/mod.rs
View file

@ -2302,9 +2302,7 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
} }
pub fn item_name(self, id: DefId) -> InternedString { pub fn item_name(self, id: DefId) -> InternedString {
if let Some(id) = self.hir.as_local_node_id(id) { if id.index == CRATE_DEF_INDEX {
self.hir.name(id).as_str()
} else if id.index == CRATE_DEF_INDEX {
self.original_crate_name(id.krate).as_str() self.original_crate_name(id.krate).as_str()
} else { } else {
let def_key = self.def_key(id); let def_key = self.def_key(id);