diff options
| author | Eduard-Mihai Burtescu <edy.burt@gmail.com> | 2018-02-01 00:00:38 +0200 |
|---|---|---|
| committer | Eduard-Mihai Burtescu <edy.burt@gmail.com> | 2018-02-01 00:01:08 +0200 |
| commit | 9c3dc7e8721c03e1e033895f327ff71f8fd400b4 (patch) | |
| tree | bb569aaba14e2251c9a1aa6648e6c0ad27fec8d7 /src/librustc_mir/transform | |
| parent | 560a2f4faf4828ba5f48fe2bd7709265c2f5354d (diff) | |
| download | rust-9c3dc7e8721c03e1e033895f327ff71f8fd400b4.tar.gz rust-9c3dc7e8721c03e1e033895f327ff71f8fd400b4.zip | |
rustc: prefer ParamEnvAnd and LayoutCx over tuples for LayoutOf.
Diffstat (limited to 'src/librustc_mir/transform')
| -rw-r--r-- | src/librustc_mir/transform/inline.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/librustc_mir/transform/inline.rs b/src/librustc_mir/transform/inline.rs index 43ee75d1e2b..ceea97e3ed3 100644 --- a/src/librustc_mir/transform/inline.rs +++ b/src/librustc_mir/transform/inline.rs @@ -19,7 +19,6 @@ use rustc_data_structures::indexed_vec::{Idx, IndexVec}; use rustc::mir::*; use rustc::mir::visit::*; use rustc::ty::{self, Instance, Ty, TyCtxt, TypeFoldable}; -use rustc::ty::layout::LayoutOf; use rustc::ty::subst::{Subst,Substs}; use std::collections::VecDeque; @@ -655,7 +654,7 @@ impl<'a, 'tcx> Inliner<'a, 'tcx> { fn type_size_of<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, param_env: ty::ParamEnv<'tcx>, ty: Ty<'tcx>) -> Option<u64> { - (tcx, param_env).layout_of(ty).ok().map(|layout| layout.size.bytes()) + tcx.layout_of(param_env.and(ty)).ok().map(|layout| layout.size.bytes()) } fn subst_and_normalize<'a, 'tcx: 'a>( |