@@ -42,7 +42,7 @@ use ty::{PolyFnSig, InferTy, ParamTy, ProjectionTy, ExistentialPredicate, Predic
42
42
use ty:: RegionKind ;
43
43
use ty:: { TyVar , TyVid , IntVar , IntVid , FloatVar , FloatVid } ;
44
44
use ty:: TypeVariants :: * ;
45
- use ty:: layout:: { CachedLayout , TargetDataLayout } ;
45
+ use ty:: layout:: { LayoutDetails , TargetDataLayout } ;
46
46
use ty:: maps;
47
47
use ty:: steal:: Steal ;
48
48
use ty:: BindingMode ;
@@ -79,7 +79,7 @@ use hir;
79
79
/// Internal storage
80
80
pub struct GlobalArenas < ' tcx > {
81
81
// internings
82
- layout : TypedArena < CachedLayout > ,
82
+ layout : TypedArena < LayoutDetails > ,
83
83
84
84
// references
85
85
generics : TypedArena < ty:: Generics > ,
@@ -921,7 +921,7 @@ pub struct GlobalCtxt<'tcx> {
921
921
922
922
stability_interner : RefCell < FxHashSet < & ' tcx attr:: Stability > > ,
923
923
924
- layout_interner : RefCell < FxHashSet < & ' tcx CachedLayout > > ,
924
+ layout_interner : RefCell < FxHashSet < & ' tcx LayoutDetails > > ,
925
925
926
926
/// A vector of every trait accessible in the whole crate
927
927
/// (i.e. including those from subcrates). This is used only for
@@ -1019,7 +1019,7 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
1019
1019
interned
1020
1020
}
1021
1021
1022
- pub fn intern_layout ( self , layout : CachedLayout ) -> & ' gcx CachedLayout {
1022
+ pub fn intern_layout ( self , layout : LayoutDetails ) -> & ' gcx LayoutDetails {
1023
1023
if let Some ( layout) = self . layout_interner . borrow ( ) . get ( & layout) {
1024
1024
return layout;
1025
1025
}
0 commit comments