diff options
author | Florian Diebold <[email protected]> | 2020-07-15 20:47:45 +0100 |
---|---|---|
committer | Florian Diebold <[email protected]> | 2020-07-15 21:07:13 +0100 |
commit | 20770044631fd0c21caa12f9bc87489ea6c848ee (patch) | |
tree | 27ba12638469c763874fa094744ffe3f628a7164 /crates/ra_hir_def | |
parent | a48843a16a2306399f2f6a78c69d9192a6480c88 (diff) |
Remove TypeCtor interning
Our TypeCtor and Chalk's TypeName match now!
Diffstat (limited to 'crates/ra_hir_def')
-rw-r--r-- | crates/ra_hir_def/src/lib.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crates/ra_hir_def/src/lib.rs b/crates/ra_hir_def/src/lib.rs index b71d626c3..87000fe98 100644 --- a/crates/ra_hir_def/src/lib.rs +++ b/crates/ra_hir_def/src/lib.rs | |||
@@ -159,17 +159,17 @@ pub struct FunctionId(salsa::InternId); | |||
159 | type FunctionLoc = AssocItemLoc<Function>; | 159 | type FunctionLoc = AssocItemLoc<Function>; |
160 | impl_intern!(FunctionId, FunctionLoc, intern_function, lookup_intern_function); | 160 | impl_intern!(FunctionId, FunctionLoc, intern_function, lookup_intern_function); |
161 | 161 | ||
162 | #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] | 162 | #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)] |
163 | pub struct StructId(salsa::InternId); | 163 | pub struct StructId(salsa::InternId); |
164 | type StructLoc = ItemLoc<Struct>; | 164 | type StructLoc = ItemLoc<Struct>; |
165 | impl_intern!(StructId, StructLoc, intern_struct, lookup_intern_struct); | 165 | impl_intern!(StructId, StructLoc, intern_struct, lookup_intern_struct); |
166 | 166 | ||
167 | #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] | 167 | #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)] |
168 | pub struct UnionId(salsa::InternId); | 168 | pub struct UnionId(salsa::InternId); |
169 | pub type UnionLoc = ItemLoc<Union>; | 169 | pub type UnionLoc = ItemLoc<Union>; |
170 | impl_intern!(UnionId, UnionLoc, intern_union, lookup_intern_union); | 170 | impl_intern!(UnionId, UnionLoc, intern_union, lookup_intern_union); |
171 | 171 | ||
172 | #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] | 172 | #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)] |
173 | pub struct EnumId(salsa::InternId); | 173 | pub struct EnumId(salsa::InternId); |
174 | pub type EnumLoc = ItemLoc<Enum>; | 174 | pub type EnumLoc = ItemLoc<Enum>; |
175 | impl_intern!(EnumId, EnumLoc, intern_enum, lookup_intern_enum); | 175 | impl_intern!(EnumId, EnumLoc, intern_enum, lookup_intern_enum); |
@@ -239,7 +239,7 @@ pub enum AssocContainerId { | |||
239 | impl_from!(ContainerId for AssocContainerId); | 239 | impl_from!(ContainerId for AssocContainerId); |
240 | 240 | ||
241 | /// A Data Type | 241 | /// A Data Type |
242 | #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] | 242 | #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)] |
243 | pub enum AdtId { | 243 | pub enum AdtId { |
244 | StructId(StructId), | 244 | StructId(StructId), |
245 | UnionId(UnionId), | 245 | UnionId(UnionId), |