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

[beta] Another round of backports #50182

Merged
merged 7 commits into from
Apr 23, 2018
Merged

[beta] Another round of backports #50182

merged 7 commits into from
Apr 23, 2018

Conversation

alexcrichton
Copy link
Member

ExpHP and others added 7 commits April 21, 2018 17:03
@ExpHP @alexcrichton
smaller PR just to fix rust-lang#50002
7ef7f38
@ExpHP @alexcrichton
fix my unit test that was horrendously wrong
bbfc486 
and add one for non-mut slicing since I touched that method too
@pnkfelix @alexcrichton
Revert stabilization of feature(never_type).
1bc6989 
This commit is just covering the feature gate itself and the tests
that made direct use of `!` and thus need to opt back into the
feature.

A follow on commit brings back the other change that motivates the
revert: Namely, going back to the old rules for falling back to `()`.
@pnkfelix @alexcrichton
Bring back old fallback semantics: Without feature(never_type), fallb…
e7c614b 
…ack to `()`, not `!`.

Note that this commit, since it is trying to be minimal in order to
ease backporting to the beta and release channels, does *not* include
the old future-proofing warnings that we used to have associated with
such fallback to `()`; see discussion at this comment:

rust-lang#49691 (comment)
@pnkfelix @alexcrichton
Revert "Stabilize the TryFrom and TryInto traits"
d8cd933 
This reverts commit e53a2a7.
@kennytm @alexcrichton
Add back missing #![feature(never_type)]s
c04b020
@alexcrichton
TryFrom destabilization fixups
1ca8ce9
@rust-highfive
Copy link
Collaborator

r? @aidanhs

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link
Collaborator

warning Warning warning

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 23, 2018
@alexcrichton
Copy link
Member Author

@bors: r+ p=1

@bors
Copy link
Contributor

bors commented Apr 23, 2018

📌 Commit 1ca8ce9 has been approved by alexcrichton

@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 Apr 23, 2018
@bors
Copy link
Contributor

bors commented Apr 23, 2018

⌛ Testing commit 1ca8ce9 with merge 5181002...

bors added a commit that referenced this pull request Apr 23, 2018
@bors
Auto merge of #50182 - alexcrichton:beta-next, r=alexcrichton
5181002 
[beta] Another round of backports

This is a backport of:

* #50039
* #50121
@bors
Copy link
Contributor

bors commented Apr 23, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 5181002 to beta...

@bors bors merged commit 1ca8ce9 into rust-lang:beta Apr 23, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@aidanhs aidanhs

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.
7 participants
@alexcrichton @rust-highfive @bors @aidanhs @ExpHP @pnkfelix @kennytm