diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-10-31 08:24:03 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-10-31 08:24:03 +0000 |
commit | d067afb064a7fa67b172abf561b7d80740cd6f18 (patch) | |
tree | ddf0901cdf3aa454d6bfce3fa142191c22563494 /crates/ra_hir/src/adt.rs | |
parent | 7973c91281837bbb5c5a0bf3b1c71a5b52654b20 (diff) | |
parent | 1602db7d7d6aa38b4ee50de8cbe734529853d615 (diff) |
Merge #2141
2141: add ModuleDefId to hir_def r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/adt.rs')
-rw-r--r-- | crates/ra_hir/src/adt.rs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/crates/ra_hir/src/adt.rs b/crates/ra_hir/src/adt.rs index 97424b39e..4fa2062bd 100644 --- a/crates/ra_hir/src/adt.rs +++ b/crates/ra_hir/src/adt.rs | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | use std::sync::Arc; | 4 | use std::sync::Arc; |
5 | 5 | ||
6 | use hir_def::type_ref::TypeRef; | 6 | use hir_def::{type_ref::TypeRef, LocalEnumVariantId}; |
7 | use hir_expand::name::AsName; | 7 | use hir_expand::name::AsName; |
8 | use ra_arena::{impl_arena_id, Arena, RawId}; | 8 | use ra_arena::{impl_arena_id, Arena, RawId}; |
9 | use ra_syntax::ast::{self, NameOwner, StructKind, TypeAscriptionOwner}; | 9 | use ra_syntax::ast::{self, NameOwner, StructKind, TypeAscriptionOwner}; |
@@ -68,7 +68,7 @@ impl EnumVariant { | |||
68 | #[derive(Debug, Clone, PartialEq, Eq)] | 68 | #[derive(Debug, Clone, PartialEq, Eq)] |
69 | pub struct EnumData { | 69 | pub struct EnumData { |
70 | pub(crate) name: Option<Name>, | 70 | pub(crate) name: Option<Name>, |
71 | pub(crate) variants: Arena<EnumVariantId, EnumVariantData>, | 71 | pub(crate) variants: Arena<LocalEnumVariantId, EnumVariantData>, |
72 | } | 72 | } |
73 | 73 | ||
74 | impl EnumData { | 74 | impl EnumData { |
@@ -85,10 +85,6 @@ impl EnumData { | |||
85 | } | 85 | } |
86 | } | 86 | } |
87 | 87 | ||
88 | #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] | ||
89 | pub(crate) struct EnumVariantId(RawId); | ||
90 | impl_arena_id!(EnumVariantId); | ||
91 | |||
92 | #[derive(Debug, Clone, PartialEq, Eq)] | 88 | #[derive(Debug, Clone, PartialEq, Eq)] |
93 | pub(crate) struct EnumVariantData { | 89 | pub(crate) struct EnumVariantData { |
94 | pub(crate) name: Option<Name>, | 90 | pub(crate) name: Option<Name>, |