bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

address review

Browse source
This commit is contained in:
b-naber 2022-06-03 20:42:35 +02:00
parent 0a6815a924
commit 773d8b2e15
22 changed files with 116 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

13
compiler/rustc_middle/src/mir/mod.rs
View file

@ -2405,7 +2405,7 @@ impl<'tcx> Operand<'tcx> {
Operand::Constant(Box::new(Constant {
span,
user_ty: None,
literal: ConstantKind::Ty(ty::Const::zero_sized(tcx, ty)),
literal: ConstantKind::Val(ConstValue::zst(), ty),
}))
}
@ -2981,16 +2981,6 @@ impl<'tcx> ConstantKind<'tcx> {
}
}
pub fn try_val(&self, tcx: TyCtxt<'tcx>) -> Option<ConstValue<'tcx>> {
match self {
ConstantKind::Ty(c) => match c.kind() {
ty::ConstKind::Value(v) => Some(tcx.valtree_to_const_val((c.ty(), v))),
_ => None,
},
ConstantKind::Val(v, _) => Some(*v),
}
}
#[inline]
pub fn try_to_value(self, tcx: TyCtxt<'tcx>) -> Option<interpret::ConstValue<'tcx>> {
match self {
@ -3548,6 +3538,7 @@ fn comma_sep<'tcx>(fmt: &mut Formatter<'_>, elems: Vec<ConstantKind<'tcx>>) -> f
Ok(())
}
// FIXME: Move that into `mir/pretty.rs`.
fn pretty_print_const_value<'tcx>(
ct: ConstValue<'tcx>,
ty: Ty<'tcx>,