@@ -41,7 +41,7 @@ use ty::{PolyFnSig, InferTy, ParamTy, ProjectionTy, ExistentialPredicate, Predic
4141use ty:: RegionKind ;
4242use ty:: { TyVar , TyVid , IntVar , IntVid , FloatVar , FloatVid } ;
4343use ty:: TypeVariants :: * ;
44- use ty:: layout:: { CachedLayout , TargetDataLayout } ;
44+ use ty:: layout:: { LayoutDetails , TargetDataLayout } ;
4545use ty:: maps;
4646use ty:: steal:: Steal ;
4747use ty:: BindingMode ;
@@ -78,7 +78,7 @@ use hir;
7878/// Internal storage
7979pub struct GlobalArenas < ' tcx > {
8080 // internings
81- layout : TypedArena < CachedLayout > ,
81+ layout : TypedArena < LayoutDetails > ,
8282
8383 // references
8484 generics : TypedArena < ty:: Generics > ,
@@ -918,7 +918,7 @@ pub struct GlobalCtxt<'tcx> {
918918
919919 stability_interner : RefCell < FxHashSet < & ' tcx attr:: Stability > > ,
920920
921- layout_interner : RefCell < FxHashSet < & ' tcx CachedLayout > > ,
921+ layout_interner : RefCell < FxHashSet < & ' tcx LayoutDetails > > ,
922922
923923 /// A vector of every trait accessible in the whole crate
924924 /// (i.e. including those from subcrates). This is used only for
@@ -1016,7 +1016,7 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
10161016 interned
10171017 }
10181018
1019- pub fn intern_layout ( self , layout : CachedLayout ) -> & ' gcx CachedLayout {
1019+ pub fn intern_layout ( self , layout : LayoutDetails ) -> & ' gcx LayoutDetails {
10201020 if let Some ( layout) = self . layout_interner . borrow ( ) . get ( & layout) {
10211021 return layout;
10221022 }
0 commit comments