user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #54338 - orium:fix-macro-inc-comp, r=nrc

Browse source 
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
This commit is contained in:
bors 2018-09-28 06:40:32 +00:00
commit bd8d030d01
11 changed files with 47 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/test/ui/editions/edition-keywords-2018-2015-parsing.stderr
View file

@ -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

2
src/test/ui/editions/edition-keywords-2018-2018-parsing.stderr
View file

@ -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