Skip to content

Commit 554b428

Browse files
committed
incremental: Do not hash spans for things that didn't have spans previously
1 parent d5e9dff commit 554b428

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/librustc/ich/impls_hir.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ impl_stable_hash_for!(struct hir::Path {
171171
});
172172

173173
impl_stable_hash_for!(struct hir::PathSegment {
174-
ident,
174+
ident -> (ident.name),
175175
infer_types,
176176
args
177177
});
@@ -276,7 +276,7 @@ impl_stable_hash_for!(struct hir::MethodSig {
276276

277277
impl_stable_hash_for!(struct hir::TypeBinding {
278278
id,
279-
ident,
279+
ident -> (ident.name),
280280
ty,
281281
span
282282
});
@@ -406,7 +406,7 @@ impl_stable_hash_for_spanned!(hir::FieldPat);
406406

407407
impl_stable_hash_for!(struct hir::FieldPat {
408408
id -> _,
409-
ident,
409+
ident -> (ident.name),
410410
pat,
411411
is_shorthand,
412412
});
@@ -650,7 +650,7 @@ impl<'a> HashStable<StableHashingContext<'a>> for hir::TraitItem {
650650
} = *self;
651651

652652
hcx.hash_hir_item_like(|hcx| {
653-
ident.hash_stable(hcx, hasher);
653+
ident.name.hash_stable(hcx, hasher);
654654
attrs.hash_stable(hcx, hasher);
655655
generics.hash_stable(hcx, hasher);
656656
node.hash_stable(hcx, hasher);
@@ -687,7 +687,7 @@ impl<'a> HashStable<StableHashingContext<'a>> for hir::ImplItem {
687687
} = *self;
688688

689689
hcx.hash_hir_item_like(|hcx| {
690-
ident.hash_stable(hcx, hasher);
690+
ident.name.hash_stable(hcx, hasher);
691691
vis.hash_stable(hcx, hasher);
692692
defaultness.hash_stable(hcx, hasher);
693693
attrs.hash_stable(hcx, hasher);
@@ -787,7 +787,7 @@ impl_stable_hash_for!(enum hir::UseKind {
787787

788788
impl_stable_hash_for!(struct hir::StructField {
789789
span,
790-
ident,
790+
ident -> (ident.name),
791791
vis,
792792
id,
793793
ty,
@@ -845,15 +845,15 @@ impl_stable_hash_for!(enum hir::Item_ {
845845

846846
impl_stable_hash_for!(struct hir::TraitItemRef {
847847
id,
848-
ident,
848+
ident -> (ident.name),
849849
kind,
850850
span,
851851
defaultness
852852
});
853853

854854
impl_stable_hash_for!(struct hir::ImplItemRef {
855855
id,
856-
ident,
856+
ident -> (ident.name),
857857
kind,
858858
span,
859859
vis,

src/librustc/ich/impls_ty.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1079,7 +1079,7 @@ impl_stable_hash_for!(struct ty::CratePredicatesMap<'tcx> {
10791079

10801080
impl_stable_hash_for!(struct ty::AssociatedItem {
10811081
def_id,
1082-
ident,
1082+
ident -> (ident.name),
10831083
kind,
10841084
vis,
10851085
defaultness,

0 commit comments

Comments
 (0)