add ModuleDefId to hir_def

This commit is contained in:
Aleksey Kladov 2019-10-31 11:23:30 +03:00
parent 7973c91281
commit 1602db7d7d
3 changed files with 61 additions and 11 deletions

View file

@ -3,7 +3,7 @@
use std::sync::Arc;
use hir_def::type_ref::TypeRef;
use hir_def::{type_ref::TypeRef, LocalEnumVariantId};
use hir_expand::name::AsName;
use ra_arena::{impl_arena_id, Arena, RawId};
use ra_syntax::ast::{self, NameOwner, StructKind, TypeAscriptionOwner};
@ -68,7 +68,7 @@ impl EnumVariant {
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct EnumData {
pub(crate) name: Option<Name>,
pub(crate) variants: Arena<EnumVariantId, EnumVariantData>,
pub(crate) variants: Arena<LocalEnumVariantId, EnumVariantData>,
}
impl EnumData {
@ -85,10 +85,6 @@ impl EnumData {
}
}
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub(crate) struct EnumVariantId(RawId);
impl_arena_id!(EnumVariantId);
#[derive(Debug, Clone, PartialEq, Eq)]
pub(crate) struct EnumVariantData {
pub(crate) name: Option<Name>,