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