Keep going

Author: Aaron1011

compiler/rustc_data_structures/src/stable_hasher.rs

@@ -268,6 +268,12 @@ impl<CTX> HashStable<CTX> for ::std::num::NonZeroUsize {
     }
 }
 
+impl HashStableEq for ::std::num::NonZeroUsize {
+    fn hash_stable_eq(&self, other: &Self) -> bool {
+        self.get().hash_stable_eq(&other.get())
+    }
+}
+
 impl<CTX> HashStable<CTX> for f32 {
     fn hash_stable(&self, ctx: &mut CTX, hasher: &mut StableHasher) {
         let val: u32 = unsafe { ::std::mem::transmute(*self) };
@@ -335,6 +341,9 @@ where
 
 impl<T: HashStableEq> HashStableEq for [T] {
     fn hash_stable_eq(&self, other: &Self) -> bool {
+        if self.len() != other.len() {
+            return false;
+        }
         for (first, second) in self.iter().zip(other.iter()) {
             if !first.hash_stable_eq(second) {
                 return false;
@@ -383,6 +392,13 @@ impl<T: HashStable<CTX>, CTX> HashStable<CTX> for Vec<T> {
     }
 }
 
+impl<T: HashStableEq> HashStableEq for Vec<T> {
+    #[inline]
+    fn hash_stable_eq(&self, other: &Self) -> bool {
+        (&self[..]).hash_stable_eq(other)
+    }
+}
+
 impl<K, V, R, CTX> HashStable<CTX> for indexmap::IndexMap<K, V, R>
 where
     K: HashStable<CTX> + Eq + Hash,
@@ -469,6 +485,20 @@ impl<CTX> HashStable<CTX> for String {
     }
 }
 
+impl HashStableEq for str {
+    #[inline]
+    fn hash_stable_eq(&self, other: &Self) -> bool {
+        self.as_bytes().hash_stable_eq(other.as_bytes())
+    }
+}
+
+impl HashStableEq for String {
+    #[inline]
+    fn hash_stable_eq(&self, other: &Self) -> bool {
+        (&self[..]).hash_stable_eq(other)
+    }
+}
+
 impl<HCX> ToStableHashKey<HCX> for String {
     type KeyType = String;
     #[inline]
@@ -570,6 +600,12 @@ where
     }
 }
 
+impl<I: vec::Idx, T: HashStableEq> HashStableEq for vec::IndexVec<I, T> {
+    fn hash_stable_eq(&self, other: &Self) -> bool {
+        self.iter().as_slice().hash_stable_eq(other.iter().as_slice())
+    }
+}
+
 impl<I: vec::Idx, CTX> HashStable<CTX> for bit_set::BitSet<I> {
     fn hash_stable(&self, _ctx: &mut CTX, hasher: &mut StableHasher) {
         ::std::hash::Hash::hash(self, hasher);

compiler/rustc_target/src/abi/call/mod.rs

@@ -462,6 +462,7 @@ impl<'a, Ty> TyAndLayout<'a, Ty> {
 /// Information about how to pass an argument to,
 /// or return a value from, a function, under some ABI.
 #[derive(PartialEq, Eq, Hash, Debug, HashStable_Generic)]
+#[stable_hasher(no_hash_stable_eq)]
 pub struct ArgAbi<'a, Ty> {
     pub layout: TyAndLayout<'a, Ty>,
 
@@ -608,6 +609,7 @@ pub enum Conv {
 /// I will do my best to describe this structure, but these
 /// comments are reverse-engineered and may be inaccurate. -NDM
 #[derive(PartialEq, Eq, Hash, Debug, HashStable_Generic)]
+#[stable_hasher(no_hash_stable_eq)]
 pub struct FnAbi<'a, Ty> {
     /// The LLVM types of each argument.
     pub args: Vec<ArgAbi<'a, Ty>>,

compiler/rustc_target/src/abi/mod.rs

@@ -1027,6 +1027,7 @@ rustc_index::newtype_index! {
 }
 
 #[derive(PartialEq, Eq, Hash, Debug, HashStable_Generic)]
+#[stable_hasher(no_hash_stable_eq)]
 pub enum Variants {
     /// Single enum variants, structs/tuples, unions, and all non-ADTs.
     Single { index: VariantIdx },
@@ -1046,6 +1047,7 @@ pub enum Variants {
 }
 
 #[derive(PartialEq, Eq, Hash, Debug, HashStable_Generic)]
+#[stable_hasher(no_hash_stable_eq)]
 pub enum TagEncoding {
     /// The tag directly stores the discriminant, but possibly with a smaller layout
     /// (so converting the tag to the discriminant can require sign extension).
@@ -1150,6 +1152,7 @@ impl Niche {
 }
 
 #[derive(PartialEq, Eq, Hash, Debug, HashStable_Generic)]
+#[stable_hasher(no_hash_stable_eq)]
 pub struct Layout {
     /// Says where the fields are located within the layout.
     pub fields: FieldsShape,
@@ -1204,6 +1207,7 @@ impl Layout {
 /// layouts for which Rust types do not exist, such as enum variants
 /// or synthetic fields of enums (i.e., discriminants) and fat pointers.
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, HashStable_Generic)]
+#[stable_hasher(no_hash_stable_eq)]
 pub struct TyAndLayout<'a, Ty> {
     pub ty: Ty,
     pub layout: &'a Layout,