X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;ds=sidebyside;f=src%2Flibrustc_mir%2Fhair%2Fconstant.rs;h=bc01e3ee95b978871b92e9a878bee65bf62ba707;hb=007aabae930d753742f6916d91d3fc8838db08a1;hp=37a2e79dae91ff62d89ff94efebcf2648d1c266c;hpb=adea1317c24738563a507b817bbf9c57471279f0;p=rust.git diff --git a/src/librustc_mir/hair/constant.rs b/src/librustc_mir/hair/constant.rs index 37a2e79dae9..bc01e3ee95b 100644 --- a/src/librustc_mir/hair/constant.rs +++ b/src/librustc_mir/hair/constant.rs @@ -9,16 +9,16 @@ Reported, } -crate fn lit_to_const<'a, 'gcx, 'tcx>( +crate fn lit_to_const<'tcx>( lit: &'tcx ast::LitKind, - tcx: TyCtxt<'a, 'gcx, 'tcx>, + tcx: TyCtxt<'tcx>, ty: Ty<'tcx>, neg: bool, ) -> Result<&'tcx ty::Const<'tcx>, LitToConstError> { use syntax::ast::*; let trunc = |n| { - let param_ty = ParamEnv::reveal_all().and(tcx.lift_to_global(&ty).unwrap()); + let param_ty = ParamEnv::reveal_all().and(ty); let width = tcx.layout_of(param_ty).map_err(|_| LitToConstError::Reported)?.size; trace!("trunc {} with size {} and shift {}", n, width.bits(), 128 - width.bits()); let result = truncate(n, width);