Switch more impls to derives (implicitly adding #[inline])

Author: Aaron1011

compiler/rustc_hir/src/hir_id.rs

@@ -11,7 +11,7 @@ use std::fmt;
 /// the `local_id` part of the `HirId` changing, which is a very useful property in
 /// incremental compilation where we have to persist things through changes to
 /// the code base.
-#[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, Hash, Debug, HashStableEq)]
 #[derive(Encodable, Decodable)]
 pub struct HirId {
     pub owner: LocalDefId,

compiler/rustc_hir/src/stable_hash_impls.rs

@@ -1,6 +1,4 @@
-use rustc_data_structures::stable_hasher::{
-    HashStable, HashStableEq, StableHasher, ToStableHashKey,
-};
+use rustc_data_structures::stable_hasher::{HashStable, StableHasher, ToStableHashKey};
 
 use crate::hir::{
     AttributeMap, BodyId, Crate, Expr, ForeignItem, ForeignItemId, ImplItem, ImplItemId, Item,
@@ -35,12 +33,6 @@ impl<HirCtx: crate::HashStableContext> ToStableHashKey<HirCtx> for HirId {
     }
 }
 
-impl HashStableEq for HirId {
-    fn hash_stable_eq(&self, other: &HirId) -> bool {
-        self == other
-    }
-}
-
 impl<HirCtx: crate::HashStableContext> ToStableHashKey<HirCtx> for ItemLocalId {
     type KeyType = ItemLocalId;
 

compiler/rustc_span/src/def_id.rs

@@ -1,8 +1,6 @@
 use crate::HashStableContext;
 use rustc_data_structures::fingerprint::Fingerprint;
-use rustc_data_structures::stable_hasher::{
-    HashStable, HashStableEq, StableHasher, ToStableHashKey,
-};
+use rustc_data_structures::stable_hasher::{HashStable, StableHasher, ToStableHashKey};
 use rustc_data_structures::AtomicRef;
 use rustc_index::vec::Idx;
 use rustc_macros::HashStable_Generic;
@@ -222,7 +220,7 @@ impl<D: Decoder> Decodable<D> for DefIndex {
 /// index and a def index.
 ///
 /// You can create a `DefId` from a `LocalDefId` using `local_def_id.to_def_id()`.
-#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Copy)]
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Copy, HashStableEq)]
 // On below-64 bit systems we can simply use the derived `Hash` impl
 #[cfg_attr(not(target_pointer_width = "64"), derive(Hash))]
 #[repr(C)]
@@ -238,12 +236,6 @@ pub struct DefId {
     pub index: DefIndex,
 }
 
-impl HashStableEq for DefId {
-    fn hash_stable_eq(&self, other: &Self) -> bool {
-        self == other
-    }
-}
-
 // On 64-bit systems, we can hash the whole `DefId` as one `u64` instead of two `u32`s. This
 // improves performance without impairing `FxHash` quality. So the below code gets compiled to a
 // noop on little endian systems because the memory layout of `DefId` is as follows:

compiler/rustc_type_ir/src/lib.rs

@@ -5,7 +5,7 @@ extern crate bitflags;
 #[macro_use]
 extern crate rustc_macros;
 
-use rustc_data_structures::stable_hasher::{HashStable, HashStableEq, StableHasher};
+use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_data_structures::unify::{EqUnifyValue, UnifyKey};
 use std::fmt;
 use std::mem::discriminant;
@@ -449,7 +449,7 @@ impl UnifyKey for FloatVid {
     }
 }
 
-#[derive(Copy, Clone, PartialEq, Decodable, Encodable, Hash)]
+#[derive(Copy, Clone, PartialEq, Decodable, Encodable, Hash, HashStableEq)]
 pub enum Variance {
     Covariant,     // T<A> <: T<B> iff A <: B -- e.g., function return type
     Invariant,     // T<A> <: T<B> iff B == A -- e.g., type of mutable cell
@@ -560,12 +560,6 @@ impl<CTX> HashStable<CTX> for Variance {
     }
 }
 
-impl HashStableEq for Variance {
-    fn hash_stable_eq(&self, other: &Self) -> bool {
-        self == other
-    }
-}
-
 impl fmt::Debug for IntVarValue {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match *self {