fix enums bug

Author: ChayimFriedman2

Cargo.lock

@@ -11,7 +11,7 @@ authors = ["rust-analyzer team"]
 repository = "https://github.com/rust-lang/rust-analyzer"
 
 [profile.dev]
-debug = 1
+debug = 2
 
 [profile.dev.package]
 # These speed up local tests.

Cargo.toml

@@ -189,8 +189,8 @@ fn f() {
 }
     "#,
         expect![[r#"
-            BlockId(4c01) in BlockRelativeModuleId { block: Some(BlockId(4c00)), local_id: Idx::<ModuleData>(1) }
-            BlockId(4c00) in BlockRelativeModuleId { block: None, local_id: Idx::<ModuleData>(0) }
+            BlockId(4801) in BlockRelativeModuleId { block: Some(BlockId(4800)), local_id: Idx::<ModuleData>(1) }
+            BlockId(4800) in BlockRelativeModuleId { block: None, local_id: Idx::<ModuleData>(0) }
             crate scope
         "#]],
     );

crates/hir-def/src/body/tests/block.rs

@@ -560,7 +560,7 @@ pub enum ItemContainerId {
 impl_from!(ModuleId for ItemContainerId);
 
 /// A Data Type
-#[derive(Debug, PartialOrd, Ord, salsa::Enum)]
+#[derive(Debug, PartialOrd, Ord, Clone, Copy, PartialEq, Eq, Hash, salsa::Enum)]
 pub enum AdtId {
     StructId(StructId),
     UnionId(UnionId),
@@ -569,7 +569,7 @@ pub enum AdtId {
 impl_from!(StructId, UnionId, EnumId for AdtId);
 
 /// A macro
-#[derive(Debug, PartialOrd, Ord, salsa::Enum)]
+#[derive(Debug, PartialOrd, Ord, Clone, Copy, PartialEq, Eq, Hash, salsa::Enum)]
 pub enum MacroId {
     Macro2Id(Macro2Id),
     MacroRulesId(MacroRulesId),
@@ -823,7 +823,7 @@ impl GeneralConstId {
 }
 
 /// The defs which have a body.
-#[derive(Debug, PartialOrd, Ord, salsa::Enum)]
+#[derive(Debug, PartialOrd, Ord, Clone, Copy, PartialEq, Eq, Hash, salsa::Enum)]
 pub enum DefWithBodyId {
     FunctionId(FunctionId),
     StaticId(StaticId),
@@ -866,7 +866,7 @@ pub enum AssocItemId {
 // casting them, and somehow making the constructors private, which would be annoying.
 impl_from!(FunctionId, ConstId, TypeAliasId for AssocItemId);
 
-#[derive(Debug, PartialOrd, Ord, salsa::Enum)]
+#[derive(Debug, PartialOrd, Ord, Clone, Copy, PartialEq, Eq, Hash, salsa::Enum)]
 pub enum GenericDefId {
     FunctionId(FunctionId),
     AdtId(AdtId),
@@ -949,7 +949,7 @@ impl From<AssocItemId> for GenericDefId {
     }
 }
 
-#[derive(Debug, PartialOrd, Ord, salsa::Enum)]
+#[derive(Debug, PartialOrd, Ord, Clone, Copy, PartialEq, Eq, Hash, salsa::Enum)]
 pub enum CallableDefId {
     FunctionId(FunctionId),
     StructId(StructId),
@@ -1065,7 +1065,7 @@ impl From<VariantId> for AttrDefId {
     }
 }
 
-#[derive(Debug, salsa::Enum)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, salsa::Enum)]
 pub enum VariantId {
     EnumVariantId(EnumVariantId),
     StructId(StructId),

crates/hir-def/src/lib.rs

@@ -2463,7 +2463,7 @@ pub enum TyDefId {
 }
 impl_from!(BuiltinType, AdtId(StructId, EnumId, UnionId), TypeAliasId for TyDefId);
 
-#[derive(Debug, salsa::Enum)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, salsa::Enum)]
 pub enum ValueTyDefId {
     FunctionId(FunctionId),
     StructId(StructId),

crates/hir-ty/src/lower.rs

@@ -14,7 +14,7 @@
                     Struct(
                         Struct {
                             id: StructId(
-                                Id(4401),
+                                4401,
                             ),
                         },
                     ),
@@ -47,7 +47,7 @@
                     Struct(
                         Struct {
                             id: StructId(
-                                Id(4400),
+                                4400,
                             ),
                         },
                     ),
@@ -80,7 +80,7 @@
                     Struct(
                         Struct {
                             id: StructId(
-                                Id(4400),
+                                4400,
                             ),
                         },
                     ),
@@ -113,7 +113,7 @@
                     Struct(
                         Struct {
                             id: StructId(
-                                Id(4400),
+                                4400,
                             ),
                         },
                     ),
@@ -146,7 +146,7 @@
                     Struct(
                         Struct {
                             id: StructId(
-                                Id(4400),
+                                4400,
                             ),
                         },
                     ),
@@ -179,7 +179,7 @@
                     Struct(
                         Struct {
                             id: StructId(
-                                Id(4401),
+                                4401,
                             ),
                         },
                     ),
@@ -212,7 +212,7 @@
                     Struct(
                         Struct {
                             id: StructId(
-                                Id(4400),
+                                4400,
                             ),
                         },
                     ),