Skip to content

[beta] Permit unwinding through FFI by default - #60716

Merged
bors merged 3 commits into
rust-lang:betafrom
cuviper:beta-1.35-no-unwind-abort
May 12, 2019
Merged

[beta] Permit unwinding through FFI by default#60716
bors merged 3 commits into
rust-lang:betafrom
cuviper:beta-1.35-no-unwind-abort

Conversation

@cuviper

@cuvipercuviper commented May 10, 2019

Copy link
Copy Markdown
Member

This repeats #59640 for Rust 1.35, as #58794 is not yet resolved.

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

@rust-highfive

rust-highfive commented May 10, 2019

Copy link
Copy Markdown
Contributor

⚠️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-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 10, 2019
@jonas-schievink

jonas-schievink commented May 10, 2019

Copy link
Copy Markdown
Contributor

#58794 does not seem much closer to being resolved than last time, so perhaps we should also land this on master? (now people are seemingly waiting for an RFC being written, so this might take a long time to be resolved)

@cuviper

cuviper commented May 10, 2019

Copy link
Copy Markdown
MemberAuthor

I asked that in #58794 (comment) to no response. 😐

@BatmanAoD

BatmanAoD commented May 10, 2019

Copy link
Copy Markdown
Contributor

@jonas-schievink I have drafted an RFC: https://github.com/rust-lang/rfcs/blob/annotate-unwind-rust/text/XXX-annotate-unwind-rust.md

@emilyalbini

emilyalbini commented May 11, 2019

Copy link
Copy Markdown
Member

@BatmanAoD unrelated, but try to push that rfc on your own fork instead of the main repo if possible.

@Mark-Simulacrum

Mark-Simulacrum commented May 11, 2019•
edited by emilyalbini
Loading

Copy link
Copy Markdown
Member

I think we should land this on master as well to get beta back in sync with nightly. Cc @rust-lang/lang

@bors r+

@bors

bors commented May 11, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 49d6416 has been approved by Mark-Simulacrum

@borsbors 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 May 11, 2019
@bors

bors commented May 11, 2019

Copy link
Copy Markdown
Collaborator

💡 This pull request was already approved, no need to approve it again.

@bors

bors commented May 11, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 49d6416 has been approved by Mark-Simulacrum

@BatmanAoD

BatmanAoD commented May 11, 2019

Copy link
Copy Markdown
Contributor

@pietroalbini Yes, I felt prettyffoolish when I realized I hadn't forked, and even more so when I found that my branch is one of only three in the main repo. I've already opened the PR, though; should I close it and re-open it?

@emilyalbini

emilyalbini commented May 11, 2019

Copy link
Copy Markdown
Member

@Centril ^?

@Centril

Centril commented May 11, 2019

Copy link
Copy Markdown
Contributor

I'm not really happy about landing on master as I think the pressure (and constant reminder) to remove the soundness hole is a good thing, but at the same time it adds a plenty of more work... so I leave it up to you.

@Centril

Centril commented May 11, 2019

Copy link
Copy Markdown
Contributor

I've already opened the PR, though; should I close it and re-open it?

Nah... just adds churn, and the discussion has already started.
Just push edits to the same branch.

@Centril

Centril commented May 11, 2019

Copy link
Copy Markdown
Contributor

@bors p=1 rollup=never

@bors

bors commented May 12, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 49d6416 with merge 88f5adc...

bors added a commit that referenced this pull request May 12, 2019
@bors
Auto merge of#60716- cuviper:beta-1.35-no-unwind-abort, r=Mark-Simu…
88f5adc
…lacrum
[beta] Permit unwinding through FFI by default
This repeats #59640 for Rust 1.35, as #58794 is not yet resolved.
cc @rust-lang/release
r? @Mark-Simulacrum
@borsbors mentioned this pull request May 12, 2019
Merged
@bors

bors commented May 12, 2019

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-travis, status-appveyor
Approved by: Mark-Simulacrum
Pushing 88f5adc to beta...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label May 12, 2019
@bors
bors merged commit 49d6416 into rust-lang:betaMay 12, 2019
@cuviper
cuviper deleted the beta-1.35-no-unwind-abort branch May 17, 2019 21:49
@cuvipercuviper mentioned this pull request Jun 6, 2019
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@Mark-SimulacrumMark-Simulacrum

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@cuviper@rust-highfive@jonas-schievink@BatmanAoD@emilyalbini@Mark-Simulacrum@bors@Centril