aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir_def/src
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-07-16 09:02:39 +0100
committerGitHub <[email protected]>2020-07-16 09:02:39 +0100
commit6a74a917133a98aac2a35df537b7112279dd7d71 (patch)
tree103618bb65397a0051a92b5fe00329e791ef1803 /crates/ra_hir_def/src
parent6824cf4f8a94dc9d0bd049efcf99e18651c71831 (diff)
parent20770044631fd0c21caa12f9bc87489ea6c848ee (diff)
Merge #5401
5401: Implement Chalk closure support r=matklad a=flodiebold This makes use of Chalk's closure support, which means we can get rid of our last built-in impls and a bunch of other surrounding stuff. Co-authored-by: Florian Diebold <[email protected]>
Diffstat (limited to 'crates/ra_hir_def/src')
-rw-r--r--crates/ra_hir_def/src/lib.rs8
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);
159type FunctionLoc = AssocItemLoc<Function>; 159type FunctionLoc = AssocItemLoc<Function>;
160impl_intern!(FunctionId, FunctionLoc, intern_function, lookup_intern_function); 160impl_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)]
163pub struct StructId(salsa::InternId); 163pub struct StructId(salsa::InternId);
164type StructLoc = ItemLoc<Struct>; 164type StructLoc = ItemLoc<Struct>;
165impl_intern!(StructId, StructLoc, intern_struct, lookup_intern_struct); 165impl_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)]
168pub struct UnionId(salsa::InternId); 168pub struct UnionId(salsa::InternId);
169pub type UnionLoc = ItemLoc<Union>; 169pub type UnionLoc = ItemLoc<Union>;
170impl_intern!(UnionId, UnionLoc, intern_union, lookup_intern_union); 170impl_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)]
173pub struct EnumId(salsa::InternId); 173pub struct EnumId(salsa::InternId);
174pub type EnumLoc = ItemLoc<Enum>; 174pub type EnumLoc = ItemLoc<Enum>;
175impl_intern!(EnumId, EnumLoc, intern_enum, lookup_intern_enum); 175impl_intern!(EnumId, EnumLoc, intern_enum, lookup_intern_enum);
@@ -239,7 +239,7 @@ pub enum AssocContainerId {
239impl_from!(ContainerId for AssocContainerId); 239impl_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)]
243pub enum AdtId { 243pub enum AdtId {
244 StructId(StructId), 244 StructId(StructId),
245 UnionId(UnionId), 245 UnionId(UnionId),