Skip to content

Fix ICE #68058 - #68072

Merged
bors merged 2 commits into
rust-lang:masterfrom
JohnTitor:fix-macro-ice
Jan 11, 2020
Merged

Fix ICE #68058#68072
bors merged 2 commits into
rust-lang:masterfrom
JohnTitor:fix-macro-ice

Conversation

@JohnTitor

@JohnTitorJohnTitor commented Jan 9, 2020

Copy link
Copy Markdown
Member

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

petrochenkov commented Jan 10, 2020

Copy link
Copy Markdown
Contributor

Thanks!
@bors r+ rollup

@bors

bors commented Jan 10, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 54f8601 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 Jan 10, 2020
@petrochenkovpetrochenkov mentioned this pull request Jan 10, 2020
Closed
Centril
Centril reviewed Jan 10, 2020
View reviewed changes
Comment threadsrc/librustc_ast_lowering/expr.rs
Centril added a commit to Centril/rust that referenced this pull request Jan 10, 2020
@Centril
Rollup merge ofrust-lang#68072- JohnTitor:fix-macro-ice, r=petroche…
7a2879f
…nkov
Fix ICE rust-lang#68058Fixesrust-lang#68058
r? @petrochenkov
@CentrilCentril mentioned this pull request Jan 10, 2020
Closed
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jan 10, 2020
@JohnTitor
Rollup merge ofrust-lang#68072- JohnTitor:fix-macro-ice, r=petroche…
b480a06
…nkov
Fix ICE rust-lang#68058Fixesrust-lang#68058
r? @petrochenkov
@JohnTitorJohnTitor mentioned this pull request Jan 10, 2020
Closed
@JohnTitor

JohnTitor commented Jan 10, 2020

Copy link
Copy Markdown
MemberAuthor

Failed in #68094 (comment)
@bors r-

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 10, 2020
JohnTitor
JohnTitor commented Jan 10, 2020
View reviewed changes
Comment threadsrc/test/ui/macros/issue-68058.rs Outdated
petrochenkov
petrochenkov reviewed Jan 11, 2020
View reviewed changes
Comment threadsrc/test/ui/macros/issue-68058.rs Outdated
Comment threadsrc/test/ui/macros/issue-68058.rs Outdated
@petrochenkov

petrochenkov commented Jan 11, 2020

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Jan 11, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 48cad46 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 11, 2020
Centril added a commit to Centril/rust that referenced this pull request Jan 11, 2020
@Centril
Rollup merge ofrust-lang#68072- JohnTitor:fix-macro-ice, r=petroche…
544c981
…nkov
Fix ICE rust-lang#68058Fixesrust-lang#68058
r? @petrochenkov
@CentrilCentril mentioned this pull request Jan 11, 2020
Closed
bors added a commit that referenced this pull request Jan 11, 2020
@bors
Auto merge of#68124- Centril:rollup-4h2ybcj, r=Centril
13ad02f
Rollup of 9 pull requests
Successful merges:
- #67000 (Promote references to constants instead of statics)
- #67756 (Collector tweaks)
- #67889 (Compile some CGUs in parallel at the start of codegen)
- #67930 (Rename Result::as_deref_ok to as_deref)
- #68018 (feature_gate: Remove `GateStrength`)
- #68070 (clean up E0185 explanation)
- #68072 (Fix ICE #68058)
- #68114 (Don't require `allow_internal_unstable` unless `staged_api` is enabled.)
- #68120 (Ban `...X` pats, harden tests, and improve diagnostics)
Failed merges:
r? @ghost
Centril added a commit to Centril/rust that referenced this pull request Jan 11, 2020
@Centril
Rollup merge ofrust-lang#68072- JohnTitor:fix-macro-ice, r=petroche…
f02f338
…nkov
Fix ICE rust-lang#68058Fixesrust-lang#68058
r? @petrochenkov
@CentrilCentril mentioned this pull request Jan 11, 2020
Merged
bors added a commit that referenced this pull request Jan 11, 2020
@bors
Auto merge of#68126- Centril:rollup-cz5u7xx, r=Centril
bfd0487
Rollup of 8 pull requests
Successful merges:
- #67756 (Collector tweaks)
- #67889 (Compile some CGUs in parallel at the start of codegen)
- #67930 (Rename Result::as_deref_ok to as_deref)
- #68018 (feature_gate: Remove `GateStrength`)
- #68070 (clean up E0185 explanation)
- #68072 (Fix ICE #68058)
- #68114 (Don't require `allow_internal_unstable` unless `staged_api` is enabled.)
- #68120 (Ban `...X` pats, harden tests, and improve diagnostics)
Failed merges:
r? @ghost
@bors
bors merged commit 48cad46 into rust-lang:masterJan 11, 2020
@JohnTitor
JohnTitor deleted the fix-macro-ice branch January 11, 2020 14:48
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@petrochenkovpetrochenkovpetrochenkov left review comments
+2 more reviewers
@ZoxcZoxcZoxc left review comments
@CentrilCentrilCentril left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@petrochenkovpetrochenkov

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Macro ICE

6 participants

@JohnTitor@petrochenkov@bors@Zoxc@Centril@rust-highfive