[beta] Rollup backports #54750
Merged
[beta] Rollup backports #54750
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Before this two macros with same name would be indistinguishable inside a `FileName`. This caused a bug in incremental compilation (see rust-lang#53097) since two different macros would map out to the same `StableFilemapId`. Fixes rust-lang#53097.
…lutions Derive helpers conflict currently conflict with anything else, so if some resolution from a single import appears later, it will result in error anyway
|
@bors r+ p=10 |
|
📌 Commit 2280d59 has been approved by |
bors
added
the
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Oct 2, 2018
[beta] Rollup backports Merged and approved: * #54650: Don't lint non-extern-prelude extern crate's in Rust 2018. * #54338: Use full name to identify a macro in a `FileName`. * #54518: resolve: Do not block derive helper resolutions on single import resolutions * #54581: Accept trailing comma in `cfg_attr` r? @ghost
|
💥 Test timed out |
bors
added
S-waiting-on-review
|
@bors retry Travis didn't send the status update... |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Oct 2, 2018
[beta] Rollup backports Merged and approved: * #54650: Don't lint non-extern-prelude extern crate's in Rust 2018. * #54338: Use full name to identify a macro in a `FileName`. * #54518: resolve: Do not block derive helper resolutions on single import resolutions * #54581: Accept trailing comma in `cfg_attr` r? @ghost
|
☀️ Test successful - status-appveyor, status-travis |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merged and approved:
FileName. #54338: Use full name to identify a macro in aFileName.cfg_attr#54581: Accept trailing comma incfg_attrr? @ghost