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.

Sign up for GitHub

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

Jump to bottom

rustc_target: separate out an individual alignment quantity type from Align. #54071

Merged
merged 3 commits into from
Nov 23, 2018
Merged

rustc_target: separate out an individual alignment quantity type from Align. #54071

merged 3 commits into from
Nov 23, 2018

Conversation

eddyb
Copy link
Member

@eddyb eddyb commented Sep 8, 2018 •
edited
Loading

Before this PR, rustc_target::abi::Align combined "power-of-two alignment quantity" semantics, with a distinction between ABI (required) and preferred alignment (by having two quantities).

After this PR, Align is only one such quantity, and a new AbiAndPrefAlign type is introduced to hold the pair of ABI and preferred Align quantities.

Align is used everywhere one quantity is necessary/sufficient, simplifying some of the code in codegen/miri, while AbiAndPrefAlign only in layout computation (to propagate preferred alignment).

r? @oli-obk cc @nagisa @RalfJung @nikomatsakis

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 8, 2018
@bors
Copy link
Contributor

bors commented Sep 9, 2018

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

@XAMPPRocky XAMPPRocky 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 Sep 26, 2018
@XAMPPRocky
Copy link
Member

Triage; @eddyb This PR needs to be rebased.

@TimNN
Copy link
Contributor

TimNN commented Oct 16, 2018

Ping from triage @eddyb: It looks like this PR is ready to be merged except for a rebase.

@TimNN
Copy link
Contributor

TimNN commented Oct 23, 2018

Ping from triage @eddyb: We haven't heard from you in a while about this PR, so I'm closing this as per our triage guidelines. Thanks for your contribution and please feel free to re-open in the future.

@TimNN TimNN closed this Oct 23, 2018
@TimNN TimNN added S-inactive Status: Inactive and waiting on the author. This is often applied to closed PRs. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 23, 2018
@eddyb eddyb reopened this Nov 21, 2018
@eddyb
Copy link
Member Author

eddyb commented Nov 22, 2018

@nagisa @oli-obk I've rebased and renamed Aligns to AbiAndPrefAlign.

@oli-obk
Copy link
Contributor

oli-obk commented Nov 22, 2018

@bors r+

@bors
Copy link
Contributor

bors commented Nov 22, 2018

📌 Commit 5b4747d has been approved by oli-obk

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 22, 2018
@bors
Copy link
Contributor

bors commented Nov 22, 2018

⌛ Testing commit 5b4747d with merge d75e9c6a2e2f85498c4092d61ea763c813997bb6...

@pietroalbini
Copy link
Member

@bors retry

Yielding priority to the beta-accepted stuff.

@bors
Copy link
Contributor

bors commented Nov 22, 2018

⌛ Testing commit 5b4747d with merge c72ccd655ce4979dd1551afe11aa4335c2e21298...

@pietroalbini
Copy link
Member

@bors retry

Yielding priority to the beta rollup.

@bors
Copy link
Contributor

bors commented Nov 23, 2018

⌛ Testing commit 5b4747d with merge 6a2d1b4...

bors added a commit that referenced this pull request Nov 23, 2018
@bors
Auto merge of #54071 - eddyb:alignsssss, r=oli-obk
6a2d1b4 
rustc_target: separate out an individual alignment quantity type from Align.

Before this PR, `rustc_target::abi::Align` combined "power-of-two alignment quantity" semantics, with a distinction between ABI (required) and preferred alignment (by having two quantities).

After this PR, `Align` is only *one* such quantity, and a new `AbiAndPrefAlign` type is introduced to hold the pair of ABI and preferred `Align` quantities.

`Align` is used everywhere one quantity is necessary/sufficient, simplifying some of the code in codegen/miri, while `AbiAndPrefAlign` only in layout computation (to propagate preferred alignment).

r? @oli-obk cc @nagisa @RalfJung @nikomatsakis
@bors
Copy link
Contributor

bors commented Nov 23, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: oli-obk
Pushing 6a2d1b4 to master...

@bors bors merged commit 5b4747d into rust-lang:master Nov 23, 2018
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #54071!

Tested on commit 6a2d1b4.
Direct link to PR: #54071

💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra).
💔 rls on windows: test-fail → build-fail (cc @nrc @Xanewok, @rust-lang/infra).
💔 rls on linux: test-fail → build-fail (cc @nrc @Xanewok, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Nov 23, 2018
@rust-highfive
📣 Toolstate changed by rust-lang/rust#54071!
3ef9e58 
Tested on commit rust-lang/rust@6a2d1b4.
Direct link to PR: <rust-lang/rust#54071>

💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra).
💔 rls on windows: test-fail → build-fail (cc @nrc @Xanewok, @rust-lang/infra).
💔 rls on linux: test-fail → build-fail (cc @nrc @Xanewok, @rust-lang/infra).
@bors bors mentioned this pull request Nov 23, 2018
Merged
@eddyb eddyb deleted the alignsssss branch November 23, 2018 05:35
matthiaskrgr added a commit to matthiaskrgr/rust-clippy that referenced this pull request Nov 23, 2018
@matthiaskrgr
rustup rust-lang/rust#54071
311c8e2
phansch added a commit to rust-lang/rust-clippy that referenced this pull request Nov 23, 2018
@phansch
Merge pull request #3452 from matthiaskrgr/rustup
754b4c0 
rustup rust-lang/rust#54071
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 23, 2018
@matthiaskrgr
submodules: update clippy from 2f6881c to 754b4c0
2598a7a 
Changes:
````
rustup rust-lang#54071
dependencies: update pulldown-cmark from 0.1 to 0.2
s/file_map/source_map
````
bors added a commit that referenced this pull request Nov 23, 2018
@bors
Auto merge of #56184 - matthiaskrgr:clippy, r=oli-obk
821bad3 
submodules: update clippy from 2f6881c to 754b4c0

Changes:
````
rustup #54071
dependencies: update pulldown-cmark from 0.1 to 0.2
s/file_map/source_map
````

r? @oli-obk
@crlf0710
Copy link
Member

@rustbot modify labels to -S-inactive-closed

@rustbot rustbot removed the S-inactive Status: Inactive and waiting on the author. This is often applied to closed PRs. label Mar 29, 2020
flip1995 pushed a commit to flip1995/rust-clippy that referenced this pull request May 5, 2020
@matthiaskrgr
submodules: update clippy from 2f6881c to 754b4c0
5afee64 
Changes:
````
rustup rust-lang/rust#54071
dependencies: update pulldown-cmark from 0.1 to 0.2
s/file_map/source_map
````
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nagisa nagisa nagisa left review comments

@oli-obk oli-obk oli-obk approved these changes

Assignees

@oli-obk oli-obk

Labels
S-waiting-on-bors Status: 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.
10 participants
@eddyb @bors @XAMPPRocky @TimNN @oli-obk @pietroalbini @rust-highfive @crlf0710 @nagisa @rustbot