diff options
author | Jonas Schievink <[email protected]> | 2021-04-10 19:30:28 +0100 |
---|---|---|
committer | Jonas Schievink <[email protected]> | 2021-04-10 19:30:28 +0100 |
commit | 44b04ebe43534f749bc3a8431449bc019cc9c3b2 (patch) | |
tree | 37f9e13ceb4552d68f0ecafefa8fb54a5f5bdae4 /crates/hir_expand/src/db.rs | |
parent | 050dc93e00c9b4be3982c82fa1babd31c3b13b7b (diff) |
Revert "Rewrite `#[derive]` removal to be based on AST"
This reverts commit 7e78aebc8fbbb4043d62949681e4d700f1a2ec46.
Diffstat (limited to 'crates/hir_expand/src/db.rs')
-rw-r--r-- | crates/hir_expand/src/db.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crates/hir_expand/src/db.rs b/crates/hir_expand/src/db.rs index 95dc12744..10fe60821 100644 --- a/crates/hir_expand/src/db.rs +++ b/crates/hir_expand/src/db.rs | |||
@@ -14,9 +14,9 @@ use syntax::{ | |||
14 | }; | 14 | }; |
15 | 15 | ||
16 | use crate::{ | 16 | use crate::{ |
17 | ast_id_map::AstIdMap, hygiene::HygieneFrame, input::process_macro_input, BuiltinDeriveExpander, | 17 | ast_id_map::AstIdMap, hygiene::HygieneFrame, BuiltinDeriveExpander, BuiltinFnLikeExpander, |
18 | BuiltinFnLikeExpander, EagerCallLoc, EagerMacroId, HirFileId, HirFileIdRepr, LazyMacroId, | 18 | EagerCallLoc, EagerMacroId, HirFileId, HirFileIdRepr, LazyMacroId, MacroCallId, MacroCallLoc, |
19 | MacroCallId, MacroCallLoc, MacroDefId, MacroDefKind, MacroFile, ProcMacroExpander, | 19 | MacroDefId, MacroDefKind, MacroFile, ProcMacroExpander, |
20 | }; | 20 | }; |
21 | 21 | ||
22 | /// Total limit on the number of tokens produced by any macro invocation. | 22 | /// Total limit on the number of tokens produced by any macro invocation. |
@@ -191,7 +191,6 @@ fn macro_arg_text(db: &dyn AstDatabase, id: MacroCallId) -> Option<GreenNode> { | |||
191 | }; | 191 | }; |
192 | let loc = db.lookup_intern_macro(id); | 192 | let loc = db.lookup_intern_macro(id); |
193 | let arg = loc.kind.arg(db)?; | 193 | let arg = loc.kind.arg(db)?; |
194 | let arg = process_macro_input(db, arg, id); | ||
195 | Some(arg.green()) | 194 | Some(arg.green()) |
196 | } | 195 | } |
197 | 196 | ||