X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Flibrustc_typeck%2Fastconv.rs;h=ee3ebd691e4538612dc90c329771a9e50aaf2fec;hb=028c83cdf6d6d0054bafaaf85af39bca393a104c;hp=5c66151338272f9a7b0402a686ba088cfba5c07a;hpb=d7f1406378a31b9f5e9012d882ae237131e3c252;p=rust.git diff --git a/src/librustc_typeck/astconv.rs b/src/librustc_typeck/astconv.rs index 5c661513382..ee3ebd691e4 100644 --- a/src/librustc_typeck/astconv.rs +++ b/src/librustc_typeck/astconv.rs @@ -18,7 +18,6 @@ use rustc::ty::{GenericParamDef, GenericParamDefKind}; use rustc::ty::subst::{self, Subst, InternalSubsts, SubstsRef}; use rustc::ty::wf::object_region_bounds; -use rustc::mir::interpret::ConstValue; use rustc_target::spec::abi; use crate::require_c_abi_if_c_variadic; use smallvec::SmallVec; @@ -2226,7 +2225,7 @@ pub fn ast_const_to_const( let def_id = tcx.hir().local_def_id(ast_const.hir_id); let mut const_ = ty::Const { - val: ConstValue::Unevaluated( + val: ty::ConstKind::Unevaluated( def_id, InternalSubsts::identity_for_item(tcx, def_id), ), @@ -2243,7 +2242,7 @@ pub fn ast_const_to_const( let generics = tcx.generics_of(item_def_id); let index = generics.param_def_id_to_index[&tcx.hir().local_def_id(hir_id)]; let name = tcx.hir().name(hir_id); - const_.val = ConstValue::Param(ty::ParamConst::new(index, name)); + const_.val = ty::ConstKind::Param(ty::ParamConst::new(index, name)); } tcx.mk_const(const_)