diff options
| author | Saleem Jaffer <ssaleem1992@gmail.com> | 2019-07-27 17:56:45 +0530 |
|---|---|---|
| committer | Saleem Jaffer <ssaleem1992@gmail.com> | 2019-07-29 13:35:10 +0530 |
| commit | aa3d40cd7189b324afd20fbe3baffe76ea1a67a1 (patch) | |
| tree | 306e7629ea0448a66a127188bb2c0104cc30da19 /src | |
| parent | 307798aa38b00d92c9d541a199c3b2ed5422d358 (diff) | |
| download | rust-aa3d40cd7189b324afd20fbe3baffe76ea1a67a1.tar.gz rust-aa3d40cd7189b324afd20fbe3baffe76ea1a67a1.zip | |
tidy fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc_mir/interpret/operand.rs | 9 | ||||
| -rw-r--r-- | src/librustc_mir/transform/const_prop.rs | 1 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/librustc_mir/interpret/operand.rs b/src/librustc_mir/interpret/operand.rs index 3edc7748e5b..3b89b50f1a4 100644 --- a/src/librustc_mir/interpret/operand.rs +++ b/src/librustc_mir/interpret/operand.rs @@ -646,15 +646,18 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> { } => { let variants_start = niche_variants.start().as_u32() as u128; let variants_end = niche_variants.end().as_u32() as u128; - let raw_discr = raw_discr.not_undef() - .map_err(|_| InterpError::Unsupported(InvalidDiscriminant(ScalarMaybeUndef::Undef)))?; + let raw_discr = raw_discr.not_undef().map_err(|_| { + InterpError::Unsupported(InvalidDiscriminant(ScalarMaybeUndef::Undef)) + })?; match raw_discr.to_bits_or_ptr(discr_val.layout.size, self) { Err(ptr) => { // The niche must be just 0 (which an inbounds pointer value never is) let ptr_valid = niche_start == 0 && variants_start == variants_end && !self.memory.ptr_may_be_null(ptr); if !ptr_valid { - return err!(Unsupported(InvalidDiscriminant(raw_discr.erase_tag().into()))); + return err!(Unsupported(InvalidDiscriminant( + raw_discr.erase_tag().into() + ))); } (dataful_variant.as_u32() as u128, dataful_variant) }, diff --git a/src/librustc_mir/transform/const_prop.rs b/src/librustc_mir/transform/const_prop.rs index 518489753a1..6a39839de45 100644 --- a/src/librustc_mir/transform/const_prop.rs +++ b/src/librustc_mir/transform/const_prop.rs @@ -270,7 +270,6 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> { | UndefinedBehaviour(_) => {}, | InvalidProgram(_) => {}, | ResourceExhaustion(_) => {}, - | Panic(_) => { diagnostic.report_as_lint( |