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

Revert abort on unwinding through FFI on stable #58795

Merged
merged 2 commits into from
Feb 28, 2019

Conversation

Mark-Simulacrum
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum commented Feb 28, 2019

This is entirely done to allow us more time for discussion about what behavior we want to specify here.

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against stable. 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 Feb 28, 2019
@Mark-Simulacrum
Copy link
Member Author

cc @rust-lang/compiler -- would appreciate a review of this fairly quickly (we need it to land before tomorrow to avoid delaying stable)

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.

r=me

@@ -51,8 +51,7 @@ Language
// Allowed as there is only one `Read` in the module.
pub trait Read {}
```
- [`extern` functions will now abort by default when panicking.][55982]
This was previously undefined behaviour.
- [You may now use `Rc`, `Arc`, and `Pin` as method receivers][56805].
Copy link
Contributor

Choose a reason for hiding this comment

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

what's up with this? just an orthogonal change?

@@ -109,27 +108,30 @@ Compatibility Notes
are now deprecated in the standard library, and their usage will now produce a warning.
Please use the `str::{trim_start, trim_end, trim_start_matches, trim_end_matches}`
methods instead.
- The `Error::cause` method has been deprecated in favor of `Error::source` which supports
downcasting.
Copy link
Contributor

Choose a reason for hiding this comment

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

(similar)

@Mark-Simulacrum Mark-Simulacrum added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 28, 2019
@Mark-Simulacrum
Copy link
Member Author

@bors r+ p=100

@bors
Copy link
Contributor

bors commented Feb 28, 2019

📌 Commit bd1f032 has been approved by Mark-Simulacrum

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 28, 2019
@bors
Copy link
Contributor

bors commented Feb 28, 2019

⌛ Testing commit bd1f032 with merge 0da3740...

bors added a commit that referenced this pull request Feb 28, 2019
Revert abort on unwinding through FFI on stable

r? @alexcrichton
@bors
Copy link
Contributor

bors commented Feb 28, 2019

💔 Test failed - status-appveyor

@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, 2019
@Mark-Simulacrum
Copy link
Member Author

@bors retry - 259

@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, 2019
@bors
Copy link
Contributor

bors commented Feb 28, 2019

⌛ Testing commit bd1f032 with merge 6173377c8587a2e4589827aa0163f8322097aca4...

@bors
Copy link
Contributor

bors commented Feb 28, 2019

💥 Test timed out

@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, 2019
@pietroalbini
Copy link
Member

macOS is time travelling again.

@bors retry

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 28, 2019
@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 28, 2019
@Centril
Copy link
Contributor

Centril commented Feb 28, 2019

@bors retry

@bors
Copy link
Contributor

bors commented Feb 28, 2019

⌛ Testing commit bd1f032 with merge 2aa4c46...

bors added a commit that referenced this pull request Feb 28, 2019
Revert abort on unwinding through FFI on stable

This is entirely done to allow us more time for discussion about what behavior we want to specify here.
@bors
Copy link
Contributor

bors commented Feb 28, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: Mark-Simulacrum
Pushing 2aa4c46 to stable...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 28, 2019
@bors bors merged commit bd1f032 into rust-lang:stable Feb 28, 2019
@Mark-Simulacrum Mark-Simulacrum deleted the stable-next branch February 28, 2019 14:41
@@ -4,10 +4,10 @@ Version 1.33.0 (2019-02-28)
Language
--------
- [You can now use the `cfg(target_vendor)` attribute.][57465] E.g.
`#[cfg(target_vendor="linux")] fn main() { println!("Hello Linux!"); }`
`#[cfg(target_vendor="apple")] fn main() { println!("Hello Apple!"); }`
Copy link
Member

Choose a reason for hiding this comment

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

Looks like more spurious changes? Shouldn't this (have been) fixed before approving...?

Copy link
Member Author

Choose a reason for hiding this comment

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

This was intentional (note the separate commit); we wanted to land some additional release notes and since we were merging this into stable combined it into one.

In hindsight, I should've mentioned this in the PR description.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.

8 participants