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/libsyntax_pos/lib.rs | |
| 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/libsyntax_pos/lib.rs')
| -rw-r--r-- | src/libsyntax_pos/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax_pos/lib.rs b/src/libsyntax_pos/lib.rs index bd70344b018..67fd847a2ae 100644 --- a/src/libsyntax_pos/lib.rs +++ b/src/libsyntax_pos/lib.rs @@ -87,7 +87,7 @@ scoped_thread_local!(pub static GLOBALS: Globals); #[derive(Debug, Eq, PartialEq, Clone, Ord, PartialOrd, Hash, RustcDecodable, RustcEncodable)] pub enum FileName { Real(PathBuf), - /// e.g. "std" macros + /// A macro. This includes the full name of the macro, so that there are no clashes. Macros(String), /// call to `quote!` QuoteExpansion, |