bors[bot] 3b1692c3e8
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 <jonasschievink@gmail.com>
2021-04-09 12:53:49 +00:00
..
2021-04-06 21:42:27 +03:00
2021-04-09 11:21:31 +02:00
2021-04-09 12:53:49 +00:00
2021-04-09 14:50:42 +02:00
2021-04-09 14:40:58 +02:00
2021-04-08 05:46:15 +00:00
2021-04-06 19:38:59 -04:00
2021-04-06 16:22:26 +03:00
2021-04-08 10:57:47 -04:00
2021-04-07 11:39:33 -04:00
2021-04-06 21:42:27 +03:00