Skip to content

Commit 1a7657b

Browse files
committed
Auto merge of #132262 - matthiaskrgr:rollup-pcphi6l, r=matthiaskrgr
Rollup of 4 pull requests Successful merges: - #131391 (Stabilize `isqrt` feature) - #132248 (rustc_transmute: Directly use types from rustc_abi) - #132252 (compiler: rename LayoutS to LayoutData) - #132253 (Known-bug test for `keyword_idents` lint not propagating to other files) r? `@ghost` `@rustbot` modify labels: rollup
2 parents bfeadff + 4d0ed44 commit 1a7657b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

crates/hir-ty/src/layout.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use base_db::ra_salsa::Cycle;
66
use chalk_ir::{AdtId, FloatTy, IntTy, TyKind, UintTy};
77
use hir_def::{
88
layout::{
9-
Abi, FieldsShape, Float, Integer, LayoutCalculator, LayoutCalculatorError, LayoutS,
9+
Abi, FieldsShape, Float, Integer, LayoutCalculator, LayoutCalculatorError, LayoutData,
1010
Primitive, ReprOptions, Scalar, Size, StructKind, TargetDataLayout, WrappingRange,
1111
},
1212
LocalFieldId, StructId,
@@ -66,7 +66,7 @@ impl rustc_index::Idx for RustcFieldIdx {
6666
}
6767
}
6868

69-
pub type Layout = LayoutS<RustcFieldIdx, RustcEnumVariantIdx>;
69+
pub type Layout = LayoutData<RustcFieldIdx, RustcEnumVariantIdx>;
7070
pub type TagEncoding = hir_def::layout::TagEncoding<RustcEnumVariantIdx>;
7171
pub type Variants = hir_def::layout::Variants<RustcFieldIdx, RustcEnumVariantIdx>;
7272

0 commit comments

Comments
 (0)