Skip to content

Commit 4ce933f

Browse files
eddybeddyb
committed
rustc_target: move LayoutOf to ty::layout.
1 parent 50171c3 commit 4ce933f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+148
-170
lines changed

‎compiler/rustc_codegen_cranelift/src/common.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,7 @@ pub(crate) struct FunctionCx<'m, 'clif, 'tcx: 'm> {
257257
}
258258

259259
impl<'tcx> LayoutOf<'tcx> for FunctionCx<'_, '_, 'tcx> {
260-
type Ty = Ty<'tcx>;
261-
type TyAndLayout = TyAndLayout<'tcx>;
260+
type LayoutOfResult = TyAndLayout<'tcx>;
262261

263262
fn layout_of(&self, ty: Ty<'tcx>) -> TyAndLayout<'tcx> {
264263
RevealAllLayoutCx(self.tcx).layout_of(ty)
@@ -365,8 +364,7 @@ impl<'tcx> FunctionCx<'_, '_, 'tcx> {
365364
pub(crate) struct RevealAllLayoutCx<'tcx>(pub(crate) TyCtxt<'tcx>);
366365

367366
impl<'tcx> LayoutOf<'tcx> for RevealAllLayoutCx<'tcx> {
368-
type Ty = Ty<'tcx>;
369-
type TyAndLayout = TyAndLayout<'tcx>;
367+
type LayoutOfResult = TyAndLayout<'tcx>;
370368

371369
fn layout_of(&self, ty: Ty<'tcx>) -> TyAndLayout<'tcx> {
372370
assert!(!ty.still_further_specializable());

‎compiler/rustc_codegen_cranelift/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@ mod prelude {
7979
pub(crate) use rustc_hir::def_id::{DefId, LOCAL_CRATE};
8080
pub(crate) use rustc_middle::bug;
8181
pub(crate) use rustc_middle::mir::{self, *};
82-
pub(crate) use rustc_middle::ty::layout::{self, TyAndLayout};
82+
pub(crate) use rustc_middle::ty::layout::{self, LayoutOf, TyAndLayout};
8383
pub(crate) use rustc_middle::ty::{
8484
self, FloatTy, Instance, InstanceDef, IntTy, ParamEnv, Ty, TyCtxt, TypeAndMut,
8585
TypeFoldable, UintTy,
8686
};
87-
pub(crate) use rustc_target::abi::{Abi, LayoutOf, Scalar, Size, VariantIdx};
87+
pub(crate) use rustc_target::abi::{Abi, Scalar, Size, VariantIdx};
8888

8989
pub(crate) use rustc_data_structures::fx::FxHashMap;
9090

‎compiler/rustc_codegen_llvm/src/abi.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@ use rustc_codegen_ssa::mir::place::PlaceRef;
1111
use rustc_codegen_ssa::traits::*;
1212
use rustc_codegen_ssa::MemFlags;
1313
use rustc_middle::bug;
14+
use rustc_middle::ty::layout::LayoutOf;
1415
pub use rustc_middle::ty::layout::{FAT_PTR_ADDR, FAT_PTR_EXTRA};
1516
use rustc_middle::ty::Ty;
1617
use rustc_target::abi::call::ArgAbi;
1718
pub use rustc_target::abi::call::*;
18-
use rustc_target::abi::{self, HasDataLayout, Int, LayoutOf};
19+
use rustc_target::abi::{self, HasDataLayout, Int};
1920
pub use rustc_target::spec::abi::Abi;
2021

2122
use libc::c_uint;

‎compiler/rustc_codegen_llvm/src/builder.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use rustc_codegen_ssa::traits::*;
1515
use rustc_codegen_ssa::MemFlags;
1616
use rustc_data_structures::small_c_str::SmallCStr;
1717
use rustc_hir::def_id::DefId;
18-
use rustc_middle::ty::layout::TyAndLayout;
18+
use rustc_middle::ty::layout::{LayoutOf, TyAndLayout};
1919
use rustc_middle::ty::{self, Ty, TyCtxt};
2020
use rustc_span::Span;
2121
use rustc_target::abi::{self, Align, Size};
@@ -88,11 +88,10 @@ impl HasTargetSpec for Builder<'_, '_, 'tcx> {
8888
}
8989
}
9090

91-
impl abi::LayoutOf<'tcx> for Builder<'_, '_, 'tcx> {
92-
type Ty = Ty<'tcx>;
93-
type TyAndLayout = TyAndLayout<'tcx>;
91+
impl LayoutOf<'tcx> for Builder<'_, '_, 'tcx> {
92+
type LayoutOfResult = TyAndLayout<'tcx>;
9493

95-
fn layout_of(&self, ty: Ty<'tcx>) -> Self::TyAndLayout {
94+
fn layout_of(&self, ty: Ty<'tcx>) -> Self::LayoutOfResult {
9695
self.cx.layout_of(ty)
9796
}
9897
}

‎compiler/rustc_codegen_llvm/src/common.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ use rustc_codegen_ssa::mir::place::PlaceRef;
1212
use rustc_codegen_ssa::traits::*;
1313
use rustc_middle::bug;
1414
use rustc_middle::mir::interpret::{Allocation, GlobalAlloc, Scalar};
15-
use rustc_middle::ty::{layout::TyAndLayout, ScalarInt};
15+
use rustc_middle::ty::layout::{LayoutOf, TyAndLayout};
16+
use rustc_middle::ty::ScalarInt;
1617
use rustc_span::symbol::Symbol;
17-
use rustc_target::abi::{self, AddressSpace, HasDataLayout, LayoutOf, Pointer, Size};
18+
use rustc_target::abi::{self, AddressSpace, HasDataLayout, Pointer, Size};
1819

1920
use libc::{c_char, c_uint};
2021
use tracing::debug;

‎compiler/rustc_codegen_llvm/src/consts.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@ use rustc_middle::mir::interpret::{
1515
Scalar as InterpScalar,
1616
};
1717
use rustc_middle::mir::mono::MonoItem;
18+
use rustc_middle::ty::layout::LayoutOf;
1819
use rustc_middle::ty::{self, Instance, Ty};
1920
use rustc_middle::{bug, span_bug};
2021
use rustc_target::abi::{
21-
AddressSpace, Align, HasDataLayout, LayoutOf, Primitive, Scalar, Size, WrappingRange,
22+
AddressSpace, Align, HasDataLayout, Primitive, Scalar, Size, WrappingRange,
2223
};
2324
use std::ops::Range;
2425
use tracing::debug;

‎compiler/rustc_codegen_llvm/src/context.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ use rustc_data_structures::fx::FxHashMap;
1616
use rustc_data_structures::small_c_str::SmallCStr;
1717
use rustc_middle::bug;
1818
use rustc_middle::mir::mono::CodegenUnit;
19-
use rustc_middle::ty::layout::{HasParamEnv, LayoutError, TyAndLayout};
19+
use rustc_middle::ty::layout::{HasParamEnv, LayoutError, LayoutOf, TyAndLayout};
2020
use rustc_middle::ty::{self, Instance, Ty, TyCtxt};
2121
use rustc_session::config::{CFGuard, CrateType, DebugInfo};
2222
use rustc_session::Session;
2323
use rustc_span::source_map::{Span, DUMMY_SP};
2424
use rustc_span::symbol::Symbol;
25-
use rustc_target::abi::{HasDataLayout, LayoutOf, PointeeInfo, Size, TargetDataLayout, VariantIdx};
25+
use rustc_target::abi::{HasDataLayout, PointeeInfo, Size, TargetDataLayout, VariantIdx};
2626
use rustc_target::spec::{HasTargetSpec, RelocModel, Target, TlsModel};
2727
use smallvec::SmallVec;
2828

@@ -836,14 +836,13 @@ impl ty::layout::HasTyCtxt<'tcx> for CodegenCx<'ll, 'tcx> {
836836
}
837837

838838
impl LayoutOf<'tcx> for CodegenCx<'ll, 'tcx> {
839-
type Ty = Ty<'tcx>;
840-
type TyAndLayout = TyAndLayout<'tcx>;
839+
type LayoutOfResult = TyAndLayout<'tcx>;
841840

842-
fn layout_of(&self, ty: Ty<'tcx>) -> Self::TyAndLayout {
841+
fn layout_of(&self, ty: Ty<'tcx>) -> Self::LayoutOfResult {
843842
self.spanned_layout_of(ty, DUMMY_SP)
844843
}
845844

846-
fn spanned_layout_of(&self, ty: Ty<'tcx>, span: Span) -> Self::TyAndLayout {
845+
fn spanned_layout_of(&self, ty: Ty<'tcx>, span: Span) -> Self::LayoutOfResult {
847846
self.tcx.layout_of(ty::ParamEnv::reveal_all().and(ty)).unwrap_or_else(|e| {
848847
if let LayoutError::SizeOverflow(_) = e {
849848
self.sess().span_fatal(span, &e.to_string())

‎compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ use rustc_hir::def_id::{DefId, LOCAL_CRATE};
2828
use rustc_index::vec::{Idx, IndexVec};
2929
use rustc_middle::ich::NodeIdHashingMode;
3030
use rustc_middle::mir::{self, GeneratorLayout};
31-
use rustc_middle::ty::layout::{self, IntegerExt, PrimitiveExt, TyAndLayout};
31+
use rustc_middle::ty::layout::{self, IntegerExt, LayoutOf, PrimitiveExt, TyAndLayout};
3232
use rustc_middle::ty::subst::GenericArgKind;
3333
use rustc_middle::ty::Instance;
3434
use rustc_middle::ty::{self, AdtKind, GeneratorSubsts, ParamEnv, Ty, TyCtxt};
3535
use rustc_middle::{bug, span_bug};
3636
use rustc_session::config::{self, DebugInfo};
3737
use rustc_span::symbol::{Interner, Symbol};
3838
use rustc_span::{self, SourceFile, SourceFileHash, Span};
39-
use rustc_target::abi::{Abi, Align, HasDataLayout, Integer, LayoutOf, TagEncoding};
39+
use rustc_target::abi::{Abi, Align, HasDataLayout, Integer, TagEncoding};
4040
use rustc_target::abi::{Int, Pointer, F32, F64};
4141
use rustc_target::abi::{Primitive, Size, VariantIdx, Variants};
4242
use tracing::debug;

‎compiler/rustc_codegen_llvm/src/debuginfo/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ use rustc_data_structures::sync::Lrc;
2525
use rustc_hir::def_id::{DefId, DefIdMap};
2626
use rustc_index::vec::IndexVec;
2727
use rustc_middle::mir;
28-
use rustc_middle::ty::layout::HasTyCtxt;
28+
use rustc_middle::ty::layout::{HasTyCtxt, LayoutOf};
2929
use rustc_middle::ty::subst::{GenericArgKind, SubstsRef};
3030
use rustc_middle::ty::{self, Instance, ParamEnv, Ty, TypeFoldable};
3131
use rustc_session::config::{self, DebugInfo};
3232
use rustc_span::symbol::Symbol;
3333
use rustc_span::{self, BytePos, Pos, SourceFile, SourceFileAndLine, Span};
34-
use rustc_target::abi::{LayoutOf, Primitive, Size};
34+
use rustc_target::abi::{Primitive, Size};
3535

3636
use libc::c_uint;
3737
use smallvec::SmallVec;

‎compiler/rustc_codegen_llvm/src/intrinsic.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ use rustc_codegen_ssa::mir::operand::OperandRef;
1515
use rustc_codegen_ssa::mir::place::PlaceRef;
1616
use rustc_codegen_ssa::traits::*;
1717
use rustc_hir as hir;
18-
use rustc_middle::ty::layout::{FnAbiExt, HasTyCtxt};
18+
use rustc_middle::ty::layout::{FnAbiExt, HasTyCtxt, LayoutOf};
1919
use rustc_middle::ty::{self, Ty};
2020
use rustc_middle::{bug, span_bug};
2121
use rustc_span::{sym, symbol::kw, Span, Symbol};
22-
use rustc_target::abi::{self, HasDataLayout, LayoutOf, Primitive};
22+
use rustc_target::abi::{self, HasDataLayout, Primitive};
2323
use rustc_target::spec::PanicStrategy;
2424

2525
use std::cmp::Ordering;

0 commit comments

Comments
 (0)