bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

use ParamConst in ExprKind::ConstParam

Browse source
This commit is contained in:
b-naber 2022-03-15 16:32:40 +01:00
parent e2496b3cf4
commit 9cd8bb0456
5 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_mir_build/src/build/expr/as_constant.rs
View file

@ -70,8 +70,10 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
Constant { user_ty, span, literal }
}
ExprKind::ConstParam { literal, def_id: _ } => {
let literal = ConstantKind::Ty(literal);
ExprKind::ConstParam { param, def_id: _ } => {
let const_param =
tcx.mk_const(ty::ConstS { val: ty::ConstKind::Param(param), ty: expr.ty });
let literal = ConstantKind::Ty(const_param);
Constant { user_ty: None, span, literal }
}

10
compiler/rustc_mir_build/src/thir/cx/expr.rs
View file

@ -869,15 +869,9 @@ impl<'tcx> Cx<'tcx> {
let generics = self.tcx.generics_of(item_def_id);
let index = generics.param_def_id_to_index[&def_id];
let name = self.tcx.hir().name(hir_id);
let val = ty::ConstKind::Param(ty::ParamConst::new(index, name));
let param = ty::ParamConst::new(index, name);
ExprKind::ConstParam {
literal: self.tcx.mk_const(ty::ConstS {
val,
ty: self.typeck_results().node_type(expr.hir_id),
}),
def_id,
}
ExprKind::ConstParam { param, def_id }
}
Res::Def(DefKind::Const, def_id) | Res::Def(DefKind::AssocConst, def_id) => {