diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-03-25 12:25:46 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-03-25 12:25:46 +0000 |
| commit | 8d667bb32ed8460988bf9fe3515a6f8318adb8b0 (patch) | |
| tree | 5d41d254dc94ff7d8d20063a08df2b9b133d34d9 /crates/ra_hir_expand/src/eager.rs | |
| parent | e2dd17f75b1bb5e1185acff66211e74430177592 (diff) | |
| parent | 2adc9a8d5f8f7686a125a478330c67a2d46fba98 (diff) | |
Merge #3692
3692: Introduce `MacroDefKind::CustomDerive` r=matklad a=edwin0cheng
This PR introduce a new `MacroDefKind` `CustomDerive`. And use a new `ProcMacroExpander` for its expanding. And the expander is a dummy for now.
Related: #3654
Co-authored-by: Edwin Cheng <[email protected]>
Diffstat (limited to 'crates/ra_hir_expand/src/eager.rs')
| -rw-r--r-- | crates/ra_hir_expand/src/eager.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crates/ra_hir_expand/src/eager.rs b/crates/ra_hir_expand/src/eager.rs index 687d40294..932f47c30 100644 --- a/crates/ra_hir_expand/src/eager.rs +++ b/crates/ra_hir_expand/src/eager.rs | |||
| @@ -112,7 +112,8 @@ fn eager_macro_recur( | |||
| 112 | } | 112 | } |
| 113 | MacroDefKind::Declarative | 113 | MacroDefKind::Declarative |
| 114 | | MacroDefKind::BuiltIn(_) | 114 | | MacroDefKind::BuiltIn(_) |
| 115 | | MacroDefKind::BuiltInDerive(_) => { | 115 | | MacroDefKind::BuiltInDerive(_) |
| 116 | | MacroDefKind::CustomDerive(_) => { | ||
| 116 | let expanded = lazy_expand(db, &def, curr.with_value(child.clone()))?; | 117 | let expanded = lazy_expand(db, &def, curr.with_value(child.clone()))?; |
| 117 | // replace macro inside | 118 | // replace macro inside |
| 118 | eager_macro_recur(db, expanded, macro_resolver)? | 119 | eager_macro_recur(db, expanded, macro_resolver)? |