Skip to content

/rust

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

Reviewers

@RalfJung RalfJung

@nikomatsakis nikomatsakis

Assignees

@alexcrichton alexcrichton

Labels
S-waiting-on-bors merged-by-bors
Projects
None yet
Milestone
No milestone
8 participants
@Mark-Simulacrum @rust-highfive @bors @pietroalbini @Centril @nikomatsakis @RalfJung @alexcrichton
@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented Feb 28, 2019 •
edited

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

@rust-highfive rust-highfive assigned alexcrichton Feb 28, 2019

@rust-highfive

This comment has been minimized.

Sign in to view
Copy link
Collaborator

rust-highfive commented Feb 28, 2019

⚠️ 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 label Feb 28, 2019

@Mark-Simulacrum

This comment has been minimized.

Sign in to view
Copy link
Member Author

Mark-Simulacrum commented Feb 28, 2019

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

@Mark-Simulacrum Mark-Simulacrum referenced this pull request Feb 28, 2019

Open

Default behavior of unwinding in FFI functions #58794

@nikomatsakis

nikomatsakis approved these changes Feb 28, 2019
View changes

Copy link
Contributor

nikomatsakis left a comment

r=me
RELEASES.md
@@ -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].

This comment has been minimized.

Sign in to view
Copy link
@nikomatsakis

nikomatsakis Feb 28, 2019

Contributor

what's up with this? just an orthogonal change?
RELEASES.md
@@ -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.

This comment has been minimized.

Sign in to view
Copy link
@nikomatsakis

nikomatsakis Feb 28, 2019

Contributor

(similar)

@Mark-Simulacrum Mark-Simulacrum added S-waiting-on-author and removed S-waiting-on-review labels Feb 28, 2019

@Mark-Simulacrum
Permit unwinding through FFI by default 
See #58794 for context.
Loading status checks…
bd1f032

@Mark-Simulacrum Mark-Simulacrum force-pushed the Mark-Simulacrum:stable-next branch from bae33e5 to bd1f032 Feb 28, 2019

@Mark-Simulacrum

This comment has been minimized.

Sign in to view
Copy link
Member Author

Mark-Simulacrum commented Feb 28, 2019

@bors r+ p=100
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Feb 28, 2019

📌 Commit bd1f032 has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors and removed S-waiting-on-author labels Feb 28, 2019

@bors

This comment has been minimized.

Sign in to view
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

@bors
Auto merge of #58795 - Mark-Simulacrum:stable-next, r=Mark-Simulacrum 
Revert abort on unwinding through FFI on stable

r? @alexcrichton
Loading status checks…
0da3740
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Feb 28, 2019

💔 Test failed - status-appveyor

@bors bors added S-waiting-on-review and removed S-waiting-on-bors labels Feb 28, 2019

@Mark-Simulacrum

This comment has been minimized.

Sign in to view
Copy link
Member Author

Mark-Simulacrum commented Feb 28, 2019

@bors retry - 259

@bors bors added S-waiting-on-bors and removed S-waiting-on-review labels Feb 28, 2019

@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Feb 28, 2019

⌛️ Testing commit bd1f032 with merge 6173377...

bors added a commit that referenced this pull request Feb 28, 2019

@bors
Auto merge of #58795 - Mark-Simulacrum:stable-next, r=Mark-Simulacrum 
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.
Loading status checks…
6173377
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Feb 28, 2019

💥 Test timed out

@bors bors added S-waiting-on-review and removed S-waiting-on-bors labels Feb 28, 2019

@pietroalbini

This comment has been minimized.

Sign in to view
Copy link
Member

pietroalbini commented Feb 28, 2019

macOS is time travelling again.

@bors retry

@bors bors removed the S-waiting-on-review label Feb 28, 2019

@bors bors added the S-waiting-on-bors label Feb 28, 2019

@Centril

This comment has been minimized.

Sign in to view
Copy link
Contributor

Centril commented Feb 28, 2019

@bors retry
@bors

This comment has been minimized.

Sign in to view
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

@bors
Auto merge of #58795 - Mark-Simulacrum:stable-next, r=Mark-Simulacrum 
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.
Loading status checks…
2aa4c46
@bors

This comment has been minimized.

Sign in to view
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 label Feb 28, 2019

@bors bors merged commit bd1f032 into rust-lang:stable Feb 28, 2019
1 check passed

1 check passed

homu Test successful
Details

@Mark-Simulacrum Mark-Simulacrum deleted the Mark-Simulacrum:stable-next branch Feb 28, 2019

@SimonSapin SimonSapin referenced this pull request Mar 10, 2019

Open

Abort instead of unwinding past FFI functions #52652

@RalfJung

RalfJung reviewed Mar 10, 2019
View changes

RELEASES.md
@@ -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!"); }`

This comment has been minimized.

Sign in to view
Copy link
@RalfJung

RalfJung Mar 10, 2019

Member

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

This comment has been minimized.

Sign in to view
Copy link
@Mark-Simulacrum

Mark-Simulacrum Mar 10, 2019

Author Member

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.

@cuviper cuviper referenced this pull request Apr 2, 2019

Merged

[beta] Permit unwinding through FFI by default #59640

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.