Skip to content

Revert abort on unwinding through FFI on stable - #58795

Merged
bors merged 2 commits into
rust-lang:stablefrom
Mark-Simulacrum:stable-next
Feb 28, 2019
Merged

Revert abort on unwinding through FFI on stable#58795
bors merged 2 commits into
rust-lang:stablefrom
Mark-Simulacrum:stable-next

Conversation

@Mark-Simulacrum

@Mark-SimulacrumMark-Simulacrum commented Feb 28, 2019

Copy link
Copy Markdown
Member

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

@rust-highfive

Copy link
Copy Markdown
Contributor

⚠️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-highfiverust-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
Copy Markdown
MemberAuthor

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

@nikomatsakisnikomatsakis left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

r=me

Comment threadRELEASES.md Outdated

Copy link
Copy Markdown
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?

Comment threadRELEASES.md Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

(similar)

@Mark-SimulacrumMark-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
Copy Markdown
MemberAuthor

@bors r+ p=100

@bors

bors commented Feb 28, 2019

Copy link
Copy Markdown
Collaborator

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

bors commented Feb 28, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit bd1f032 with merge 0da3740...

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

bors commented Feb 28, 2019

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-appveyor

@borsbors 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
Copy Markdown
MemberAuthor

@bors retry - 259

@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 Feb 28, 2019
@bors

bors commented Feb 28, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit bd1f032 with merge 6173377c8587a2e4589827aa0163f8322097aca4...

@bors

bors commented Feb 28, 2019

Copy link
Copy Markdown
Collaborator

💥 Test timed out

@borsbors 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
@emilyalbini

Copy link
Copy Markdown
Member

macOS is time travelling again.

@bors retry

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

@bors retry

@bors

bors commented Feb 28, 2019

Copy link
Copy Markdown
Collaborator

⌛ 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

bors commented Feb 28, 2019

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Feb 28, 2019
@bors
bors merged commit bd1f032 into rust-lang:stableFeb 28, 2019
@Mark-Simulacrum
Mark-Simulacrum deleted the stable-next branch February 28, 2019 14:41
Comment threadRELEASES.md
--------
- [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
Copy Markdown
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
Copy Markdown
MemberAuthor

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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

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

Development

Successfully merging this pull request may close these issues.

8 participants

@Mark-Simulacrum@rust-highfive@bors@emilyalbini@Centril@nikomatsakis@RalfJung@alexcrichton