incremental: Do not hash spans for things that didn't have spans previously

diff --git a/src/librustc/ich/impls_hir.rs b/src/librustc/ich/impls_hir.rs
index ecdca43ae2d48b4763bc4cd07e67c97f4ac9f9fa..a9897186a107efe7307ebd5722ed7273679c2747 100644 (file)
--- a/src/librustc/ich/impls_hir.rs
+++ b/src/librustc/ich/impls_hir.rs
@@ -171,7 +171,7 @@ fn hash_stable<W: StableHasherResult>(&self,
 });
 
 impl_stable_hash_for!(struct hir::PathSegment {
-    ident,
+    ident -> (ident.name),
     infer_types,
     args
 });
@@ -276,7 +276,7 @@ fn hash_stable<W: StableHasherResult>(&self,
 
 impl_stable_hash_for!(struct hir::TypeBinding {
     id,
-    ident,
+    ident -> (ident.name),
     ty,
     span
 });
@@ -406,7 +406,7 @@ fn hash_stable<W: StableHasherResult>(&self,
 
 impl_stable_hash_for!(struct hir::FieldPat {
     id -> _,
-    ident,
+    ident -> (ident.name),
     pat,
     is_shorthand,
 });
@@ -650,7 +650,7 @@ fn hash_stable<W: StableHasherResult>(&self,
         } = *self;
 
         hcx.hash_hir_item_like(|hcx| {
-            ident.hash_stable(hcx, hasher);
+            ident.name.hash_stable(hcx, hasher);
             attrs.hash_stable(hcx, hasher);
             generics.hash_stable(hcx, hasher);
             node.hash_stable(hcx, hasher);
@@ -687,7 +687,7 @@ fn hash_stable<W: StableHasherResult>(&self,
         } = *self;
 
         hcx.hash_hir_item_like(|hcx| {
-            ident.hash_stable(hcx, hasher);
+            ident.name.hash_stable(hcx, hasher);
             vis.hash_stable(hcx, hasher);
             defaultness.hash_stable(hcx, hasher);
             attrs.hash_stable(hcx, hasher);
@@ -787,7 +787,7 @@ fn hash_stable<W: StableHasherResult>(&self,
 
 impl_stable_hash_for!(struct hir::StructField {
     span,
-    ident,
+    ident -> (ident.name),
     vis,
     id,
     ty,
@@ -845,7 +845,7 @@ fn hash_stable<W: StableHasherResult>(&self,
 
 impl_stable_hash_for!(struct hir::TraitItemRef {
     id,
-    ident,
+    ident -> (ident.name),
     kind,
     span,
     defaultness
@@ -853,7 +853,7 @@ fn hash_stable<W: StableHasherResult>(&self,
 
 impl_stable_hash_for!(struct hir::ImplItemRef {
     id,
-    ident,
+    ident -> (ident.name),
     kind,
     span,
     vis,

diff --git a/src/librustc/ich/impls_ty.rs b/src/librustc/ich/impls_ty.rs
index 2b3336e2467d1da602132eb8cb74ad42bc2efd3d..55bcaad1a4ea25cff5ce6e28e98cc41ecd959386 100644 (file)
--- a/src/librustc/ich/impls_ty.rs
+++ b/src/librustc/ich/impls_ty.rs
@@ -1079,7 +1079,7 @@ fn hash_stable<W: StableHasherResult>(&self,
 
 impl_stable_hash_for!(struct ty::AssociatedItem {
     def_id,
-    ident,
+    ident -> (ident.name),
     kind,
     vis,
     defaultness,