diff options
| author | bors <bors@rust-lang.org> | 2018-09-28 06:40:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-09-28 06:40:32 +0000 |
| commit | bd8d030d014a4aa13b9b02b0ce98e2de2a2c54be (patch) | |
| tree | f9073c5d1269b2c8c372857159d5e59b9e5808c1 /src/test/ui/editions | |
| parent | c222479c6feb036e5e5198e068aa9824d855ffa4 (diff) | |
| parent | 2d7edf908d5767567d20bec2440099b317169d8d (diff) | |
| download | rust-bd8d030d014a4aa13b9b02b0ce98e2de2a2c54be.tar.gz rust-bd8d030d014a4aa13b9b02b0ce98e2de2a2c54be.zip | |
Auto merge of #54338 - orium:fix-macro-inc-comp, r=nrc
Use full name to identify a macro in a `FileName`. Before this two macros with same name would be indistinguishable inside a `FileName`. This caused a bug in incremental compilation (see #53097) since two different macros would map out to the same `StableFilemapId`. Fixes #53097. r? @nrc
Diffstat (limited to 'src/test/ui/editions')
| -rw-r--r-- | src/test/ui/editions/edition-keywords-2018-2015-parsing.stderr | 2 | ||||
| -rw-r--r-- | src/test/ui/editions/edition-keywords-2018-2018-parsing.stderr | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/ui/editions/edition-keywords-2018-2015-parsing.stderr b/src/test/ui/editions/edition-keywords-2018-2015-parsing.stderr index 02e7d5b7cd0..5955410aa10 100644 --- a/src/test/ui/editions/edition-keywords-2018-2015-parsing.stderr +++ b/src/test/ui/editions/edition-keywords-2018-2015-parsing.stderr @@ -23,7 +23,7 @@ LL | r#async = consumes_async_raw!(async); //~ ERROR no rules expected the t | ^^^^^ error: expected one of `move`, `|`, or `||`, found `<eof>` - --> <passes_ident macros>:1:22 + --> <::edition_kw_macro_2015::passes_ident macros>:1:22 | LL | ( $ i : ident ) => ( $ i ) | ^^^ expected one of `move`, `|`, or `||` here diff --git a/src/test/ui/editions/edition-keywords-2018-2018-parsing.stderr b/src/test/ui/editions/edition-keywords-2018-2018-parsing.stderr index 435e395c291..6ea736828f9 100644 --- a/src/test/ui/editions/edition-keywords-2018-2018-parsing.stderr +++ b/src/test/ui/editions/edition-keywords-2018-2018-parsing.stderr @@ -23,7 +23,7 @@ LL | r#async = consumes_async_raw!(async); //~ ERROR no rules expected the t | ^^^^^ error: expected one of `move`, `|`, or `||`, found `<eof>` - --> <passes_ident macros>:1:22 + --> <::edition_kw_macro_2018::passes_ident macros>:1:22 | LL | ( $ i : ident ) => ( $ i ) | ^^^ expected one of `move`, `|`, or `||` here |