diff options
Diffstat (limited to 'crates/ra_hir/src/nameres/collector.rs')
-rw-r--r-- | crates/ra_hir/src/nameres/collector.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/crates/ra_hir/src/nameres/collector.rs b/crates/ra_hir/src/nameres/collector.rs index 34b90a666..1c0d4369e 100644 --- a/crates/ra_hir/src/nameres/collector.rs +++ b/crates/ra_hir/src/nameres/collector.rs | |||
@@ -4,6 +4,7 @@ use rustc_hash::FxHashMap; | |||
4 | use test_utils::tested_by; | 4 | use test_utils::tested_by; |
5 | 5 | ||
6 | use crate::{ | 6 | use crate::{ |
7 | db::DefDatabase, | ||
7 | either::Either, | 8 | either::Either, |
8 | ids::{AstItemDef, LocationCtx, MacroCallId, MacroCallLoc, MacroDefId, MacroFileKind}, | 9 | ids::{AstItemDef, LocationCtx, MacroCallId, MacroCallLoc, MacroDefId, MacroFileKind}, |
9 | name::MACRO_RULES, | 10 | name::MACRO_RULES, |
@@ -13,8 +14,8 @@ use crate::{ | |||
13 | raw, CrateDefMap, CrateModuleId, ItemOrMacro, ModuleData, ModuleDef, PerNs, | 14 | raw, CrateDefMap, CrateModuleId, ItemOrMacro, ModuleData, ModuleDef, PerNs, |
14 | ReachedFixedPoint, Resolution, ResolveMode, | 15 | ReachedFixedPoint, Resolution, ResolveMode, |
15 | }, | 16 | }, |
16 | AstId, Const, DefDatabase, Enum, Function, HirFileId, MacroDef, Module, Name, Path, Static, | 17 | AstId, Const, Enum, Function, HirFileId, MacroDef, Module, Name, Path, Static, Struct, Trait, |
17 | Struct, Trait, TypeAlias, Union, | 18 | TypeAlias, Union, |
18 | }; | 19 | }; |
19 | 20 | ||
20 | pub(super) fn collect_defs(db: &impl DefDatabase, mut def_map: CrateDefMap) -> CrateDefMap { | 21 | pub(super) fn collect_defs(db: &impl DefDatabase, mut def_map: CrateDefMap) -> CrateDefMap { |
@@ -699,7 +700,7 @@ mod tests { | |||
699 | use ra_db::SourceDatabase; | 700 | use ra_db::SourceDatabase; |
700 | 701 | ||
701 | use super::*; | 702 | use super::*; |
702 | use crate::{mock::MockDatabase, Crate, DefDatabase}; | 703 | use crate::{db::DefDatabase, mock::MockDatabase, Crate}; |
703 | use ra_arena::Arena; | 704 | use ra_arena::Arena; |
704 | use rustc_hash::FxHashSet; | 705 | use rustc_hash::FxHashSet; |
705 | 706 | ||