aboutsummaryrefslogtreecommitdiff
path: root/crates/hir_expand/src
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-05-19 20:07:05 +0100
committerGitHub <[email protected]>2021-05-19 20:07:05 +0100
commit49922cb2c3cd8390891cda9acb88b4b979db8911 (patch)
treec7aae61f580601b307541d05f4f7ea17db788def /crates/hir_expand/src
parent2d76b176c0b0f86648a038a5e4ca84fb04e809dc (diff)
parentc0d93bc4d60d71fb6fec6e6c7305401f96ac18e8 (diff)
parent274d813cff34576d3fe9d343e73669385214d3c3 (diff)
Merge #8885 #8887
8885: internal: greatly simplify eager macro representation r=jonas-schievink a=jonas-schievink - Share structures with lazy macros, make both use `MacroCallLoc`. - Remove `intern_eager_expansion`, `EagerCallLoc`, `EagerMacroId`, and *many* matches on `MacroCallId`. - Make a lot of FIXMEs obsolete since the code no longer distinguishes between eager and lazy macros. - Add `EagerCallInfo`, which is `Some` for calls to eager macros and holds the argument or expansion result and the included file. 8887: fix: fix derive collection after unresolved attribute fallback r=jonas-schievink a=jonas-schievink Fixes https://github.com/rust-analyzer/rust-analyzer/pull/8882#issuecomment-844379170 bors r+ Co-authored-by: Jonas Schievink <[email protected]>