Skip to content

Commit aa3d40c

Browse files
committed
tidy fixes
1 parent 307798a commit aa3d40c

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/librustc_mir/interpret/operand.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -646,15 +646,18 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
646646
} => {
647647
let variants_start = niche_variants.start().as_u32() as u128;
648648
let variants_end = niche_variants.end().as_u32() as u128;
649-
let raw_discr = raw_discr.not_undef()
650-
.map_err(|_| InterpError::Unsupported(InvalidDiscriminant(ScalarMaybeUndef::Undef)))?;
649+
let raw_discr = raw_discr.not_undef().map_err(|_| {
650+
InterpError::Unsupported(InvalidDiscriminant(ScalarMaybeUndef::Undef))
651+
})?;
651652
match raw_discr.to_bits_or_ptr(discr_val.layout.size, self) {
652653
Err(ptr) => {
653654
// The niche must be just 0 (which an inbounds pointer value never is)
654655
let ptr_valid = niche_start == 0 && variants_start == variants_end &&
655656
!self.memory.ptr_may_be_null(ptr);
656657
if !ptr_valid {
657-
return err!(Unsupported(InvalidDiscriminant(raw_discr.erase_tag().into())));
658+
return err!(Unsupported(InvalidDiscriminant(
659+
raw_discr.erase_tag().into()
660+
)));
658661
}
659662
(dataful_variant.as_u32() as u128, dataful_variant)
660663
},

src/librustc_mir/transform/const_prop.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
270270
| UndefinedBehaviour(_) => {},
271271
| InvalidProgram(_) => {},
272272
| ResourceExhaustion(_) => {},
273-
274273
| Panic(_)
275274
=> {
276275
diagnostic.report_as_lint(

0 commit comments

Comments
 (0)