Rollup merge of #145018 - AlexanderPortland:rustc-public-hash, r=scottmcm

tgross35 · web-flow · commit 41b6da1f2155 · 2025-08-07T19:36:38.000-05:00
Derive `Hash` for rustc_public types

This derives `Hash` for the rustc_public versions of `Rvalue`, `Place`, `Span`, and all the types they contain. As far as I can tell, the internal versions of all these types already implement `Hash`, so it would be helpful if the public versions implemented it too!
diff --git a/compiler/rustc_public/src/mir/body.rs b/compiler/rustc_public/src/mir/body.rs
@@ -349,7 +349,7 @@ impl AssertMessage {
     }
 }
 
-#[derive(Copy, Clone, Debug, Eq, PartialEq, Serialize)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash, Serialize)]
 pub enum BinOp {
     Add,
     AddUnchecked,
@@ -384,7 +384,7 @@ impl BinOp {
     }
 }
 
-#[derive(Copy, Clone, Debug, Eq, PartialEq, Serialize)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash, Serialize)]
 pub enum UnOp {
     Not,
     Neg,
@@ -490,7 +490,7 @@ pub enum StatementKind {
     Nop,
 }
 
-#[derive(Clone, Debug, Eq, PartialEq, Serialize)]
+#[derive(Clone, Debug, Eq, PartialEq, Hash, Serialize)]
 pub enum Rvalue {
     /// Creates a pointer with the indicated mutability to the place.
     ///
@@ -666,7 +666,7 @@ impl Rvalue {
     }
 }
 
-#[derive(Clone, Debug, Eq, PartialEq, Serialize)]
+#[derive(Clone, Debug, Eq, PartialEq, Hash, Serialize)]
 pub enum AggregateKind {
     Array(Ty),
     Tuple,
@@ -677,14 +677,14 @@ pub enum AggregateKind {
     RawPtr(Ty, Mutability),
 }
 
-#[derive(Clone, Debug, Eq, PartialEq, Serialize)]
+#[derive(Clone, Debug, Eq, PartialEq, Hash, Serialize)]
 pub enum Operand {
     Copy(Place),
     Move(Place),
     Constant(ConstOperand),
 }
 
-#[derive(Clone, Eq, PartialEq, Serialize)]
+#[derive(Clone, Eq, PartialEq, Hash, Serialize)]
 pub struct Place {
     pub local: Local,
     /// projection out of a place (access a field, deref a pointer, etc)
@@ -697,7 +697,7 @@ impl From<Local> for Place {
     }
 }
 
-#[derive(Clone, Debug, Eq, PartialEq, Serialize)]
+#[derive(Clone, Debug, Eq, PartialEq, Hash, Serialize)]
 pub struct ConstOperand {
     pub span: Span,
     pub user_ty: Option<UserTypeAnnotationIndex>,
@@ -770,7 +770,7 @@ pub enum VarDebugInfoContents {
 // ProjectionElem<Local, Ty>) and user-provided type annotations (for which the projection elements
 // are of type ProjectionElem<(), ()>).
 // In rustc_public's IR we don't need this generality, so we just use ProjectionElem for Places.
-#[derive(Clone, Debug, Eq, PartialEq, Serialize)]
+#[derive(Clone, Debug, Eq, PartialEq, Hash, Serialize)]
 pub enum ProjectionElem {
     /// Dereference projections (e.g. `*_1`) project to the address referenced by the base place.
     Deref,
@@ -913,7 +913,7 @@ impl SwitchTargets {
     }
 }
 
-#[derive(Copy, Clone, Debug, Eq, PartialEq, Serialize)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash, Serialize)]
 pub enum BorrowKind {
     /// Data must be immutable and is aliasable.
     Shared,
@@ -940,7 +940,7 @@ impl BorrowKind {
     }
 }
 
-#[derive(Copy, Clone, Debug, Eq, PartialEq, Serialize)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash, Serialize)]
 pub enum RawPtrKind {
     Mut,
     Const,
@@ -958,14 +958,14 @@ impl RawPtrKind {
     }
 }
 
-#[derive(Copy, Clone, Debug, Eq, PartialEq, Serialize)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash, Serialize)]
 pub enum MutBorrowKind {
     Default,
     TwoPhaseBorrow,
     ClosureCapture,
 }
 
-#[derive(Copy, Clone, Debug, Eq, PartialEq, Serialize)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash, Serialize)]
 pub enum FakeBorrowKind {
     /// A shared (deep) borrow. Data must be immutable and is aliasable.
     Deep,
@@ -982,13 +982,13 @@ pub enum Mutability {
     Mut,
 }
 
-#[derive(Copy, Clone, Debug, Eq, PartialEq, Serialize)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash, Serialize)]
 pub enum Safety {
     Safe,
     Unsafe,
 }
 
-#[derive(Copy, Clone, Debug, Eq, PartialEq, Serialize)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash, Serialize)]
 pub enum PointerCoercion {
     /// Go from a fn-item type to a fn-pointer type.
     ReifyFnPointer,
@@ -1015,7 +1015,7 @@ pub enum PointerCoercion {
     Unsize,
 }
 
-#[derive(Copy, Clone, Debug, Eq, PartialEq, Serialize)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash, Serialize)]
 pub enum CastKind {
     // FIXME(smir-rename): rename this to PointerExposeProvenance
     PointerExposeAddress,
@@ -1030,7 +1030,7 @@ pub enum CastKind {
     Transmute,
 }
 
-#[derive(Clone, Debug, Eq, PartialEq, Serialize)]
+#[derive(Clone, Debug, Eq, PartialEq, Hash, Serialize)]
 pub enum NullOp {
     /// Returns the size of a value of that type.
     SizeOf,
diff --git a/compiler/rustc_public/src/ty.rs b/compiler/rustc_public/src/ty.rs
@@ -113,7 +113,7 @@ pub enum Pattern {
 }
 
 /// Represents a constant in the type system
-#[derive(Clone, Debug, Eq, PartialEq, Serialize)]
+#[derive(Clone, Debug, Eq, PartialEq, Hash, Serialize)]
 pub struct TyConst {
     pub(crate) kind: TyConstKind,
     pub id: TyConstId,
@@ -140,7 +140,7 @@ impl TyConst {
     }
 }
 
-#[derive(Clone, Debug, Eq, PartialEq, Serialize)]
+#[derive(Clone, Debug, Eq, PartialEq, Hash, Serialize)]
 pub enum TyConstKind {
     Param(ParamConst),
     Bound(DebruijnIndex, BoundVar),
@@ -151,11 +151,11 @@ pub enum TyConstKind {
     ZSTValue(Ty),
 }
 
-#[derive(Copy, Clone, Debug, Eq, PartialEq, Serialize)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash, Serialize)]
 pub struct TyConstId(usize);
 
 /// Represents a constant in MIR
-#[derive(Clone, Debug, Eq, PartialEq, Serialize)]
+#[derive(Clone, Debug, Eq, PartialEq, Hash, Serialize)]
 pub struct MirConst {
     /// The constant kind.
     pub(crate) kind: ConstantKind,
@@ -212,17 +212,17 @@ impl MirConst {
     }
 }
 
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize)]
 pub struct MirConstId(usize);
 
 type Ident = Opaque;
 
-#[derive(Clone, Debug, Eq, PartialEq, Serialize)]
+#[derive(Clone, Debug, Eq, PartialEq, Hash, Serialize)]
 pub struct Region {
     pub kind: RegionKind,
 }
 
-#[derive(Clone, Debug, Eq, PartialEq, Serialize)]
+#[derive(Clone, Debug, Eq, PartialEq, Hash, Serialize)]
 pub enum RegionKind {
     ReEarlyParam(EarlyParamRegion),
     ReBound(DebruijnIndex, BoundRegion),
@@ -233,29 +233,29 @@ pub enum RegionKind {
 
 pub(crate) type DebruijnIndex = u32;
 
-#[derive(Clone, Debug, Eq, PartialEq, Serialize)]
+#[derive(Clone, Debug, Eq, PartialEq, Hash, Serialize)]
 pub struct EarlyParamRegion {
     pub index: u32,
     pub name: Symbol,
 }
 
 pub(crate) type BoundVar = u32;
 
-#[derive(Clone, Debug, Eq, PartialEq, Serialize)]
+#[derive(Clone, Debug, Eq, PartialEq, Hash, Serialize)]
 pub struct BoundRegion {
     pub var: BoundVar,
     pub kind: BoundRegionKind,
 }
 
 pub(crate) type UniverseIndex = u32;
 
-#[derive(Clone, Debug, Eq, PartialEq, Serialize)]
+#[derive(Clone, Debug, Eq, PartialEq, Hash, Serialize)]
 pub struct Placeholder<T> {
     pub universe: UniverseIndex,
     pub bound: T,
 }
 
-#[derive(Clone, Copy, PartialEq, Eq, Serialize)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, Serialize)]
 pub struct Span(usize);
 
 impl Debug for Span {
@@ -997,7 +997,7 @@ crate_def! {
 }
 
 /// A list of generic arguments.
-#[derive(Clone, Debug, Eq, PartialEq, Serialize)]
+#[derive(Clone, Debug, Eq, PartialEq, Hash, Serialize)]
 pub struct GenericArgs(pub Vec<GenericArgKind>);
 
 impl std::ops::Index<ParamTy> for GenericArgs {
@@ -1016,7 +1016,7 @@ impl std::ops::Index<ParamConst> for GenericArgs {
     }
 }
 
-#[derive(Clone, Debug, Eq, PartialEq, Serialize)]
+#[derive(Clone, Debug, Eq, PartialEq, Hash, Serialize)]
 pub enum GenericArgKind {
     Lifetime(Region),
     Type(Ty),
@@ -1199,7 +1199,7 @@ pub enum BoundTyKind {
     Param(ParamDef, String),
 }
 
-#[derive(Clone, Debug, Eq, PartialEq, Serialize)]
+#[derive(Clone, Debug, Eq, PartialEq, Hash, Serialize)]
 pub enum BoundRegionKind {
     BrAnon,
     BrNamed(BrNamedDef, String),
@@ -1354,7 +1354,7 @@ impl Allocation {
     }
 }
 
-#[derive(Clone, Debug, Eq, PartialEq, Serialize)]
+#[derive(Clone, Debug, Eq, PartialEq, Hash, Serialize)]
 pub enum ConstantKind {
     Ty(TyConst),
     Allocated(Allocation),
@@ -1365,13 +1365,13 @@ pub enum ConstantKind {
     ZeroSized,
 }
 
-#[derive(Clone, Debug, Eq, PartialEq, Serialize)]
+#[derive(Clone, Debug, Eq, PartialEq, Hash, Serialize)]
 pub struct ParamConst {
     pub index: u32,
     pub name: String,
 }
 
-#[derive(Clone, Debug, Eq, PartialEq, Serialize)]
+#[derive(Clone, Debug, Eq, PartialEq, Hash, Serialize)]
 pub struct UnevaluatedConst {
     pub def: ConstDef,
     pub args: GenericArgs,

Original file line number	Diff line number	Diff line change
`@@ -349,7 +349,7 @@ impl AssertMessage {`
`349`	`349`	`}`
`350`	`350`	`}`
`351`	`351`
`352`		`-#[derive(Copy, Clone, Debug, Eq, PartialEq, Serialize)]`
	`352`	`+#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash, Serialize)]`
`353`	`353`	`pub enum BinOp {`
`354`	`354`	`Add,`
`355`	`355`	`AddUnchecked,`
`@@ -384,7 +384,7 @@ impl BinOp {`
`384`	`384`	`}`
`385`	`385`	`}`
`386`	`386`
`387`		`-#[derive(Copy, Clone, Debug, Eq, PartialEq, Serialize)]`
	`387`	`+#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash, Serialize)]`
`388`	`388`	`pub enum UnOp {`
`389`	`389`	`Not,`
`390`	`390`	`Neg,`
`@@ -490,7 +490,7 @@ pub enum StatementKind {`
`490`	`490`	`Nop,`
`491`	`491`	`}`
`492`	`492`
`493`		`-#[derive(Clone, Debug, Eq, PartialEq, Serialize)]`
	`493`	`+#[derive(Clone, Debug, Eq, PartialEq, Hash, Serialize)]`
`494`	`494`	`pub enum Rvalue {`
`495`	`495`	`/// Creates a pointer with the indicated mutability to the place.`
`496`	`496`	`///`
`@@ -666,7 +666,7 @@ impl Rvalue {`
`666`	`666`	`}`
`667`	`667`	`}`
`668`	`668`
`669`		`-#[derive(Clone, Debug, Eq, PartialEq, Serialize)]`
	`669`	`+#[derive(Clone, Debug, Eq, PartialEq, Hash, Serialize)]`
`670`	`670`	`pub enum AggregateKind {`
`671`	`671`	`Array(Ty),`
`672`	`672`	`Tuple,`
`@@ -677,14 +677,14 @@ pub enum AggregateKind {`
`677`	`677`	`RawPtr(Ty, Mutability),`
`678`	`678`	`}`
`679`	`679`
`680`		`-#[derive(Clone, Debug, Eq, PartialEq, Serialize)]`
	`680`	`+#[derive(Clone, Debug, Eq, PartialEq, Hash, Serialize)]`
`681`	`681`	`pub enum Operand {`
`682`	`682`	`Copy(Place),`
`683`	`683`	`Move(Place),`
`684`	`684`	`Constant(ConstOperand),`
`685`	`685`	`}`
`686`	`686`
`687`		`-#[derive(Clone, Eq, PartialEq, Serialize)]`
	`687`	`+#[derive(Clone, Eq, PartialEq, Hash, Serialize)]`
`688`	`688`	`pub struct Place {`
`689`	`689`	`pub local: Local,`
`690`	`690`	`/// projection out of a place (access a field, deref a pointer, etc)`
`@@ -697,7 +697,7 @@ impl From<Local> for Place {`
`697`	`697`	`}`
`698`	`698`	`}`
`699`	`699`
`700`		`-#[derive(Clone, Debug, Eq, PartialEq, Serialize)]`
	`700`	`+#[derive(Clone, Debug, Eq, PartialEq, Hash, Serialize)]`
`701`	`701`	`pub struct ConstOperand {`
`702`	`702`	`pub span: Span,`
`703`	`703`	`pub user_ty: Option<UserTypeAnnotationIndex>,`
`@@ -770,7 +770,7 @@ pub enum VarDebugInfoContents {`
`770`	`770`	`// ProjectionElem<Local, Ty>) and user-provided type annotations (for which the projection elements`
`771`	`771`	`// are of type ProjectionElem<(), ()>).`
`772`	`772`	`// In rustc_public's IR we don't need this generality, so we just use ProjectionElem for Places.`
`773`		`-#[derive(Clone, Debug, Eq, PartialEq, Serialize)]`
	`773`	`+#[derive(Clone, Debug, Eq, PartialEq, Hash, Serialize)]`
`774`	`774`	`pub enum ProjectionElem {`
`775`	`775`	/// Dereference projections (e.g. `*_1`) project to the address referenced by the base place.
`776`	`776`	`Deref,`
`@@ -913,7 +913,7 @@ impl SwitchTargets {`
`913`	`913`	`}`
`914`	`914`	`}`
`915`	`915`
`916`		`-#[derive(Copy, Clone, Debug, Eq, PartialEq, Serialize)]`
	`916`	`+#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash, Serialize)]`
`917`	`917`	`pub enum BorrowKind {`
`918`	`918`	`/// Data must be immutable and is aliasable.`
`919`	`919`	`Shared,`
`@@ -940,7 +940,7 @@ impl BorrowKind {`
`940`	`940`	`}`
`941`	`941`	`}`
`942`	`942`
`943`		`-#[derive(Copy, Clone, Debug, Eq, PartialEq, Serialize)]`
	`943`	`+#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash, Serialize)]`
`944`	`944`	`pub enum RawPtrKind {`
`945`	`945`	`Mut,`
`946`	`946`	`Const,`
`@@ -958,14 +958,14 @@ impl RawPtrKind {`
`958`	`958`	`}`
`959`	`959`	`}`
`960`	`960`
`961`		`-#[derive(Copy, Clone, Debug, Eq, PartialEq, Serialize)]`
	`961`	`+#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash, Serialize)]`
`962`	`962`	`pub enum MutBorrowKind {`
`963`	`963`	`Default,`
`964`	`964`	`TwoPhaseBorrow,`
`965`	`965`	`ClosureCapture,`
`966`	`966`	`}`
`967`	`967`
`968`		`-#[derive(Copy, Clone, Debug, Eq, PartialEq, Serialize)]`
	`968`	`+#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash, Serialize)]`
`969`	`969`	`pub enum FakeBorrowKind {`
`970`	`970`	`/// A shared (deep) borrow. Data must be immutable and is aliasable.`
`971`	`971`	`Deep,`
`@@ -982,13 +982,13 @@ pub enum Mutability {`
`982`	`982`	`Mut,`
`983`	`983`	`}`
`984`	`984`
`985`		`-#[derive(Copy, Clone, Debug, Eq, PartialEq, Serialize)]`
	`985`	`+#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash, Serialize)]`
`986`	`986`	`pub enum Safety {`
`987`	`987`	`Safe,`
`988`	`988`	`Unsafe,`
`989`	`989`	`}`
`990`	`990`
`991`		`-#[derive(Copy, Clone, Debug, Eq, PartialEq, Serialize)]`
	`991`	`+#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash, Serialize)]`
`992`	`992`	`pub enum PointerCoercion {`
`993`	`993`	`/// Go from a fn-item type to a fn-pointer type.`
`994`	`994`	`ReifyFnPointer,`
`@@ -1015,7 +1015,7 @@ pub enum PointerCoercion {`
`1015`	`1015`	`Unsize,`
`1016`	`1016`	`}`
`1017`	`1017`
`1018`		`-#[derive(Copy, Clone, Debug, Eq, PartialEq, Serialize)]`
	`1018`	`+#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash, Serialize)]`
`1019`	`1019`	`pub enum CastKind {`
`1020`	`1020`	`// FIXME(smir-rename): rename this to PointerExposeProvenance`
`1021`	`1021`	`PointerExposeAddress,`
`@@ -1030,7 +1030,7 @@ pub enum CastKind {`
`1030`	`1030`	`Transmute,`
`1031`	`1031`	`}`
`1032`	`1032`
`1033`		`-#[derive(Clone, Debug, Eq, PartialEq, Serialize)]`
	`1033`	`+#[derive(Clone, Debug, Eq, PartialEq, Hash, Serialize)]`
`1034`	`1034`	`pub enum NullOp {`
`1035`	`1035`	`/// Returns the size of a value of that type.`
`1036`	`1036`	`SizeOf,`