Skip to content

Remove vestigial diverging !-coercion #50351

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.

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

Merged
merged 3 commits into from
May 15, 2018

Conversation

varkor
Copy link
Member

@varkor varkor commented Apr 30, 2018

Such conversions are no longer permitted. Fixes #50350.

r? @nikomatsakis

Such conversions are no longer permitted.
@rust-highfive

This comment has been minimized.

This was explicitly testing the behaviour which is now no longer permitted.
@varkor
Copy link
Member Author

varkor commented Apr 30, 2018

r? @nikomatsakis

Copy link
Contributor

@nikomatsakis nikomatsakis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One nit.

@@ -690,7 +690,7 @@ https://doc.rust-lang.org/reference/types.html#trait-objects");
arm_span: arm.body.span,
source: match_src
});
coercion.coerce(self, &cause, &arm.body, arm_ty, self.diverges.get());
coercion.coerce(self, &cause, &arm.body, arm_ty);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 -- the fact that this parameter was still needed should have been a warning sign. sigh.

// Accepted: return is coerced to `!` just fine, and then `22` can be
// because we already diverged.
let x: [!; 2] = [return, 22];
// Accepted: return is coerced to `!` just fine, but `22` cannot be.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: This is no longer "accepted"

@nikomatsakis
Copy link
Contributor

@bors try

@bors
Copy link
Collaborator

bors commented May 1, 2018

⌛ Trying commit 5489969 with merge 1ecbdc3...

bors added a commit that referenced this pull request May 1, 2018
Remove vestigial diverging !-coercion

Such conversions are no longer permitted. Fixes #50350.

r? @nikomatsakis
@nikomatsakis
Copy link
Contributor

cc @rust-lang/infra -- this could use a "check-only" crater run.

@nikomatsakis nikomatsakis added the S-waiting-on-crater Status: Waiting on a crater run to be completed. label May 1, 2018
@bors
Copy link
Collaborator

bors commented May 1, 2018

☀️ Test successful - status-travis
State: approved= try=True

@aidanhs
Copy link
Member

aidanhs commented May 5, 2018

Crater run started

@nikomatsakis
Copy link
Contributor

@aidanhs any update? :)

@kennytm
Copy link
Member

kennytm commented May 11, 2018

We're still uploading to http://cargobomb-reports.s3.amazonaws.com/pr-50351/index.html, but there's only a single regression with yamlette-0.0.4 (not sure if legit or spurious yet).

@aidanhs
Copy link
Member

aidanhs commented May 12, 2018

Upload complete at http://cargobomb-reports.s3.amazonaws.com/pr-50351/index.html

(sorry for the delay, uploading hit a bug in crater that I had to debug and fix)

@varkor
Copy link
Member Author

varkor commented May 12, 2018

yamlette failed because it was killed after not generating output for 300s. That doesn't seem like something this change would have caused.

@aidanhs
Copy link
Member

aidanhs commented May 13, 2018

Reuploaded, the report generation was buggy too (so both logs were identical). Regarding the timeout - seems like normal variance, looking at the two logs it appears the one that passed squeaked by with just a few seconds under 300.

@pietroalbini pietroalbini added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-crater Status: Waiting on a crater run to be completed. labels May 14, 2018
@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented May 14, 2018

📌 Commit 5489969 has been approved by nikomatsakis

@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 May 14, 2018
@bors
Copy link
Collaborator

bors commented May 15, 2018

⌛ Testing commit 5489969 with merge eca0da5...

bors added a commit that referenced this pull request May 15, 2018
Remove vestigial diverging !-coercion

Such conversions are no longer permitted. Fixes #50350.

r? @nikomatsakis
@bors
Copy link
Collaborator

bors commented May 15, 2018

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

@bors bors merged commit 5489969 into rust-lang:master May 15, 2018
@varkor varkor deleted the vestigial-never-conversion branch May 15, 2018 13:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants