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

Unify duplicate linker_and_flavor methods in rustc_codegen_{cranelift,ssa}. #86016

Merged
merged 1 commit into from Jun 7, 2021

Conversation

luqmana
Copy link
Member

@luqmana luqmana commented Jun 5, 2021

The two methods were exactly the same so this removes the cranelift copy. This will help make sure both they don't get out of sync.

@rust-highfive
Copy link
Collaborator

Some changes occured to rustc_codegen_cranelift

cc @bjorn3

@rust-highfive
Copy link
Collaborator

r? @estebank

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 5, 2021
@tschuett
Copy link

tschuett commented Jun 5, 2021

Would you mind merging #85964 into your PR?

@petrochenkov petrochenkov self-assigned this Jun 5, 2021
@petrochenkov petrochenkov 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 Jun 5, 2021
@petrochenkov
Copy link
Contributor

r? @petrochenkov @bors r+

@bors
Copy link
Contributor

bors commented Jun 5, 2021

📌 Commit 611c2fcce6b35ee9d20676a26eb254b46ff464e5 has been approved by petrochenkov

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 5, 2021
@bors

This comment has been minimized.

@bors bors 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 Jun 6, 2021
@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Jun 6, 2021

📌 Commit a26f003 has been approved by petrochenkov

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 6, 2021
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jun 6, 2021
…ochenkov

Unify duplicate linker_and_flavor methods in rustc_codegen_{cranelift,ssa}.

The two methods were exactly the same so this removes the cranelift copy. This will help make sure both they don't get out of sync.
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 7, 2021
Rollup of 6 pull requests

Successful merges:

 - rust-lang#84262 (Fix ICE during type layout when there's a `[type error]`)
 - rust-lang#85973 (Replace a `match` with an `if let`)
 - rust-lang#85996 (rustbuild: take changes to the standard library into account for `download-rustc`)
 - rust-lang#86016 (Unify duplicate linker_and_flavor methods in rustc_codegen_{cranelift,ssa}.)
 - rust-lang#86025 (Remove the install prefix from the rpath set when using -Crpath)
 - rust-lang#86081 (Use `try_into` instead of asserting manually)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 4144019 into rust-lang:master Jun 7, 2021
@rustbot rustbot added this to the 1.54.0 milestone Jun 7, 2021
@luqmana luqmana deleted the infer-linker-flavor branch June 7, 2021 19:35
bjorn3 pushed a commit to bjorn3/rust that referenced this pull request Jul 7, 2021
…ochenkov

Unify duplicate linker_and_flavor methods in rustc_codegen_{cranelift,ssa}.

The two methods were exactly the same so this removes the cranelift copy. This will help make sure both they don't get out of sync.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

None yet

8 participants