mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use map_or instead of open-coding it

Browse source
This commit is contained in:
LingMan 2021-06-17 19:39:58 +02:00
parent 0ef2b4a29b
commit 382ba79380
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_mir/src/transform/const_prop.rs
View file

@ -1205,12 +1205,9 @@ impl<'mir, 'tcx> MutVisitor<'tcx> for ConstPropagator<'mir, 'tcx> {
let mut eval_to_int = |op| { let mut eval_to_int = |op| {
// This can be `None` if the lhs wasn't const propagated and we just // This can be `None` if the lhs wasn't const propagated and we just
// triggered the assert on the value of the rhs. // triggered the assert on the value of the rhs.
match self.eval_operand(op, source_info) { self.eval_operand(op, source_info).map_or(DbgVal::Underscore, |op| {
Some(op) => DbgVal::Val( DbgVal::Val(self.ecx.read_immediate(&op).unwrap().to_const_int())
self.ecx.read_immediate(&op).unwrap().to_const_int(), })
),
None => DbgVal::Underscore,
}
}; };
let msg = match msg { let msg = match msg {
AssertKind::DivisionByZero(op) => { AssertKind::DivisionByZero(op) => {