Skip to content

Commit

Permalink
rustc: rename CachedLayout to LayoutDetails.
Browse files Browse the repository at this point in the history
  • Loading branch information
eddyb committed Oct 29, 2017
1 parent 714fc16 commit cac77ac
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 56 deletions.
8 changes: 4 additions & 4 deletions src/librustc/ty/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ use ty::{PolyFnSig, InferTy, ParamTy, ProjectionTy, ExistentialPredicate, Predic
use ty::RegionKind;
use ty::{TyVar, TyVid, IntVar, IntVid, FloatVar, FloatVid};
use ty::TypeVariants::*;
use ty::layout::{CachedLayout, TargetDataLayout};
use ty::layout::{LayoutDetails, TargetDataLayout};
use ty::maps;
use ty::steal::Steal;
use ty::BindingMode;
Expand Down Expand Up @@ -79,7 +79,7 @@ use hir;
/// Internal storage
pub struct GlobalArenas<'tcx> {
// internings
layout: TypedArena<CachedLayout>,
layout: TypedArena<LayoutDetails>,

// references
generics: TypedArena<ty::Generics>,
Expand Down Expand Up @@ -916,7 +916,7 @@ pub struct GlobalCtxt<'tcx> {

stability_interner: RefCell<FxHashSet<&'tcx attr::Stability>>,

layout_interner: RefCell<FxHashSet<&'tcx CachedLayout>>,
layout_interner: RefCell<FxHashSet<&'tcx LayoutDetails>>,

/// A vector of every trait accessible in the whole crate
/// (i.e. including those from subcrates). This is used only for
Expand Down Expand Up @@ -1014,7 +1014,7 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
interned
}

pub fn intern_layout(self, layout: CachedLayout) -> &'gcx CachedLayout {
pub fn intern_layout(self, layout: LayoutDetails) -> &'gcx LayoutDetails {
if let Some(layout) = self.layout_interner.borrow().get(&layout) {
return layout;
}
Expand Down
Loading

0 comments on commit cac77ac

Please sign in to comment.