Skip to content

Fix ICE with inconsistent macro matchers - #61046

Merged
bors merged 2 commits into
rust-lang:masterfrom
mark-i-m:transcribe-fix
May 23, 2019
Merged

Fix ICE with inconsistent macro matchers#61046
bors merged 2 commits into
rust-lang:masterfrom
mark-i-m:transcribe-fix

Conversation

@mark-i-m

Copy link
Copy Markdown
Contributor

@mark-i-m

Copy link
Copy Markdown
ContributorAuthor

This may also want to be backported

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 22, 2019
@petrochenkov

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented May 22, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 5a9de55 has been approved by petrochenkov

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 22, 2019
@petrochenkovpetrochenkov added the beta-nominated Nominated for backporting to the compiler in the beta channel. label May 22, 2019
@CentrilCentril added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label May 23, 2019
@Centril

Copy link
Copy Markdown
Contributor

@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
@CentrilCentril mentioned this pull request May 23, 2019
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
@bors
bors merged commit 5a9de55 into rust-lang:masterMay 23, 2019
@pnkfelix

Copy link
Copy Markdown
Contributor

approved for beta-backport.

@pnkfelixpnkfelix added the beta-accepted Accepted for backporting to the compiler in the beta channel. label May 23, 2019
@mark-i-m

Copy link
Copy Markdown
ContributorAuthor

@pnkfelix Is someone else already doing that? I might be able to do it, if you tell me how.

@Centril

Copy link
Copy Markdown
Contributor

I assume @pietroalbini will do a backport rollup later.

@mark-i-m
mark-i-m deleted the transcribe-fix branch May 25, 2019 02:15
@mark-i-m
mark-i-m restored the transcribe-fix branch May 25, 2019 02:15
@mark-i-m
mark-i-m deleted the transcribe-fix branch May 25, 2019 02:15
@emilyalbiniemilyalbini mentioned this pull request May 28, 2019
@emilyalbiniemilyalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label May 28, 2019
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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Inconsistent macro repeat operator leads to panic on nightly

7 participants

@mark-i-m@petrochenkov@bors@Centril@pnkfelix@emilyalbini@rust-highfive