]> git.lizzy.rs Git - rust.git/commit
Rollup merge of #88232 - m-ou-se:macro-name-imported-but-not-macro, r=estebank
authorMara Bos <m-ou.se@m-ou.se>
Mon, 23 Aug 2021 18:45:50 +0000 (20:45 +0200)
committerGitHub <noreply@github.com>
Mon, 23 Aug 2021 18:45:50 +0000 (20:45 +0200)
commitc31e02a24caac2a4277475a79eb2934141265dac
treebaceff4bbe7779168f2a9f387e8481ed0df24291
parent5cf025f076e76d235cc3e795a22499cff9f4fc62
parent908ce2fd1f8f87a18f005b6d86276649786475d8
Rollup merge of #88232 - m-ou-se:macro-name-imported-but-not-macro, r=estebank

Add notes to macro-not-found diagnostics to point out how things with the same name were not a match.

This adds notes like:
```
error: cannot find derive macro `Serialize` in this scope
  --> $DIR/issue-88206.rs:22:10
   |
LL | #[derive(Serialize)]
   |          ^^^^^^^^^
   |
note: `Serialize` is imported here, but it is not a derive macro
  --> $DIR/issue-88206.rs:17:11
   |
LL | use hey::{Serialize, Deserialize};
   |           ^^^^^^^^^
```

Fixes https://github.com/rust-lang/rust/issues/88206

Includes https://github.com/rust-lang/rust/pull/88229

r? `@estebank`