diff options
Diffstat (limited to 'crates/hir/src/code_model.rs')
-rw-r--r-- | crates/hir/src/code_model.rs | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/crates/hir/src/code_model.rs b/crates/hir/src/code_model.rs index 563145f92..30a5e4580 100644 --- a/crates/hir/src/code_model.rs +++ b/crates/hir/src/code_model.rs | |||
@@ -4,7 +4,6 @@ use std::{iter, sync::Arc}; | |||
4 | use arrayvec::ArrayVec; | 4 | use arrayvec::ArrayVec; |
5 | use base_db::{CrateDisplayName, CrateId, Edition, FileId}; | 5 | use base_db::{CrateDisplayName, CrateId, Edition, FileId}; |
6 | use either::Either; | 6 | use either::Either; |
7 | use hir_def::find_path::PrefixKind; | ||
8 | use hir_def::{ | 7 | use hir_def::{ |
9 | adt::ReprKind, | 8 | adt::ReprKind, |
10 | adt::StructKind, | 9 | adt::StructKind, |
@@ -12,16 +11,18 @@ use hir_def::{ | |||
12 | builtin_type::BuiltinType, | 11 | builtin_type::BuiltinType, |
13 | expr::{BindingAnnotation, Pat, PatId}, | 12 | expr::{BindingAnnotation, Pat, PatId}, |
14 | import_map, | 13 | import_map, |
14 | item_tree::ItemTreeNode, | ||
15 | lang_item::LangItemTarget, | 15 | lang_item::LangItemTarget, |
16 | path::ModPath, | 16 | path::ModPath, |
17 | per_ns::PerNs, | 17 | per_ns::PerNs, |
18 | resolver::{HasResolver, Resolver}, | 18 | resolver::{HasResolver, Resolver}, |
19 | src::HasSource as _, | 19 | src::HasSource as _, |
20 | type_ref::{Mutability, TypeRef}, | 20 | type_ref::{Mutability, TypeRef}, |
21 | AdtId, AssocContainerId, AttrDefId, ConstId, DefWithBodyId, EnumId, FunctionId, GenericDefId, | 21 | AdtId, AssocContainerId, AssocItemId, AssocItemLoc, AttrDefId, ConstId, DefWithBodyId, EnumId, |
22 | HasModule, ImplId, LocalEnumVariantId, LocalFieldId, LocalModuleId, Lookup, ModuleId, StaticId, | 22 | FunctionId, GenericDefId, HasModule, ImplId, LocalEnumVariantId, LocalFieldId, LocalModuleId, |
23 | StructId, TraitId, TypeAliasId, TypeParamId, UnionId, | 23 | Lookup, ModuleId, StaticId, StructId, TraitId, TypeAliasId, TypeParamId, UnionId, |
24 | }; | 24 | }; |
25 | use hir_def::{find_path::PrefixKind, item_scope::ItemInNs, visibility::Visibility}; | ||
25 | use hir_expand::{ | 26 | use hir_expand::{ |
26 | diagnostics::DiagnosticSink, | 27 | diagnostics::DiagnosticSink, |
27 | name::{name, AsName}, | 28 | name::{name, AsName}, |
@@ -275,11 +276,6 @@ impl ModuleDef { | |||
275 | } | 276 | } |
276 | } | 277 | } |
277 | 278 | ||
278 | pub use hir_def::{ | ||
279 | attr::Attrs, item_scope::ItemInNs, item_tree::ItemTreeNode, visibility::Visibility, | ||
280 | AssocItemId, AssocItemLoc, | ||
281 | }; | ||
282 | |||
283 | impl Module { | 279 | impl Module { |
284 | pub(crate) fn new(krate: Crate, crate_module_id: LocalModuleId) -> Module { | 280 | pub(crate) fn new(krate: Crate, crate_module_id: LocalModuleId) -> Module { |
285 | Module { id: ModuleId { krate: krate.id, local_id: crate_module_id } } | 281 | Module { id: ModuleId { krate: krate.id, local_id: crate_module_id } } |