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.

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

Rollup of 15 pull requests #48520

Merged
merged 44 commits into from
Feb 25, 2018
Merged

Rollup of 15 pull requests #48520

merged 44 commits into from
Feb 25, 2018

Conversation

davidtwco and others added 30 commits January 24, 2018 18:36
We need two-phase borrows of ops to be in the initial NLL release since without
them lots of existing code will break. Fixes rust-lang#48129
This updates the book repository, but mostly to include
rust-lang/book#1180

TL;DR: the second edition is close enough to done that we should
universally recommend it over the first edition.
This adds an `UnpackedKind` type as a typesafe counterpart to `Kind`. This should make future changes to kinds (such as const generics!) more resilient, as the type-checker should catch more potential issues.
Fix borrow checker unsoundness with unions

Fixes rust-lang#45157. After discussion with @nikomatsakis on Gitter, this PR only adds a test since the original issue was resolved elsewhere.

r? @nikomatsakis
…richton

Stabilize Box::leak

Stabilizes the following:
+ `Box::leak` (`box_leak`, in nightly since 2017-11-23)

cc rust-lang#46179

 r? @rust-lang/libs
@Manishearth
Copy link
Member Author

@bors r+ p=1000

@bors
Copy link
Contributor

bors commented Feb 24, 2018

📌 Commit 7ba4afc has been approved by Manishearth

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Feb 24, 2018
@bors
Copy link
Contributor

bors commented Feb 24, 2018

⌛ Testing commit 7ba4afc with merge fe7075b26eee6f395b2a80efacb46c43aeda3bb2...

@cramertj cramertj removed their assignment Feb 25, 2018
@bors
Copy link
Contributor

bors commented Feb 25, 2018

💔 Test failed - status-travis

@bors bors 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 25, 2018
@Manishearth
Copy link
Member Author

@bors r+

@Manishearth
Copy link
Member Author

@bors r+ retry

@bors
Copy link
Contributor

bors commented Feb 25, 2018

📌 Commit 52047f0 has been approved by Manishearth

@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 Feb 25, 2018
@bors
Copy link
Contributor

bors commented Feb 25, 2018

⌛ Testing commit 52047f0 with merge 026339e...

bors added a commit that referenced this pull request Feb 25, 2018
Rollup of 15 pull requests

- Successful merges: #47689, #48110, #48197, #48296, #48386, #48392, #48404, #48415, #48441, #48448, #48452, #48481, #48490, #48499, #48503
- Failed merges:
@bors
Copy link
Contributor

bors commented Feb 25, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: Manishearth
Pushing 026339e to master...

@bors bors merged commit 52047f0 into rust-lang:master Feb 25, 2018
kennytm-githubbot added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Feb 25, 2018
Tested on commit rust-lang/rust@026339e.

💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk).
💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk).
@Manishearth Manishearth deleted the rollup branch February 25, 2018 04:59
@kennytm kennytm added the relnotes Marks issues that should be documented in the release notes of the next release. label Feb 25, 2018
@kennytm
Copy link
Member

kennytm commented Feb 25, 2018

Hello people from future, please refer to #48481 for the actual relnotes.

@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
relnotes Marks issues that should be documented in the release notes of the next release. rollup A PR which is a rollup 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.