diff options
Diffstat (limited to 'crates/hir_def/src/nameres')
-rw-r--r-- | crates/hir_def/src/nameres/collector.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crates/hir_def/src/nameres/collector.rs b/crates/hir_def/src/nameres/collector.rs index dcedf7766..4bcdc0fc8 100644 --- a/crates/hir_def/src/nameres/collector.rs +++ b/crates/hir_def/src/nameres/collector.rs | |||
@@ -22,7 +22,7 @@ use syntax::ast; | |||
22 | use crate::{ | 22 | use crate::{ |
23 | attr::Attrs, | 23 | attr::Attrs, |
24 | db::DefDatabase, | 24 | db::DefDatabase, |
25 | item_attr_as_call_id, | 25 | derive_macro_as_call_id, |
26 | item_scope::{ImportType, PerNsGlobImports}, | 26 | item_scope::{ImportType, PerNsGlobImports}, |
27 | item_tree::{ | 27 | item_tree::{ |
28 | self, FileItemTreeId, ItemTree, ItemTreeId, MacroCall, MacroRules, Mod, ModItem, ModKind, | 28 | self, FileItemTreeId, ItemTree, ItemTreeId, MacroCall, MacroRules, Mod, ModItem, ModKind, |
@@ -820,8 +820,8 @@ impl DefCollector<'_> { | |||
820 | true | 820 | true |
821 | }); | 821 | }); |
822 | attribute_macros.retain(|directive| { | 822 | attribute_macros.retain(|directive| { |
823 | match item_attr_as_call_id(&directive.ast_id, self.db, self.def_map.krate, |path| { | 823 | match derive_macro_as_call_id(&directive.ast_id, self.db, self.def_map.krate, |path| { |
824 | self.resolve_attribute_macro(&directive, &path) | 824 | self.resolve_derive_macro(&directive, &path) |
825 | }) { | 825 | }) { |
826 | Ok(call_id) => { | 826 | Ok(call_id) => { |
827 | resolved.push((directive.module_id, call_id, 0)); | 827 | resolved.push((directive.module_id, call_id, 0)); |
@@ -844,7 +844,7 @@ impl DefCollector<'_> { | |||
844 | res | 844 | res |
845 | } | 845 | } |
846 | 846 | ||
847 | fn resolve_attribute_macro( | 847 | fn resolve_derive_macro( |
848 | &self, | 848 | &self, |
849 | directive: &DeriveDirective, | 849 | directive: &DeriveDirective, |
850 | path: &ModPath, | 850 | path: &ModPath, |