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/librustc_metadata/decoder.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/librustc_metadata/decoder.rs')
| -rw-r--r-- | src/librustc_metadata/decoder.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_metadata/decoder.rs b/src/librustc_metadata/decoder.rs index 35ce6eb91b6..33a4af053eb 100644 --- a/src/librustc_metadata/decoder.rs +++ b/src/librustc_metadata/decoder.rs @@ -1106,10 +1106,10 @@ impl<'a, 'tcx> CrateMetadata { } } - pub fn get_macro(&self, id: DefIndex) -> (InternedString, MacroDef) { + pub fn get_macro(&self, id: DefIndex) -> MacroDef { let entry = self.entry(id); match entry.kind { - EntryKind::MacroDef(macro_def) => (self.item_name(id), macro_def.decode(self)), + EntryKind::MacroDef(macro_def) => macro_def.decode(self), _ => bug!(), } } |