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

[beta] Permit unwinding through FFI by default #62505

Merged
merged 3 commits into from
Jul 12, 2019

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Jul 8, 2019

This repeats #61569 for Rust 1.37, as #58794 is not yet resolved.

cc @rust-lang/release
r? @Mark-Simulacrum

@rust-highfive
Copy link
Collaborator

⚠️ 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 Jul 8, 2019
@BatmanAoD
Copy link
Member

I'm no longer in favor of postponing the stabilization of the abort behavior. I think we should wait to merge this until the discussion here is resolved.

@Mark-Simulacrum
Copy link
Member

I'm nominating this for T-lang since I think they should make the decision as to whether to merge this or not.

I haven't done enough reading on the relevant issue(s) to have much of an opinion myself on what we should do here, so I won't weigh in.

@Mark-Simulacrum Mark-Simulacrum added I-nominated T-lang Relevant to the language team, which will review and decide on the PR/issue. labels Jul 8, 2019
@joshtriplett
Copy link
Member

joshtriplett commented Jul 11, 2019

@Mark-Simulacrum Thank you for nominating. Speaking only for myself, I do feel we should merge this, or ideally merge it into trunk/nightly. Let's try to get this discussed in the lang team and sorted out.

@nikomatsakis
Copy link
Contributor

Discussed in @rust-lang/lang meeting -- general consensus that we should merge this PR to beta and we would also be happy to merge to master, as long as progress is being made on the RFC.

@joshtriplett
Copy link
Member

@nikomatsakis Thanks for the summary!

@cuviper Could you please prepare a version of this PR for master?

@joshtriplett
Copy link
Member

Based on the consensus in the lang team meeting, merging this while we continue working on the RFC:

@bors r+

@bors
Copy link
Contributor

bors commented Jul 11, 2019

📌 Commit f56bb3f has been approved by joshtriplett

@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 Jul 11, 2019
@cuviper
Copy link
Member Author

cuviper commented Jul 11, 2019

OK, the master PR is #62603.

@bors
Copy link
Contributor

bors commented Jul 12, 2019

⌛ Testing commit f56bb3f with merge 2ba6de7...

bors added a commit that referenced this pull request Jul 12, 2019
[beta] Permit unwinding through FFI by default

This repeats #61569 for Rust 1.37, as #58794 is not yet resolved.

cc @rust-lang/release
r? @Mark-Simulacrum
@bors
Copy link
Contributor

bors commented Jul 12, 2019

☀️ Test successful - checks-azure, checks-travis, status-appveyor
Approved by: joshtriplett
Pushing 2ba6de7 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 12, 2019
@bors bors merged commit f56bb3f into rust-lang:beta Jul 12, 2019
bors added a commit that referenced this pull request Aug 26, 2019
Permit unwinding through FFI by default

This repeats #62505 for master (Rust 1.38+), as #58794 is not yet resolved. This is a stopgap until a stable alternative is available, like [RFC 2699](rust-lang/rfcs#2699), as long as progress is being made to that end.

r? @joshtriplett
@cuviper cuviper deleted the beta-1.37-no-unwind-abort branch April 3, 2020 18:40
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. T-lang Relevant to the language team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants