diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2017-05-17 08:01:04 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2017-06-01 12:56:30 -0400 |
| commit | 6c4b961effdbec1bb2fc5aaed5aeb219eb7f3b19 (patch) | |
| tree | 233aa1400d06b283de46fb2c624461c29045e386 /src/librustc_mir/transform/inline.rs | |
| parent | 4ed2edaafe82fb8d44e81e00ca3e4f7659855ba2 (diff) | |
| download | rust-6c4b961effdbec1bb2fc5aaed5aeb219eb7f3b19.tar.gz rust-6c4b961effdbec1bb2fc5aaed5aeb219eb7f3b19.zip | |
move projection mode into parameter environment
Diffstat (limited to 'src/librustc_mir/transform/inline.rs')
| -rw-r--r-- | src/librustc_mir/transform/inline.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/librustc_mir/transform/inline.rs b/src/librustc_mir/transform/inline.rs index edb2f44d18e..8842d30b65c 100644 --- a/src/librustc_mir/transform/inline.rs +++ b/src/librustc_mir/transform/inline.rs @@ -18,7 +18,6 @@ use rustc_data_structures::indexed_vec::{Idx, IndexVec}; use rustc::mir::*; use rustc::mir::transform::{MirPass, MirSource}; use rustc::mir::visit::*; -use rustc::traits; use rustc::ty::{self, Ty, TyCtxt}; use rustc::ty::subst::{Subst,Substs}; @@ -545,9 +544,10 @@ impl<'a, 'tcx> Inliner<'a, 'tcx> { } } -fn type_size_of<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, param_env: ty::ParamEnv<'tcx>, +fn type_size_of<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, + param_env: ty::ParamEnv<'tcx>, ty: Ty<'tcx>) -> Option<u64> { - tcx.infer_ctxt(param_env, traits::Reveal::All).enter(|infcx| { + tcx.infer_ctxt(param_env.reveal_all()).enter(|infcx| { ty.layout(&infcx).ok().map(|layout| { layout.size(&tcx.data_layout).bytes() }) |