diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-04-09 13:53:49 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-04-09 13:53:49 +0100 |
| commit | 3b1692c3e8b58e0f54e2f0e179c27de8ffb409dc (patch) | |
| tree | 138e167b7c95a312286601a1ba7e675aaab0281e /LICENSE-MIT | |
| parent | 972e1f4b8ca3118e358ba7bb91d4c0cfd4fc10ca (diff) | |
| parent | d6187de4cd34a1288c7820c5477b81b1e9b692a9 (diff) | |
| parent | 4ea5f690bc2692699208999f46a85a9872cbfc73 (diff) | |
Merge #8443 #8446
8443: Rewrite `#[derive]` removal code to be based on AST r=jonas-schievink a=jonas-schievink
We now remove any `#[derive]` before and including the one we want to expand, in the `macro_arg` query.
The same infra will be needed by attribute macros (except we only remove the attribute we're expanding, not any preceding ones).
Part of https://github.com/rust-analyzer/rust-analyzer/issues/8434 (doesn't implement the cfg-expansion yet, because that's more difficult)
8446: Undo path resolution hack for extern prelude r=jonas-schievink a=jonas-schievink
Reverts the change made in https://github.com/rust-analyzer/rust-analyzer/pull/7959
We don't populate the extern prelude for block DefMaps anymore,
so this is unnecessary
bors r+
Co-authored-by: Jonas Schievink <[email protected]>