diff options
author | Florian Diebold <[email protected]> | 2019-09-14 15:26:03 +0100 |
---|---|---|
committer | Florian Diebold <[email protected]> | 2019-09-17 18:47:45 +0100 |
commit | 828d60574f8ecbc33fe4987913c6f713e41af1ae (patch) | |
tree | cd51badc345665f6d1ea5eb09cb9a00ff4093b73 /crates/ra_hir/src/resolve.rs | |
parent | 913ab1ec0ad10873134ca429c1496806a9261206 (diff) |
Refactor a bit to prepare for resolving trait assoc items
Diffstat (limited to 'crates/ra_hir/src/resolve.rs')
-rw-r--r-- | crates/ra_hir/src/resolve.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crates/ra_hir/src/resolve.rs b/crates/ra_hir/src/resolve.rs index bb6915901..7f4c78859 100644 --- a/crates/ra_hir/src/resolve.rs +++ b/crates/ra_hir/src/resolve.rs | |||
@@ -50,7 +50,7 @@ pub(crate) enum Scope { | |||
50 | ExprScope(ExprScope), | 50 | ExprScope(ExprScope), |
51 | } | 51 | } |
52 | 52 | ||
53 | #[derive(Debug, Clone, PartialEq, Eq)] | 53 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
54 | pub enum TypeNs { | 54 | pub enum TypeNs { |
55 | SelfType(ImplBlock), | 55 | SelfType(ImplBlock), |
56 | GenericParam(u32), | 56 | GenericParam(u32), |
@@ -59,19 +59,19 @@ pub enum TypeNs { | |||
59 | TypeAlias(TypeAlias), | 59 | TypeAlias(TypeAlias), |
60 | BuiltinType(BuiltinType), | 60 | BuiltinType(BuiltinType), |
61 | Trait(Trait), | 61 | Trait(Trait), |
62 | // Module belong to type ns, but the resovler is used when all module paths | 62 | // Module belong to type ns, but the resolver is used when all module paths |
63 | // are fully resolved. | 63 | // are fully resolved. |
64 | // Module(Module) | 64 | // Module(Module) |
65 | } | 65 | } |
66 | 66 | ||
67 | #[derive(Debug)] | 67 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
68 | pub enum ResolveValueResult<'a> { | 68 | pub enum ResolveValueResult<'a> { |
69 | ValueNs(ValueNs), | 69 | ValueNs(ValueNs), |
70 | Partial(TypeNs, usize), | 70 | Partial(TypeNs, usize), |
71 | TypeRef(&'a TypeRef), | 71 | TypeRef(&'a TypeRef), |
72 | } | 72 | } |
73 | 73 | ||
74 | #[derive(Debug)] | 74 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
75 | pub enum ValueNs { | 75 | pub enum ValueNs { |
76 | LocalBinding(PatId), | 76 | LocalBinding(PatId), |
77 | Function(Function), | 77 | Function(Function), |