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 #60716

Merged
merged 3 commits into from
May 12, 2019

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented May 10, 2019

This repeats #59640 for Rust 1.35, 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 May 10, 2019
@jonas-schievink
Copy link
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
Copy link
Member Author

cuviper commented May 10, 2019

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

@BatmanAoD
Copy link
Member

@pietroalbini
Copy link
Member

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

@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented May 11, 2019

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
Copy link
Contributor

bors commented May 11, 2019

📌 Commit 49d6416 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-review Status: Awaiting review from the assignee but also interested parties. labels May 11, 2019
@bors
Copy link
Contributor

bors commented May 11, 2019

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

@bors
Copy link
Contributor

bors commented May 11, 2019

📌 Commit 49d6416 has been approved by Mark-Simulacrum

@BatmanAoD
Copy link
Member

@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?

@pietroalbini
Copy link
Member

@Centril ^?

@Centril
Copy link
Contributor

Centril commented May 11, 2019

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
Copy link
Contributor

Centril commented May 11, 2019

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
Copy link
Contributor

Centril commented May 11, 2019

@bors p=1 rollup=never

@bors
Copy link
Contributor

bors commented May 12, 2019

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

bors added a commit that referenced this pull request May 12, 2019
…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
@bors
Copy link
Contributor

bors commented May 12, 2019

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 12, 2019
@bors bors merged commit 49d6416 into rust-lang:beta May 12, 2019
@cuviper cuviper deleted the beta-1.35-no-unwind-abort branch May 17, 2019 21:49
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