diff options
| author | Ralf Jung <post@ralfj.de> | 2023-09-12 23:47:47 +0200 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2023-09-13 07:29:34 +0200 |
| commit | 5cd391c4adf0a50d07fe403ce7ddcbeb9922c8b9 (patch) | |
| tree | 180bf3717f5daa714a20f7adaa5d0e8e46ead75f | |
| parent | b643f20f464c93894c9347c8bc34a46caf8355f0 (diff) | |
| download | rust-5cd391c4adf0a50d07fe403ce7ddcbeb9922c8b9.tar.gz rust-5cd391c4adf0a50d07fe403ce7ddcbeb9922c8b9.zip | |
make the set of methods between our two Const types more consistent
| -rw-r--r-- | clippy_lints/src/matches/overlapping_arms.rs | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/clippy_lints/src/matches/overlapping_arms.rs b/clippy_lints/src/matches/overlapping_arms.rs index 8be3c178a29..6e13148f2fc 100644 --- a/clippy_lints/src/matches/overlapping_arms.rs +++ b/clippy_lints/src/matches/overlapping_arms.rs @@ -37,22 +37,14 @@ fn all_ranges<'tcx>(cx: &LateContext<'tcx>, arms: &'tcx [Arm<'_>], ty: Ty<'tcx>) Some(lhs) => constant(cx, cx.typeck_results(), lhs)?, None => { let min_val_const = ty.numeric_min_val(cx.tcx)?; - let min_constant = mir::ConstantKind::from_value( - cx.tcx.valtree_to_const_val((ty, min_val_const.to_valtree())), - ty, - ); - miri_to_const(cx, min_constant)? + miri_to_const(cx, mir::ConstantKind::from_ty_const(min_val_const, cx.tcx))? }, }; let rhs_const = match rhs { Some(rhs) => constant(cx, cx.typeck_results(), rhs)?, None => { let max_val_const = ty.numeric_max_val(cx.tcx)?; - let max_constant = mir::ConstantKind::from_value( - cx.tcx.valtree_to_const_val((ty, max_val_const.to_valtree())), - ty, - ); - miri_to_const(cx, max_constant)? + miri_to_const(cx, mir::ConstantKind::from_ty_const(max_val_const, cx.tcx))? }, }; let lhs_val = lhs_const.int_value(cx, ty)?; |
