aboutsummaryrefslogtreecommitdiff
path: root/crates/hir_expand/src/db.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/hir_expand/src/db.rs')
-rw-r--r--crates/hir_expand/src/db.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/crates/hir_expand/src/db.rs b/crates/hir_expand/src/db.rs
index 7ea1c6301..ff50bfd82 100644
--- a/crates/hir_expand/src/db.rs
+++ b/crates/hir_expand/src/db.rs
@@ -196,6 +196,7 @@ fn macro_expand_with_arg(
196 id: MacroCallId, 196 id: MacroCallId,
197 arg: Option<Arc<(tt::Subtree, mbe::TokenMap)>>, 197 arg: Option<Arc<(tt::Subtree, mbe::TokenMap)>>,
198) -> ExpandResult<Option<Arc<tt::Subtree>>> { 198) -> ExpandResult<Option<Arc<tt::Subtree>>> {
199 let _p = profile::span("macro_expand");
199 let lazy_id = match id { 200 let lazy_id = match id {
200 MacroCallId::LazyMacro(id) => id, 201 MacroCallId::LazyMacro(id) => id,
201 MacroCallId::EagerMacro(id) => { 202 MacroCallId::EagerMacro(id) => {
@@ -283,14 +284,15 @@ fn parse_macro_with_arg(
283 macro_file: MacroFile, 284 macro_file: MacroFile,
284 arg: Option<Arc<(tt::Subtree, mbe::TokenMap)>>, 285 arg: Option<Arc<(tt::Subtree, mbe::TokenMap)>>,
285) -> ExpandResult<Option<(Parse<SyntaxNode>, Arc<mbe::TokenMap>)>> { 286) -> ExpandResult<Option<(Parse<SyntaxNode>, Arc<mbe::TokenMap>)>> {
286 let _p = profile::span("parse_macro_query");
287
288 let macro_call_id = macro_file.macro_call_id; 287 let macro_call_id = macro_file.macro_call_id;
289 let result = if let Some(arg) = arg { 288 let result = if let Some(arg) = arg {
290 macro_expand_with_arg(db, macro_call_id, Some(arg)) 289 macro_expand_with_arg(db, macro_call_id, Some(arg))
291 } else { 290 } else {
292 db.macro_expand(macro_call_id) 291 db.macro_expand(macro_call_id)
293 }; 292 };
293
294 let _p = profile::span("parse_macro_expansion");
295
294 if let Some(err) = &result.err { 296 if let Some(err) = &result.err {
295 // Note: 297 // Note:
296 // The final goal we would like to make all parse_macro success, 298 // The final goal we would like to make all parse_macro success,