Skip to content

Commit 8afb445

Browse files
committed
Rename to CustomDerive
1 parent 7667aa6 commit 8afb445

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

crates/ra_hir_def/src/nameres/collector.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -892,7 +892,7 @@ impl ModCollector<'_, '_> {
892892
let macro_id = MacroDefId {
893893
ast_id: None,
894894
krate: Some(krate),
895-
kind: MacroDefKind::ProcMacro(expander),
895+
kind: MacroDefKind::CustomDerive(expander),
896896
};
897897

898898
self.def_collector.define_proc_macro(name.clone(), macro_id);

crates/ra_hir_expand/src/db.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ pub(crate) fn macro_def(
135135
Some(Arc::new((TokenExpander::BuiltinDerive(expander), mbe::TokenMap::default())))
136136
}
137137
MacroDefKind::BuiltInEager(_) => None,
138-
MacroDefKind::ProcMacro(expander) => {
138+
MacroDefKind::CustomDerive(expander) => {
139139
Some(Arc::new((TokenExpander::ProcMacro(expander), mbe::TokenMap::default())))
140140
}
141141
}

crates/ra_hir_expand/src/eager.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ fn eager_macro_recur(
113113
MacroDefKind::Declarative
114114
| MacroDefKind::BuiltIn(_)
115115
| MacroDefKind::BuiltInDerive(_)
116-
| MacroDefKind::ProcMacro(_) => {
116+
| MacroDefKind::CustomDerive(_) => {
117117
let expanded = lazy_expand(db, &def, curr.with_value(child.clone()))?;
118118
// replace macro inside
119119
eager_macro_recur(db, expanded, macro_resolver)?

crates/ra_hir_expand/src/hygiene.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ impl Hygiene {
3030
MacroDefKind::BuiltIn(_) => None,
3131
MacroDefKind::BuiltInDerive(_) => None,
3232
MacroDefKind::BuiltInEager(_) => None,
33-
MacroDefKind::ProcMacro(_) => None,
33+
MacroDefKind::CustomDerive(_) => None,
3434
}
3535
}
3636
MacroCallId::EagerMacro(_id) => None,

crates/ra_hir_expand/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ pub enum MacroDefKind {
219219
// FIXME: maybe just Builtin and rename BuiltinFnLikeExpander to BuiltinExpander
220220
BuiltInDerive(BuiltinDeriveExpander),
221221
BuiltInEager(EagerExpander),
222-
ProcMacro(ProcMacroExpander),
222+
CustomDerive(ProcMacroExpander),
223223
}
224224

225225
#[derive(Debug, Clone, PartialEq, Eq, Hash)]

0 commit comments

Comments
 (0)