diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-10-31 07:34:39 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-10-31 07:34:39 +0000 |
commit | 51092ee72aa87787a65645ccdf82d3cb5a015915 (patch) | |
tree | 31ba7c292cca19d6fdf94796d228f1424abbd3c6 /crates/ra_hir/src/nameres/collector.rs | |
parent | 37eaa840bb3f530fbe16ae7dd6bcdf4625d04f97 (diff) | |
parent | 6f4d5f7339395d854e4ba2af227de851246e528f (diff) |
Merge #2139
2139: move mod_resolution to hir_def r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/nameres/collector.rs')
-rw-r--r-- | crates/ra_hir/src/nameres/collector.rs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/crates/ra_hir/src/nameres/collector.rs b/crates/ra_hir/src/nameres/collector.rs index e2e13805a..ee0a4c99f 100644 --- a/crates/ra_hir/src/nameres/collector.rs +++ b/crates/ra_hir/src/nameres/collector.rs | |||
@@ -1,6 +1,9 @@ | |||
1 | //! FIXME: write short doc here | 1 | //! FIXME: write short doc here |
2 | 2 | ||
3 | use hir_def::{attr::Attr, nameres::raw}; | 3 | use hir_def::{ |
4 | attr::Attr, | ||
5 | nameres::{mod_resolution::ModDir, raw}, | ||
6 | }; | ||
4 | use hir_expand::name; | 7 | use hir_expand::name; |
5 | use ra_cfg::CfgOptions; | 8 | use ra_cfg::CfgOptions; |
6 | use ra_db::FileId; | 9 | use ra_db::FileId; |
@@ -12,8 +15,8 @@ use crate::{ | |||
12 | db::DefDatabase, | 15 | db::DefDatabase, |
13 | ids::{AstItemDef, LocationCtx, MacroCallId, MacroCallLoc, MacroDefId, MacroFileKind}, | 16 | ids::{AstItemDef, LocationCtx, MacroCallId, MacroCallLoc, MacroDefId, MacroFileKind}, |
14 | nameres::{ | 17 | nameres::{ |
15 | diagnostics::DefDiagnostic, mod_resolution::ModDir, Crate, CrateDefMap, CrateModuleId, | 18 | diagnostics::DefDiagnostic, Crate, CrateDefMap, CrateModuleId, ModuleData, ModuleDef, |
16 | ModuleData, ModuleDef, PerNs, ReachedFixedPoint, Resolution, ResolveMode, | 19 | PerNs, ReachedFixedPoint, Resolution, ResolveMode, |
17 | }, | 20 | }, |
18 | Adt, AstId, Const, Enum, Function, HirFileId, MacroDef, Module, Name, Path, PathKind, Static, | 21 | Adt, AstId, Const, Enum, Function, HirFileId, MacroDef, Module, Name, Path, PathKind, Static, |
19 | Struct, Trait, TypeAlias, Union, | 22 | Struct, Trait, TypeAlias, Union, |