Skip to content

compiler: rename LayoutS to LayoutData #132252

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

Merged
bors merged 3 commits into from
Oct 28, 2024
Merged

compiler: rename LayoutS to LayoutData #132252

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e178129
compiler: Rename LayoutS to LayoutData
workingjubilee Oct 28, 2024
9015c6d
cg_clif: Rename LayoutS to LayoutData
workingjubilee Oct 28, 2024
2a9239a
rust-analyzer: Rename LayoutS to LayoutData
workingjubilee Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
rust-analyzer: Rename LayoutS to LayoutData
  • Loading branch information
@workingjubilee
workingjubilee committed Oct 28, 2024
commit 2a9239a1056a48f98a247ead469173dd806e0050
4 changes: 2 additions & 2 deletions src/tools/rust-analyzer/crates/hir-ty/src/layout.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use base_db::ra_salsa::Cycle;
use chalk_ir::{AdtId, FloatTy, IntTy, TyKind, UintTy};
use hir_def::{
layout::{
Abi, FieldsShape, Float, Integer, LayoutCalculator, LayoutCalculatorError, LayoutS,
Abi, FieldsShape, Float, Integer, LayoutCalculator, LayoutCalculatorError, LayoutData,
Primitive, ReprOptions, Scalar, Size, StructKind, TargetDataLayout, WrappingRange,
},
LocalFieldId, StructId,
Expand Down Expand Up @@ -66,7 +66,7 @@ impl rustc_index::Idx for RustcFieldIdx {
}
}

pub type Layout = LayoutS<RustcFieldIdx, RustcEnumVariantIdx>;
pub type Layout = LayoutData<RustcFieldIdx, RustcEnumVariantIdx>;
pub type TagEncoding = hir_def::layout::TagEncoding<RustcEnumVariantIdx>;
pub type Variants = hir_def::layout::Variants<RustcFieldIdx, RustcEnumVariantIdx>;

Expand Down