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

rustc_target: drop duplicate code #113914

Merged
merged 1 commit into from
Jul 21, 2023
Merged

rustc_target: drop duplicate code #113914

merged 1 commit into from
Jul 21, 2023

Conversation

dvdhrm
Copy link
Contributor

@dvdhrm dvdhrm commented Jul 21, 2023

Drop duplicate helper methods on Layout, which are already implemented on LayoutS. Note that Layout has a Deref implementation to LayoutS, so all accessors are automatically redirected.

The methods are identical and have been copied to rustc_abi in:

commit 390a637e296ccfaac4c6abd1291b0523e8a8e00b
Author: hamidreza kalbasi <hamidrezakalbasi@protonmail.com>
Date:   Mon Nov 7 00:36:11 2022 +0330

    move things from rustc_target::abi to rustc_abi

This commit left behind the original implementation. Drop it now.

(originally moved by @HKalbasi)

Drop duplicate helper methods on `Layout`, which are already implemented
on `LayoutS`. Note that `Layout` has a `Deref` implementation to
`LayoutS`, so all accessors are automatically redirected.

The methods are identical and have been copied to `rustc_abi` in:

    commit 390a637
    Author: hamidreza kalbasi <hamidrezakalbasi@protonmail.com>
    Date:   Mon Nov 7 00:36:11 2022 +0330

        move things from rustc_target::abi to rustc_abi

This commit left behind the original implementation. Drop it now.

Signed-off-by: David Rheinsberg <david@readahead.eu>
@rustbot
Copy link
Collaborator

rustbot commented Jul 21, 2023

r? @davidtwco

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

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jul 21, 2023
@cjgillot
Copy link
Contributor

Thanks!
@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jul 21, 2023

📌 Commit 3e03895 has been approved by cjgillot

It is now in the queue for this repository.

@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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 21, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 21, 2023
rustc_target: drop duplicate code

Drop duplicate helper methods on `Layout`, which are already implemented on `LayoutS`. Note that `Layout` has a `Deref` implementation to `LayoutS`, so all accessors are automatically redirected.

The methods are identical and have been copied to `rustc_abi` in:

    commit 390a637
    Author: hamidreza kalbasi <hamidrezakalbasi@protonmail.com>
    Date:   Mon Nov 7 00:36:11 2022 +0330

        move things from rustc_target::abi to rustc_abi

This commit left behind the original implementation. Drop it now.

(originally moved by `@HKalbasi)`
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 21, 2023
…iaskrgr

Rollup of 4 pull requests

Successful merges:

 - rust-lang#113887 (new solver: add a separate cache for coherence)
 - rust-lang#113910 (Add FnPtr ty to SMIR)
 - rust-lang#113913 (error/E0691: include alignment in error message)
 - rust-lang#113914 (rustc_target: drop duplicate code)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 1aaf583 into rust-lang:master Jul 21, 2023
@rustbot rustbot added this to the 1.73.0 milestone Jul 21, 2023
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. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants