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

compiler: rename LayoutS to LayoutData #132252

Merged
merged 3 commits into from
Oct 28, 2024

Conversation

workingjubilee
Copy link
Member

@workingjubilee workingjubilee commented Oct 28, 2024

Bid LayoutS goodbye because it looks like a typo.

LayoutS is the last of the types that use the "{TypeName} is the interned type, {TypeName}S is the backing data that is interned" convention. This is pretty confusing to those not intimately familiar with the history of rustc's names for its types over time, and doubly so now that there are no other examples in the tree. Abolish this convention.

@rustbot
Copy link
Collaborator

rustbot commented Oct 28, 2024

r? @TaKO8Ki

rustbot has assigned @TaKO8Ki.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@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 Oct 28, 2024
@rustbot
Copy link
Collaborator

rustbot commented Oct 28, 2024

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead.

cc @rust-lang/rust-analyzer

Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems reasonable to me, but I'll wait some time for people more familiar with the backend if they have opinions.

@jieyouxu
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Oct 28, 2024

📌 Commit 2a9239a has been approved by jieyouxu

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 Oct 28, 2024
@jieyouxu jieyouxu assigned jieyouxu and unassigned TaKO8Ki Oct 28, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 28, 2024
…iaskrgr

Rollup of 4 pull requests

Successful merges:

 - rust-lang#131391 (Stabilize `isqrt` feature)
 - rust-lang#132248 (rustc_transmute: Directly use types from rustc_abi)
 - rust-lang#132252 (compiler: rename LayoutS to LayoutData)
 - rust-lang#132253 (Known-bug test for `keyword_idents` lint not propagating to other files)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a4acbd5 into rust-lang:master Oct 28, 2024
6 checks passed
@rustbot rustbot added this to the 1.84.0 milestone Oct 28, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 28, 2024
Rollup merge of rust-lang#132252 - workingjubilee:rename-layouts-to-layoutdata, r=jieyouxu

compiler: rename LayoutS to LayoutData

Bid `LayoutS` goodbye because it looks like a typo.

`LayoutS` is the last of the types that use the "`{TypeName}` is the interned type, `{TypeName}S` is the backing data that is interned" convention. This is pretty confusing to those not intimately familiar with the history of rustc's names for its types over time, and doubly so now that there are no other examples in the tree. Abolish this convention.
@ultrabear
Copy link
Contributor

I will admit I originally thought LayoutS was a typo and pointed it out to jubilee, thanks for the clarification and fixing it for everyone forever :D

@workingjubilee workingjubilee deleted the rename-layouts-to-layoutdata branch October 28, 2024 17:19
github-merge-queue bot pushed a commit to model-checking/kani that referenced this pull request Oct 29, 2024
Culprit PR identified by @tautschnig:
rust-lang/rust#132252

Resolves #3657 

By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 and MIT licenses.
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.

6 participants