Skip to content

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

Merged
bors merged 2 commits into
rust-lang:masterfrom
nikomatsakis:issue-48251-master
Mar 1, 2018
Merged

make #[unwind] attribute specify expectations more clearly#48380
bors merged 2 commits into
rust-lang:masterfrom
nikomatsakis:issue-48251-master

Conversation

@nikomatsakis

@nikomatsakisnikomatsakis commented Feb 20, 2018

Copy link
Copy Markdown
Contributor

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.

@nikomatsakis

nikomatsakis commented Feb 20, 2018

Copy link
Copy Markdown
ContributorAuthor

r? @alexcrichton

@rust-highfive

rust-highfive commented Feb 20, 2018

Copy link
Copy Markdown
Contributor

r? @michaelwoerister

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 20, 2018
@nikomatsakisnikomatsakis mentioned this pull request Feb 20, 2018
Closed
@nikomatsakis
nikomatsakisforce-pushed the issue-48251-master branch 2 times, most recently from a6cfafc to 175619aCompareFebruary 20, 2018 18:58
kennytm
kennytm reviewed Feb 20, 2018
View reviewed changes
Comment threadsrc/libsyntax/attr.rs Outdated

@kennytmkennytmFeb 20, 2018

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.

s/inline/unwind/

@nikomatsakis
nikomatsakisforce-pushed the issue-48251-master branch 2 times, most recently from d8287cf to 2dadb12CompareFebruary 21, 2018 00:11
@nikomatsakis
make #[unwind] attribute specify expectations more clearly
a47fd3d
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.
@nikomatsakisnikomatsakis mentioned this pull request Feb 21, 2018
Closed
@nikomatsakis

nikomatsakis commented Feb 21, 2018

Copy link
Copy Markdown
ContributorAuthor

See FCP on the stable PR

@alexcrichton

alexcrichton commented Feb 26, 2018

Copy link
Copy Markdown
Member

@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

bors commented Feb 26, 2018

Copy link
Copy Markdown
Collaborator

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

@nikomatsakisnikomatsakis changed the title [WIP] make #[unwind] attribute specify expectations more clearlymake #[unwind] attribute specify expectations more clearlyFeb 27, 2018
@nikomatsakis

nikomatsakis commented Feb 27, 2018

Copy link
Copy Markdown
ContributorAuthor

@bors r=acrichto

@bors

bors commented Feb 27, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 566c6ac has been approved by acrichto

@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 27, 2018
@ManishearthManishearth mentioned this pull request Feb 28, 2018
Merged
Manishearth added a commit to Manishearth/rust that referenced this pull request Feb 28, 2018
@Manishearth
Rollup merge ofrust-lang#48380- nikomatsakis:issue-48251-master, r=…
1251560
…acrichto
Fixesrust-lang#47311.
r? @nrc
bors added a commit that referenced this pull request Feb 28, 2018
@bors
Auto merge of#48615- Manishearth:rollup, r=Manishearth
0e3c9bb
Rollup of 10 pull requests
- Successful merges: #48355, #48359, #48380, #48419, #48420, #48461, #48522, #48570, #48572, #48603
- Failed merges:
@bors
bors merged commit 566c6ac into rust-lang:masterMar 1, 2018
@SimonSapinSimonSapin mentioned this pull request Jul 23, 2018
Closed
@RalfJung

RalfJung commented Aug 25, 2019

Copy link
Copy Markdown
Member

Even with this PR, the logic in codegen_fn_attrs (in librustc_typeck/collect.rs) and codegen still treat the mere presence of any unwind attribute as an indicator to not mark the function as nounwind. So, #[unwind(aborts)] is not marked nounwind. Is that really the desired behavior?

@RalfJungRalfJung mentioned this pull request Aug 25, 2019
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kennytmkennytmkennytm left review comments

Assignees

@alexcrichtonalexcrichton

Labels

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.

7 participants

@nikomatsakis@rust-highfive@alexcrichton@bors@RalfJung@kennytm@michaelwoerister