diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-10-30 15:07:12 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-10-30 15:07:12 +0000 |
commit | 5806195bc1cdb1ca3fa257e99fd6e0dd897713a9 (patch) | |
tree | 92b54891047977e6483e430a467d8e561ea3bc53 /crates/ra_hir/src/nameres/collector.rs | |
parent | f996b6019bd2f388bd9994ea83f25487eb111560 (diff) | |
parent | e34e71c62d9b4cf0ab237969e03ecde893ab347b (diff) |
Merge #2128
2128: move raw_items 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 | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crates/ra_hir/src/nameres/collector.rs b/crates/ra_hir/src/nameres/collector.rs index a94a0554c..2f342870b 100644 --- a/crates/ra_hir/src/nameres/collector.rs +++ b/crates/ra_hir/src/nameres/collector.rs | |||
@@ -1,5 +1,6 @@ | |||
1 | //! FIXME: write short doc here | 1 | //! FIXME: write short doc here |
2 | 2 | ||
3 | use hir_def::{attr::Attr, name, nameres::raw}; | ||
3 | use ra_cfg::CfgOptions; | 4 | use ra_cfg::CfgOptions; |
4 | use ra_db::FileId; | 5 | use ra_db::FileId; |
5 | use ra_syntax::{ast, SmolStr}; | 6 | use ra_syntax::{ast, SmolStr}; |
@@ -7,12 +8,10 @@ use rustc_hash::FxHashMap; | |||
7 | use test_utils::tested_by; | 8 | use test_utils::tested_by; |
8 | 9 | ||
9 | use crate::{ | 10 | use crate::{ |
10 | attr::Attr, | ||
11 | db::DefDatabase, | 11 | db::DefDatabase, |
12 | ids::{AstItemDef, LocationCtx, MacroCallId, MacroCallLoc, MacroDefId, MacroFileKind}, | 12 | ids::{AstItemDef, LocationCtx, MacroCallId, MacroCallLoc, MacroDefId, MacroFileKind}, |
13 | name::MACRO_RULES, | ||
14 | nameres::{ | 13 | nameres::{ |
15 | diagnostics::DefDiagnostic, mod_resolution::ModDir, raw, Crate, CrateDefMap, CrateModuleId, | 14 | diagnostics::DefDiagnostic, mod_resolution::ModDir, Crate, CrateDefMap, CrateModuleId, |
16 | ModuleData, ModuleDef, PerNs, ReachedFixedPoint, Resolution, ResolveMode, | 15 | ModuleData, ModuleDef, PerNs, ReachedFixedPoint, Resolution, ResolveMode, |
17 | }, | 16 | }, |
18 | Adt, AstId, Const, Enum, Function, HirFileId, MacroDef, Module, Name, Path, PathKind, Static, | 17 | Adt, AstId, Const, Enum, Function, HirFileId, MacroDef, Module, Name, Path, PathKind, Static, |
@@ -725,7 +724,7 @@ where | |||
725 | } | 724 | } |
726 | 725 | ||
727 | fn is_macro_rules(path: &Path) -> bool { | 726 | fn is_macro_rules(path: &Path) -> bool { |
728 | path.as_ident() == Some(&MACRO_RULES) | 727 | path.as_ident() == Some(&name::MACRO_RULES) |
729 | } | 728 | } |
730 | 729 | ||
731 | #[cfg(test)] | 730 | #[cfg(test)] |