rustc_trans: go through layouts uniformly for fat pointers and variants.

Author: eddyb

src/librustc/lint/context.rs

@@ -35,7 +35,7 @@ use rustc_serialize::{Decoder, Decodable, Encoder, Encodable};
 use session::{config, early_error, Session};
 use traits::Reveal;
 use ty::{self, TyCtxt, Ty};
-use ty::layout::{FullLayout, LayoutError, LayoutOf};
+use ty::layout::{LayoutError, LayoutOf, TyLayout};
 use util::nodemap::FxHashMap;
 
 use std::default::Default as StdDefault;
@@ -628,9 +628,9 @@ impl<'a, 'tcx> LateContext<'a, 'tcx> {
 }
 
 impl<'a, 'tcx> LayoutOf<Ty<'tcx>> for &'a LateContext<'a, 'tcx> {
-    type FullLayout = Result<FullLayout<'tcx>, LayoutError<'tcx>>;
+    type TyLayout = Result<TyLayout<'tcx>, LayoutError<'tcx>>;
 
-    fn layout_of(self, ty: Ty<'tcx>) -> Self::FullLayout {
+    fn layout_of(self, ty: Ty<'tcx>) -> Self::TyLayout {
         (self.tcx, self.param_env.reveal_all()).layout_of(ty)
     }
 }