Skip to content

rustc_mir: insert a dummy access to places being matched on, when building MIR. - #48092

Merged
bors merged 2 commits into
rust-lang:masterfrom
eddyb:discriminate-the-void
Feb 11, 2018
Merged

rustc_mir: insert a dummy access to places being matched on, when building MIR.#48092
bors merged 2 commits into
rust-lang:masterfrom
eddyb:discriminate-the-void

Conversation

@eddyb

@eddybeddyb commented Feb 9, 2018•
edited
Loading

Copy link
Copy Markdown
Contributor

Fixes#47412 by adding a _dummy = Discriminant(place) before each match place {...}.

r? @nikomatsakis

@eddybeddyb added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 9, 2018
@eddyb
eddybforce-pushed the discriminate-the-void branch from 4282b4c to 8af134eCompareFebruary 9, 2018 21:26
@shepmastershepmaster added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 9, 2018
@nikomatsakis

nikomatsakis commented Feb 9, 2018

Copy link
Copy Markdown
Contributor

@bors r+

cc @pnkfelix -- hopefully we can do better once your work is done

@bors

bors commented Feb 9, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 8af134e has been approved by nikomatsakis

@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 Feb 9, 2018
@nikomatsakis

nikomatsakis commented Feb 9, 2018

Copy link
Copy Markdown
Contributor

@bors p=1 -- high priority fix

@Mark-Simulacrum

Mark-Simulacrum commented Feb 9, 2018

Copy link
Copy Markdown
Member

@bors p=5

@bors

bors commented Feb 10, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 8af134e with merge 36a3cf12bfedf203399976f6cebf562ffc0fbb64...

@bors

bors commented Feb 10, 2018

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@borsbors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 10, 2018
@eddyb

eddyb commented Feb 10, 2018

Copy link
Copy Markdown
ContributorAuthor

@bors retry

  • rubygems download failure

@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 Feb 10, 2018
@bors

bors commented Feb 10, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 8af134e with merge 8d9854a2a81f0cfec44c3e9990fef05b568ca9fc...

@bors

bors commented Feb 10, 2018

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-appveyor

@borsbors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 10, 2018
@eddyb

eddyb commented Feb 10, 2018

Copy link
Copy Markdown
ContributorAuthor

@bors retry

  • appveyor timeout?

@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 Feb 10, 2018
@bors

bors commented Feb 10, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 8af134e with merge 89dca1522d45966ebf00973c98530bb726e9e24e...

@bors

bors commented Feb 10, 2018

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-appveyor

@borsbors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 10, 2018
@eddyb

eddyb commented Feb 10, 2018

Copy link
Copy Markdown
ContributorAuthor

@bors retry

@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 Feb 10, 2018
@bors

bors commented Feb 11, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 8af134e with merge 7f2baba...

bors added a commit that referenced this pull request Feb 11, 2018
@bors
Auto merge of#48092- eddyb:discriminate-the-void, r=nikomatsakis
7f2baba
 rustc_mir: insert a dummy access to places being matched on, when building MIR.
Fixes#47412 by adding a `_dummy = Discriminant(place)` before each `match place {...}`.
r? @nikomatsakis
@bors

bors commented Feb 11, 2018

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing 7f2baba to master...

@bors
bors merged commit 8af134e into rust-lang:masterFeb 11, 2018
@borsbors mentioned this pull request Feb 11, 2018
Closed
@eddyb
eddyb deleted the discriminate-the-void branch February 11, 2018 09:11
@eddyb

eddyb commented Feb 11, 2018

Copy link
Copy Markdown
ContributorAuthor

@nikomatsakis We should figure out the backporting situation ASAP.

@blussbluss added the relnotes Marks issues that should be documented in the release notes of the next release. label Feb 11, 2018
@kennytmkennytm mentioned this pull request Feb 11, 2018
Closed
@Mark-SimulacrumMark-Simulacrum mentioned this pull request Feb 11, 2018
Merged
@alexcrichtonalexcrichton added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Feb 11, 2018
bors added a commit that referenced this pull request Feb 12, 2018
@bors
Auto merge of#48146- Mark-Simulacrum:beta-next, r=alexcrichton
ed2c0f0
[beta] Release notes, dist with time crate, and #48092
Backports of
- #48092
- #48013
- #47286
- #48144
@Mark-SimulacrumMark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 12, 2018
@solsonsolson mentioned this pull request Mar 25, 2018
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nikomatsakisnikomatsakisnikomatsakis approved these changes

Assignees

@nikomatsakisnikomatsakis

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.relnotesMarks issues that should be documented in the release notes of the next release.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.

7 participants

@eddyb@nikomatsakis@bors@Mark-Simulacrum@alexcrichton@shepmaster@bluss