Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix ICE #68058 #68072

Merged
merged 2 commits into from
Jan 11, 2020
Merged

Fix ICE #68058 #68072

merged 2 commits into from
Jan 11, 2020

Conversation

JohnTitor
Copy link
Member

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

Thanks!
@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jan 10, 2020

📌 Commit 54f8601 has been approved by petrochenkov

@bors bors 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
@petrochenkov petrochenkov mentioned this pull request Jan 10, 2020
Closed
Centril added a commit to Centril/rust that referenced this pull request Jan 10, 2020
@Centril
Rollup merge of rust-lang#68072 - JohnTitor:fix-macro-ice, r=petroche…
7a2879f 
…nkov

Fix ICE rust-lang#68058

Fixes rust-lang#68058

r? @petrochenkov
@Centril Centril 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 of rust-lang#68072 - JohnTitor:fix-macro-ice, r=petroche…
b480a06 
…nkov

Fix ICE rust-lang#68058

Fixes rust-lang#68058

r? @petrochenkov
@JohnTitor JohnTitor mentioned this pull request Jan 10, 2020
Closed
@JohnTitor
Copy link
Member Author

Failed in #68094 (comment)
@bors r-

@bors bors 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
petrochenkov
petrochenkov reviewed Jan 11, 2020
View reviewed changes
src/test/ui/macros/issue-68058.rs Outdated Show resolved Hide resolved
src/test/ui/macros/issue-68058.rs Outdated Show resolved Hide resolved
@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Jan 11, 2020

📌 Commit 48cad46 has been approved by petrochenkov

@bors bors 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 of rust-lang#68072 - JohnTitor:fix-macro-ice, r=petroche…
544c981 
…nkov

Fix ICE rust-lang#68058

Fixes rust-lang#68058

r? @petrochenkov
@Centril Centril 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 of rust-lang#68072 - JohnTitor:fix-macro-ice, r=petroche…
f02f338 
…nkov

Fix ICE rust-lang#68058

Fixes rust-lang#68058

r? @petrochenkov
@Centril Centril 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:master Jan 11, 2020
@JohnTitor JohnTitor deleted the fix-macro-ice branch January 11, 2020 14:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@petrochenkov petrochenkov petrochenkov left review comments

@Centril Centril Centril left review comments

@Zoxc Zoxc Zoxc left review comments

Assignees

@petrochenkov petrochenkov

Labels
S-waiting-on-bors Status: 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