diff options
Diffstat (limited to 'crates')
-rw-r--r-- | crates/ra_hir_def/src/nameres/collector.rs | 2 | ||||
-rw-r--r-- | crates/ra_hir_expand/src/db.rs | 2 | ||||
-rw-r--r-- | crates/ra_hir_expand/src/eager.rs | 2 | ||||
-rw-r--r-- | crates/ra_hir_expand/src/hygiene.rs | 2 | ||||
-rw-r--r-- | crates/ra_hir_expand/src/lib.rs | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/crates/ra_hir_def/src/nameres/collector.rs b/crates/ra_hir_def/src/nameres/collector.rs index 76be71a30..1dcf5a309 100644 --- a/crates/ra_hir_def/src/nameres/collector.rs +++ b/crates/ra_hir_def/src/nameres/collector.rs | |||
@@ -892,7 +892,7 @@ impl ModCollector<'_, '_> { | |||
892 | let macro_id = MacroDefId { | 892 | let macro_id = MacroDefId { |
893 | ast_id: None, | 893 | ast_id: None, |
894 | krate: Some(krate), | 894 | krate: Some(krate), |
895 | kind: MacroDefKind::ProcMacro(expander), | 895 | kind: MacroDefKind::CustomDerive(expander), |
896 | }; | 896 | }; |
897 | 897 | ||
898 | self.def_collector.define_proc_macro(name.clone(), macro_id); | 898 | self.def_collector.define_proc_macro(name.clone(), macro_id); |
diff --git a/crates/ra_hir_expand/src/db.rs b/crates/ra_hir_expand/src/db.rs index c2eb75ee5..047452306 100644 --- a/crates/ra_hir_expand/src/db.rs +++ b/crates/ra_hir_expand/src/db.rs | |||
@@ -135,7 +135,7 @@ pub(crate) fn macro_def( | |||
135 | Some(Arc::new((TokenExpander::BuiltinDerive(expander), mbe::TokenMap::default()))) | 135 | Some(Arc::new((TokenExpander::BuiltinDerive(expander), mbe::TokenMap::default()))) |
136 | } | 136 | } |
137 | MacroDefKind::BuiltInEager(_) => None, | 137 | MacroDefKind::BuiltInEager(_) => None, |
138 | MacroDefKind::ProcMacro(expander) => { | 138 | MacroDefKind::CustomDerive(expander) => { |
139 | Some(Arc::new((TokenExpander::ProcMacro(expander), mbe::TokenMap::default()))) | 139 | Some(Arc::new((TokenExpander::ProcMacro(expander), mbe::TokenMap::default()))) |
140 | } | 140 | } |
141 | } | 141 | } |
diff --git a/crates/ra_hir_expand/src/eager.rs b/crates/ra_hir_expand/src/eager.rs index 9ff743b9e..932f47c30 100644 --- a/crates/ra_hir_expand/src/eager.rs +++ b/crates/ra_hir_expand/src/eager.rs | |||
@@ -113,7 +113,7 @@ fn eager_macro_recur( | |||
113 | MacroDefKind::Declarative | 113 | MacroDefKind::Declarative |
114 | | MacroDefKind::BuiltIn(_) | 114 | | MacroDefKind::BuiltIn(_) |
115 | | MacroDefKind::BuiltInDerive(_) | 115 | | MacroDefKind::BuiltInDerive(_) |
116 | | MacroDefKind::ProcMacro(_) => { | 116 | | MacroDefKind::CustomDerive(_) => { |
117 | let expanded = lazy_expand(db, &def, curr.with_value(child.clone()))?; | 117 | let expanded = lazy_expand(db, &def, curr.with_value(child.clone()))?; |
118 | // replace macro inside | 118 | // replace macro inside |
119 | eager_macro_recur(db, expanded, macro_resolver)? | 119 | eager_macro_recur(db, expanded, macro_resolver)? |
diff --git a/crates/ra_hir_expand/src/hygiene.rs b/crates/ra_hir_expand/src/hygiene.rs index 182c08eb3..0b41d0e95 100644 --- a/crates/ra_hir_expand/src/hygiene.rs +++ b/crates/ra_hir_expand/src/hygiene.rs | |||
@@ -30,7 +30,7 @@ impl Hygiene { | |||
30 | MacroDefKind::BuiltIn(_) => None, | 30 | MacroDefKind::BuiltIn(_) => None, |
31 | MacroDefKind::BuiltInDerive(_) => None, | 31 | MacroDefKind::BuiltInDerive(_) => None, |
32 | MacroDefKind::BuiltInEager(_) => None, | 32 | MacroDefKind::BuiltInEager(_) => None, |
33 | MacroDefKind::ProcMacro(_) => None, | 33 | MacroDefKind::CustomDerive(_) => None, |
34 | } | 34 | } |
35 | } | 35 | } |
36 | MacroCallId::EagerMacro(_id) => None, | 36 | MacroCallId::EagerMacro(_id) => None, |
diff --git a/crates/ra_hir_expand/src/lib.rs b/crates/ra_hir_expand/src/lib.rs index ac1d12252..86299459f 100644 --- a/crates/ra_hir_expand/src/lib.rs +++ b/crates/ra_hir_expand/src/lib.rs | |||
@@ -219,7 +219,7 @@ pub enum MacroDefKind { | |||
219 | // FIXME: maybe just Builtin and rename BuiltinFnLikeExpander to BuiltinExpander | 219 | // FIXME: maybe just Builtin and rename BuiltinFnLikeExpander to BuiltinExpander |
220 | BuiltInDerive(BuiltinDeriveExpander), | 220 | BuiltInDerive(BuiltinDeriveExpander), |
221 | BuiltInEager(EagerExpander), | 221 | BuiltInEager(EagerExpander), |
222 | ProcMacro(ProcMacroExpander), | 222 | CustomDerive(ProcMacroExpander), |
223 | } | 223 | } |
224 | 224 | ||
225 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 225 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |