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

make `#[unwind]` attribute specify expectations more clearly #48380

Merged
merged 2 commits into from Mar 1, 2018

Conversation

Reviewers

@kennytm kennytm

Assignees

@alexcrichton alexcrichton

Labels
S-waiting-on-bors
Projects
None yet
Milestone
No milestone
6 participants
@nikomatsakis @rust-highfive @alexcrichton @bors @kennytm @michaelwoerister
@nikomatsakis
Copy link
Contributor

nikomatsakis commented Feb 20, 2018

You can now choose between the following:

  • #[unwind(allowed)]
  • #[unwind(aborts)]

Per #48251, the default is #[unwind(allowed)], though
I think we should change this eventually.

@rust-highfive rust-highfive assigned michaelwoerister Feb 20, 2018

@nikomatsakis

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

nikomatsakis commented Feb 20, 2018

r? @alexcrichton

@rust-highfive rust-highfive assigned alexcrichton and unassigned michaelwoerister Feb 20, 2018

@rust-highfive

This comment has been minimized.

Sign in to view
Copy link
Collaborator

rust-highfive commented Feb 20, 2018

r? @michaelwoerister

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review label Feb 20, 2018

@nikomatsakis nikomatsakis referenced this pull request Feb 20, 2018

Closed

Regression in rlua crate tests between rustc 1.23.0 and 1.24.0, only on windows. #48251

@nikomatsakis nikomatsakis force-pushed the nikomatsakis:issue-48251-master branch 2 times, most recently from a6cfafc to 175619a Feb 20, 2018

@kennytm

kennytm reviewed Feb 20, 2018
View changes

src/libsyntax/attr.rs Outdated
Aborts,
}

/// Determine what `#[inline]` attribute is present in `attrs`, if any.

This comment has been minimized.

Sign in to view
Copy link
@kennytm

kennytm Feb 20, 2018

Member

s/inline/unwind/

@nikomatsakis nikomatsakis force-pushed the nikomatsakis:issue-48251-master branch 2 times, most recently from d8287cf to 2dadb12 Feb 20, 2018

@nikomatsakis
make `#[unwind]` attribute specify expectations more clearly 
You can now choose between the following:

- `#[unwind(allowed)]`
- `#[unwind(aborts)]`

Per #48251, the default is `#[unwind(allowed)]`, though
I think we should change this eventually.
Loading status checks…
a47fd3d

@nikomatsakis nikomatsakis force-pushed the nikomatsakis:issue-48251-master branch from 2dadb12 to a47fd3d Feb 21, 2018

@nikomatsakis nikomatsakis referenced this pull request Feb 21, 2018

Closed

Revert rust-lang/rust#46833 on stable #48378

@nikomatsakis

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

nikomatsakis commented Feb 21, 2018

See FCP on the stable PR
@nikomatsakis
add `unwind_attributes` feature
Loading status checks…
566c6ac
@alexcrichton

This comment has been minimized.

Sign in to view
Copy link
Member

alexcrichton commented Feb 26, 2018

@bors: r+

Thanks @nikomatsakis! I hope that soon this won't be necessary in the sense that users won't have to decorate apis with attributes in an on-demand fashion, but this is all unstable anyway so seems like a fine interim solution!
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Feb 26, 2018

📋 Looks like this PR is still in progress, ignoring approval

@nikomatsakis nikomatsakis changed the title [WIP] make `#[unwind]` attribute specify expectations more clearly make `#[unwind]` attribute specify expectations more clearly Feb 27, 2018

@nikomatsakis

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

nikomatsakis commented Feb 27, 2018

@bors r=acrichto
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Feb 27, 2018

📌 Commit 566c6ac has been approved by acrichto

@bors bors added S-waiting-on-bors and removed S-waiting-on-review labels Feb 27, 2018

Manishearth added a commit to Manishearth/rust that referenced this pull request Feb 28, 2018

@Manishearth
Rollup merge of rust-lang#48380 - nikomatsakis:issue-48251-master, r=… 
…acrichto

make `#[unwind]` attribute specify expectations more clearly

You can now choose between the following:

- `#[unwind(allowed)]`
- `#[unwind(aborts)]`

Per rust-lang#48251, the default is `#[unwind(allowed)]`, though
I think we should change this eventually.
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
b91281c

@Manishearth Manishearth referenced this pull request Feb 28, 2018

Merged

Rollup of 10 pull requests #48615

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

@bors
Auto merge of #48615 - Manishearth:rollup, r=Manishearth 
Rollup of 10 pull requests

- Successful merges: #48355, #48359, #48380, #48419, #48420, #48461, #48522, #48570, #48572, #48603
- Failed merges:
Loading status checks…
f8d72d6

Manishearth added a commit to Manishearth/rust that referenced this pull request Feb 28, 2018

@Manishearth
Rollup merge of rust-lang#48380 - nikomatsakis:issue-48251-master, r=… 
…acrichto

Fixes rust-lang#47311.
r? @nrc
Verified
This commit was signed with a verified signature.
@Manishearth Manishearth Manish Goregaokar
GPG key ID: 3BBF4D3E2EF79F98 Learn about signing commits
03364fa

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

@bors
Auto merge of #48615 - Manishearth:rollup, r=Manishearth 
Rollup of 10 pull requests

- Successful merges: #48355, #48359, #48380, #48419, #48420, #48461, #48522, #48570, #48572, #48603
- Failed merges:
Loading status checks…
2b07ec5

Manishearth added a commit to Manishearth/rust that referenced this pull request Feb 28, 2018

@Manishearth
Rollup merge of rust-lang#48380 - nikomatsakis:issue-48251-master, r=… 
…acrichto

Fixes rust-lang#47311.
r? @nrc
Verified
This commit was signed with a verified signature.
@Manishearth Manishearth Manish Goregaokar
GPG key ID: 3BBF4D3E2EF79F98 Learn about signing commits
3a1316d

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

@bors
Auto merge of #48615 - Manishearth:rollup, r=Manishearth 
Rollup of 10 pull requests

- Successful merges: #48355, #48359, #48380, #48419, #48420, #48461, #48522, #48570, #48572, #48603
- Failed merges:
Loading status checks…
31730ba

Manishearth added a commit to Manishearth/rust that referenced this pull request Feb 28, 2018

@Manishearth
Rollup merge of rust-lang#48380 - nikomatsakis:issue-48251-master, r=… 
…acrichto

Fixes rust-lang#47311.
r? @nrc
Verified
This commit was signed with a verified signature.
@Manishearth Manishearth Manish Goregaokar
GPG key ID: 3BBF4D3E2EF79F98 Learn about signing commits
1251560

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

@bors
Auto merge of #48615 - Manishearth:rollup, r=Manishearth 
Rollup of 10 pull requests

- Successful merges: #48355, #48359, #48380, #48419, #48420, #48461, #48522, #48570, #48572, #48603
- Failed merges:
Loading status checks…
0e3c9bb

@bors bors merged commit 566c6ac into rust-lang:master Mar 1, 2018
1 check passed

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@SimonSapin SimonSapin referenced this pull request Jul 23, 2018

Open

Abort instead of unwinding past FFI functions #52652

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.