Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir_expand/src/db.rs')
| -rw-r--r-- | crates/hir_expand/src/db.rs | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/crates/hir_expand/src/db.rs b/crates/hir_expand/src/db.rs index 795980660d..d71cc22ce4 100644 --- a/crates/hir_expand/src/db.rs +++ b/crates/hir_expand/src/db.rs @@ -54,7 +54,18 @@ impl TokenExpander { TokenExpander::MacroDef { mac, .. } => mac.expand(tt), TokenExpander::Builtin(it) => it.expand(db, id, tt), // FIXME switch these to ExpandResult as well - TokenExpander::BuiltinAttr(it) => it.expand(db, id, tt).into(), + TokenExpander::BuiltinAttr(it) => { + let macro_arg = match db.macro_arg(id) { + Some(it) => it, + None => { + return mbe::ExpandResult::only_err( + mbe::ExpandError::Other("No item argument for attribute".to_string()) + .into(), + ); + } + }; + it.expand(db, id, tt, ¯o_arg.0).into() + } TokenExpander::BuiltinDerive(it) => it.expand(db, id, tt).into(), TokenExpander::ProcMacro(_) => { // We store the result in salsa db to prevent non-deterministic behavior in |