Skip to content

Add can_unwind field to FnAbi - #70547

Merged
bors merged 2 commits into
rust-lang:masterfrom
wesleywiser:extract_can_unwind
Apr 1, 2020
Merged

Add can_unwind field to FnAbi#70547
bors merged 2 commits into
rust-lang:masterfrom
wesleywiser:extract_can_unwind

Conversation

@wesleywiser

Copy link
Copy Markdown
Member

This is a pure refactoring with no behavior changes.

Extracted out of #70467

r? @eddyb

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 30, 2020
@bors

bors commented Mar 30, 2020

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #70536) made this pull request unmergeable. Please resolve the merge conflicts.

@wesleywiser

Copy link
Copy Markdown
MemberAuthor

Rebased

Comment threadsrc/librustc_middle/ty/layout.rs Outdated
@RalfJung

Copy link
Copy Markdown
Member

Cc #65303

Comment threadsrc/librustc_middle/ty/layout.rs Outdated
This is a pure refactoring with no behavior changes.
@wesleywiser

Copy link
Copy Markdown
MemberAuthor

Feedback resolved

@eddyb

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Mar 31, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 097e9e5 has been approved by eddyb

@bors

bors commented Mar 31, 2020

Copy link
Copy Markdown
Collaborator

🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened

@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 Mar 31, 2020
@eddyb

Copy link
Copy Markdown
Contributor

@bors r- Just thought of something.

@borsbors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 31, 2020
Comment threadsrc/librustc_codegen_llvm/attributes.rs Outdated
Comment threadsrc/librustc_codegen_llvm/abi.rs Outdated
Comment threadsrc/librustc_codegen_llvm/abi.rs Outdated
@rust-highfive

This comment has been minimized.

@wesleywiser

Copy link
Copy Markdown
MemberAuthor

Resolved!

@eddyb

eddyb commented Apr 1, 2020

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Apr 1, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 036626f has been approved by eddyb

@borsbors removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Apr 1, 2020
@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 1, 2020
Centril added a commit to Centril/rust that referenced this pull request Apr 1, 2020
…ddyb
Add `can_unwind` field to `FnAbi`
This is a pure refactoring with no behavior changes.
Extracted out of rust-lang#70467
r? @eddyb
@CentrilCentril mentioned this pull request Apr 1, 2020
@CentrilCentril mentioned this pull request Apr 1, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 1, 2020
Rollup of 6 pull requests
Successful merges:
- rust-lang#70511 (Add `-Z dump-mir-dataflow` flag for dumping dataflow results visualization)
- rust-lang#70522 (Improve error messages for raw strings (rust-lang#60762))
- rust-lang#70547 (Add `can_unwind` field to `FnAbi`)
- rust-lang#70591 (Ensure LLVM is in the link path for "fulldeps" tests)
- rust-lang#70627 (Use place directly its copy)
- rust-lang#70652 (Add git repo address to unstable book)
Failed merges:
- rust-lang#70634 (Remove some reexports in `rustc_middle`)
r? @ghost
@bors
bors merged commit 90cecab into rust-lang:masterApr 1, 2020
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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.

5 participants

@wesleywiser@bors@RalfJung@eddyb@rust-highfive