diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-12-08 10:35:30 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-12-08 10:35:30 +0000 |
commit | ffcdd25cc8e7f1fd7fb4e3e8478c4cd1adfbf843 (patch) | |
tree | 973ccea0049ee917a7f901a7e0238f7ef6c984bc /crates/ra_hir_def/src/nameres/collector.rs | |
parent | 9e551d5452232d1d44e4bba754392beaa3a7628f (diff) | |
parent | 509fedd9d2f228c6dca762cbf06c31af34ac0c75 (diff) |
Merge #2497
2497: Remove MacroFileKind r=matklad a=edwin0cheng
This PR move `to_macro_file_kind` to `hir_expand::db` and use it to get the `FragmentKind` directly, such that we can remove `MacroFileKind`.
Co-authored-by: Edwin Cheng <[email protected]>
Diffstat (limited to 'crates/ra_hir_def/src/nameres/collector.rs')
-rw-r--r-- | crates/ra_hir_def/src/nameres/collector.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir_def/src/nameres/collector.rs b/crates/ra_hir_def/src/nameres/collector.rs index 08693cb13..6a01e3ab7 100644 --- a/crates/ra_hir_def/src/nameres/collector.rs +++ b/crates/ra_hir_def/src/nameres/collector.rs | |||
@@ -7,7 +7,7 @@ use hir_expand::{ | |||
7 | builtin_derive::find_builtin_derive, | 7 | builtin_derive::find_builtin_derive, |
8 | builtin_macro::find_builtin_macro, | 8 | builtin_macro::find_builtin_macro, |
9 | name::{self, AsName, Name}, | 9 | name::{self, AsName, Name}, |
10 | HirFileId, MacroCallId, MacroCallKind, MacroDefId, MacroDefKind, MacroFileKind, | 10 | HirFileId, MacroCallId, MacroCallKind, MacroDefId, MacroDefKind, |
11 | }; | 11 | }; |
12 | use ra_cfg::CfgOptions; | 12 | use ra_cfg::CfgOptions; |
13 | use ra_db::{CrateId, FileId}; | 13 | use ra_db::{CrateId, FileId}; |
@@ -545,7 +545,7 @@ where | |||
545 | self.macro_stack_monitor.increase(macro_def_id); | 545 | self.macro_stack_monitor.increase(macro_def_id); |
546 | 546 | ||
547 | if !self.macro_stack_monitor.is_poison(macro_def_id) { | 547 | if !self.macro_stack_monitor.is_poison(macro_def_id) { |
548 | let file_id: HirFileId = macro_call_id.as_file(MacroFileKind::Items); | 548 | let file_id: HirFileId = macro_call_id.as_file(); |
549 | let raw_items = self.db.raw_items(file_id); | 549 | let raw_items = self.db.raw_items(file_id); |
550 | let mod_dir = self.mod_dirs[&module_id].clone(); | 550 | let mod_dir = self.mod_dirs[&module_id].clone(); |
551 | ModCollector { | 551 | ModCollector { |