mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename to CustomDerive

Browse Source
This commit is contained in:
Edwin Cheng 2020-03-24 03:45:52 +08:00
parent 7667aa6033
commit 8afb445357
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/ra_hir_def/src/nameres/collector.rs
View File

@ -892,7 +892,7 @@ impl ModCollector<'_, '_> {
let macro_id = MacroDefId { let macro_id = MacroDefId {
ast_id: None, ast_id: None,
krate: Some(krate), krate: Some(krate),
kind: MacroDefKind::ProcMacro(expander), kind: MacroDefKind::CustomDerive(expander),
}; };
self.def_collector.define_proc_macro(name.clone(), macro_id); self.def_collector.define_proc_macro(name.clone(), macro_id);

2
crates/ra_hir_expand/src/db.rs
View File

@ -135,7 +135,7 @@ pub(crate) fn macro_def(
Some(Arc::new((TokenExpander::BuiltinDerive(expander), mbe::TokenMap::default()))) Some(Arc::new((TokenExpander::BuiltinDerive(expander), mbe::TokenMap::default())))
} }
MacroDefKind::BuiltInEager(_) => None, MacroDefKind::BuiltInEager(_) => None,
MacroDefKind::ProcMacro(expander) => { MacroDefKind::CustomDerive(expander) => {
Some(Arc::new((TokenExpander::ProcMacro(expander), mbe::TokenMap::default()))) Some(Arc::new((TokenExpander::ProcMacro(expander), mbe::TokenMap::default())))
} }
} }

2
crates/ra_hir_expand/src/eager.rs
View File

@ -113,7 +113,7 @@ fn eager_macro_recur(
MacroDefKind::Declarative MacroDefKind::Declarative
| MacroDefKind::BuiltIn(_) | MacroDefKind::BuiltIn(_)
| MacroDefKind::BuiltInDerive(_) | MacroDefKind::BuiltInDerive(_)
| MacroDefKind::ProcMacro(_) => { | MacroDefKind::CustomDerive(_) => {
let expanded = lazy_expand(db, &def, curr.with_value(child.clone()))?; let expanded = lazy_expand(db, &def, curr.with_value(child.clone()))?;
// replace macro inside // replace macro inside
eager_macro_recur(db, expanded, macro_resolver)? eager_macro_recur(db, expanded, macro_resolver)?

2
crates/ra_hir_expand/src/hygiene.rs
View File

@ -30,7 +30,7 @@ impl Hygiene {
MacroDefKind::BuiltIn(_) => None, MacroDefKind::BuiltIn(_) => None,
MacroDefKind::BuiltInDerive(_) => None, MacroDefKind::BuiltInDerive(_) => None,
MacroDefKind::BuiltInEager(_) => None, MacroDefKind::BuiltInEager(_) => None,
MacroDefKind::ProcMacro(_) => None, MacroDefKind::CustomDerive(_) => None,
} }
} }
MacroCallId::EagerMacro(_id) => None, MacroCallId::EagerMacro(_id) => None,

2
crates/ra_hir_expand/src/lib.rs
View File

@ -219,7 +219,7 @@ pub enum MacroDefKind {
// FIXME: maybe just Builtin and rename BuiltinFnLikeExpander to BuiltinExpander // FIXME: maybe just Builtin and rename BuiltinFnLikeExpander to BuiltinExpander
BuiltInDerive(BuiltinDeriveExpander), BuiltInDerive(BuiltinDeriveExpander),
BuiltInEager(EagerExpander), BuiltInEager(EagerExpander),
ProcMacro(ProcMacroExpander), CustomDerive(ProcMacroExpander),
} }
#[derive(Debug, Clone, PartialEq, Eq, Hash)] #[derive(Debug, Clone, PartialEq, Eq, Hash)]