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 10 pull requests #48615

Merged
merged 20 commits into from
Mar 1, 2018
Merged

Rollup of 10 pull requests #48615

merged 20 commits into from
Mar 1, 2018

Conversation

nikomatsakis and others added 14 commits February 20, 2018 19:12
You can now choose between the following:

- `#[unwind(allowed)]`
- `#[unwind(aborts)]`

Per rust-lang#48251, the default is `#[unwind(allowed)]`, though
I think we should change this eventually.
Remove experimental -Zremap-path-prefix-from/to, and replace it with
the stabilized --remap-path-prefix=from=to variant.

This is an implementation for issue of rust-lang#41555.
Squashed commit of the following:

commit 1b5d55e26f667b1a25c83c5db0cbb072013a5122
Author: Tobias Stolzmann <tobias.stolzmann@gmail.com>
Date:   Wed Feb 28 00:06:15 2018 +0100

    Bugfix

commit 4265c2db0b0aaa66fdeace5d329665fd2d13903a
Author: Tobias Stolzmann <tobias.stolzmann@gmail.com>
Date:   Tue Feb 27 22:59:12 2018 +0100

    Rename std::path::Path::parents into std::path::Path::ancestors

commit 2548e4b14d377d20adad0f08304a0dd6f8e48e23
Author: Tobias Stolzmann <tobias.stolzmann@gmail.com>
Date:   Tue Feb 27 12:50:37 2018 +0100

    Add tracking issue

commit 3e2ce51a6eea0e39af05849f76dd2cefd5035e86
Author: Tobias Stolzmann <tobias.stolzmann@gmail.com>
Date:   Mon Feb 26 15:05:15 2018 +0100

    impl FusedIterator for Parents

commit a7e096420809740311e19d963d4aba6df77be2f9
Author: Tobias Stolzmann <tobias.stolzmann@gmail.com>
Date:   Mon Feb 26 14:38:41 2018 +0100

    Clarify that the iterator returned will yield at least one value

commit 796a36ea203cd197cc4c810eebd21c7e3433e6f1
Author: Tobias Stolzmann <tobias.stolzmann@gmail.com>
Date:   Thu Feb 22 14:01:21 2018 +0100

    Fix examples

commit e279383b21f11c97269cb355a5b2a0ecdb65bb0c
Author: Tobias Stolzmann <tobias.stolzmann@gmail.com>
Date:   Thu Feb 22 04:47:24 2018 +0100

    Add std::path::Path::parents
@rust-highfive
Copy link
Collaborator

r? @cramertj

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

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

@bors r+ p=1000

@bors
Copy link
Contributor

bors commented Feb 28, 2018

📌 Commit 15ee635 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 28, 2018
@bors
Copy link
Contributor

bors commented Feb 28, 2018

⌛ Testing commit 15ee63552aece15d8be5d2961f76d7014df3d61e with merge f8d72d61388558d4666237c77fc1c89fc8972d25...

@bors
Copy link
Contributor

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

@bors r+

@bors
Copy link
Contributor

bors commented Feb 28, 2018

📌 Commit 543c6d2 has been approved by Manishearth

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 28, 2018
@Manishearth
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented Feb 28, 2018

📌 Commit 10d6795 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 28, 2018
@bors
Copy link
Contributor

bors commented Feb 28, 2018

⌛ Testing commit 10d6795eee2c93fff9c9e7359ad73a73974dad56 with merge 31730ba9e95017ed6284371b4e2b6868251a8914...

@bors
Copy link
Contributor

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

@bors r+

@bors
Copy link
Contributor

bors commented Feb 28, 2018

📌 Commit b2b9707 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 28, 2018
@bors
Copy link
Contributor

bors commented Feb 28, 2018

⌛ Testing commit b2b9707 with merge 0e3c9bb...

bors added a commit that referenced this pull request Feb 28, 2018
Rollup of 10 pull requests

- Successful merges: #48355, #48359, #48380, #48419, #48420, #48461, #48522, #48570, #48572, #48603
- Failed merges:
@bors
Copy link
Contributor

bors commented Mar 1, 2018

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

@Manishearth
Copy link
Member Author

@bors treeclosed-

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

10 participants