Fix ICE with inconsistent macro matchers #61046
Merged
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
|
This may also want to be backported |
rust-highfive
added
the
S-waiting-on-review
|
@bors r+ rollup |
|
📌 Commit 5a9de55 has been approved by |
bors
added
S-waiting-on-bors
petrochenkov
added
the
beta-nominated
Centril
added
the
T-compiler
|
@petrochenkov Please remember to add a team to the beta-nominated tag as well. |
Centril
added a commit
to Centril/rust
that referenced
this pull request
May 23, 2019
…nkov Fix ICE with inconsistent macro matchers Fixes rust-lang#61033 r? @petrochenkov
bors
added a commit
that referenced
this pull request
May 23, 2019
Rollup of 7 pull requests Successful merges: - #60981 (Bump compiler-builtins to 0.1.15) - #61014 (Make -Zemit-artifact-notifications also emit the artifact type) - #61043 (Disable LLVM/debug assertions in gnu-full-bootstrap) - #61046 (Fix ICE with inconsistent macro matchers) - #61055 (Solaris CI: Build with dilos2 stable) - #61057 (Revert "Add implementations of last in terms of next_back on a bunch of DoubleEndedIterators.") - #61073 (librustc_errors: Remove unused annotation style `OldSchoolNoteText`) Failed merges: r? @ghost
|
approved for beta-backport. |
pnkfelix
added
the
beta-accepted
|
@pnkfelix Is someone else already doing that? I might be able to do it, if you tell me how. |
|
I assume @pietroalbini will do a backport rollup later. |
pietroalbini
removed
the
beta-nominated
bors
added a commit
that referenced
this pull request
May 29, 2019
[beta] Rollup backports Rolled up: * [beta] adjust deprecation date of mem::uninitialized #61160 Cherry-picked: * Fix ICE with inconsistent macro matchers #61046 * Revert "Add implementations of last in terms of next_back on a bunch of DoubleEndedIterators." #61057 * debuginfo: Revert to old/more verbose behavior for -Cdebuginfo=1 #61007 r? @ghost
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.
Fixes #61033
r? @petrochenkov