From af3d6a4b61e098df00bec205491f97be38393b7a Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Fri, 24 Sep 2021 15:34:57 +0200 Subject: [PATCH] Include macro path in eager macro resolve error --- crates/hir_expand/src/eager.rs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/crates/hir_expand/src/eager.rs b/crates/hir_expand/src/eager.rs index ac87c510233..b78d740c53c 100644 --- a/crates/hir_expand/src/eager.rs +++ b/crates/hir_expand/src/eager.rs @@ -204,8 +204,13 @@ fn eager_macro_recur( // Collect replacement for child in children { - let def = diagnostic_sink - .option_with(|| macro_resolver(child.path()?), || err("failed to resolve macro"))?; + let def = diagnostic_sink.option_with( + || macro_resolver(child.path()?), + || { + let path = child.path().map(|path| format!(" `{}!`", path)).unwrap_or_default(); + err(format!("failed to resolve macro{}", path)) + }, + )?; let insert = match def.kind { MacroDefKind::BuiltInEager(..) => { let id = expand_eager_macro(