diff options
Diffstat (limited to 'crates/ra_hir/src/code_model.rs')
-rw-r--r-- | crates/ra_hir/src/code_model.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs index e0c6d6340..b32aa145e 100644 --- a/crates/ra_hir/src/code_model.rs +++ b/crates/ra_hir/src/code_model.rs | |||
@@ -8,14 +8,14 @@ use std::sync::Arc; | |||
8 | use hir_def::{ | 8 | use hir_def::{ |
9 | builtin_type::BuiltinType, | 9 | builtin_type::BuiltinType, |
10 | type_ref::{Mutability, TypeRef}, | 10 | type_ref::{Mutability, TypeRef}, |
11 | CrateModuleId, ModuleId, | 11 | CrateModuleId, LocalEnumVariantId, ModuleId, |
12 | }; | 12 | }; |
13 | use hir_expand::name::{self, AsName}; | 13 | use hir_expand::name::{self, AsName}; |
14 | use ra_db::{CrateId, Edition}; | 14 | use ra_db::{CrateId, Edition}; |
15 | use ra_syntax::ast::{self, NameOwner, TypeAscriptionOwner}; | 15 | use ra_syntax::ast::{self, NameOwner, TypeAscriptionOwner}; |
16 | 16 | ||
17 | use crate::{ | 17 | use crate::{ |
18 | adt::{EnumVariantId, StructFieldId, VariantDef}, | 18 | adt::{StructFieldId, VariantDef}, |
19 | db::{AstDatabase, DefDatabase, HirDatabase}, | 19 | db::{AstDatabase, DefDatabase, HirDatabase}, |
20 | diagnostics::DiagnosticSink, | 20 | diagnostics::DiagnosticSink, |
21 | expr::{validation::ExprValidator, Body, BodySourceMap}, | 21 | expr::{validation::ExprValidator, Body, BodySourceMap}, |
@@ -410,7 +410,7 @@ impl Enum { | |||
410 | #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] | 410 | #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] |
411 | pub struct EnumVariant { | 411 | pub struct EnumVariant { |
412 | pub(crate) parent: Enum, | 412 | pub(crate) parent: Enum, |
413 | pub(crate) id: EnumVariantId, | 413 | pub(crate) id: LocalEnumVariantId, |
414 | } | 414 | } |
415 | 415 | ||
416 | impl EnumVariant { | 416 | impl EnumVariant { |