Skip to content

Commit 38de6e1

Browse files
committed
Misc fixes to cranelift/clippy/miri
1 parent e8d02fe commit 38de6e1

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

clippy_lints/src/large_const_arrays.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ impl<'tcx> LateLintPass<'tcx> for LargeConstArrays {
5454
&& generics.params.is_empty() && !generics.has_where_clause_predicates
5555
&& let ty = cx.tcx.type_of(item.owner_id).instantiate_identity()
5656
&& let ty::Array(element_type, cst) = ty.kind()
57-
&& let ConstKind::Value(ty::ValTree::Leaf(element_count)) = cst.kind()
57+
&& let ConstKind::Value(_, ty::ValTree::Leaf(element_count)) = cst.kind()
5858
&& let Ok(element_count) = element_count.try_to_target_usize(cx.tcx)
5959
&& let Ok(element_size) = cx.layout_of(*element_type).map(|l| l.size.bytes())
6060
&& self.maximum_allowed_size < u128::from(element_count) * u128::from(element_size)

clippy_lints/src/large_stack_arrays.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ impl<'tcx> LateLintPass<'tcx> for LargeStackArrays {
6464
if let ExprKind::Repeat(_, _) | ExprKind::Array(_) = expr.kind
6565
&& !self.is_from_vec_macro(cx, expr.span)
6666
&& let ty::Array(element_type, cst) = cx.typeck_results().expr_ty(expr).kind()
67-
&& let ConstKind::Value(ty::ValTree::Leaf(element_count)) = cst.kind()
67+
&& let ConstKind::Value(_, ty::ValTree::Leaf(element_count)) = cst.kind()
6868
&& let Ok(element_count) = element_count.try_to_target_usize(cx.tcx)
6969
&& let Ok(element_size) = cx.layout_of(*element_type).map(|l| l.size.bytes())
7070
&& !cx.tcx.hir().parent_iter(expr.hir_id).any(|(_, node)| {

clippy_lints/src/matches/overlapping_arms.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ fn all_ranges<'tcx>(cx: &LateContext<'tcx>, arms: &'tcx [Arm<'_>], ty: Ty<'tcx>)
3737
Some(lhs) => constant(cx, cx.typeck_results(), lhs)?,
3838
None => {
3939
let min_val_const = ty.numeric_min_val(cx.tcx)?;
40-
mir_to_const(cx, mir::Const::from_ty_const(min_val_const, cx.tcx))?
40+
mir_to_const(cx, mir::Const::from_ty_const(min_val_const, ty, cx.tcx))?
4141
},
4242
};
4343
let rhs_const = match rhs {
4444
Some(rhs) => constant(cx, cx.typeck_results(), rhs)?,
4545
None => {
4646
let max_val_const = ty.numeric_max_val(cx.tcx)?;
47-
mir_to_const(cx, mir::Const::from_ty_const(max_val_const, cx.tcx))?
47+
mir_to_const(cx, mir::Const::from_ty_const(max_val_const, ty, cx.tcx))?
4848
},
4949
};
5050
let lhs_val = lhs_const.int_value(cx, ty)?;

clippy_lints/src/zero_repeat_side_effects.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ impl LateLintPass<'_> for ZeroRepeatSideEffects {
5555
inner_check(cx, expr, inner_expr, true);
5656
} else if let ExprKind::Repeat(inner_expr, _) = expr.kind
5757
&& let ty::Array(_, cst) = cx.typeck_results().expr_ty(expr).kind()
58-
&& let ConstKind::Value(ty::ValTree::Leaf(element_count)) = cst.kind()
58+
&& let ConstKind::Value(_, ty::ValTree::Leaf(element_count)) = cst.kind()
5959
&& let Ok(element_count) = element_count.try_to_target_usize(cx.tcx)
6060
&& element_count == 0
6161
{

clippy_utils/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1534,7 +1534,7 @@ pub fn is_range_full(cx: &LateContext<'_>, expr: &Expr<'_>, container_path: Opti
15341534
if let rustc_ty::Adt(_, subst) = ty.kind()
15351535
&& let bnd_ty = subst.type_at(0)
15361536
&& let Some(min_val) = bnd_ty.numeric_min_val(cx.tcx)
1537-
&& let Some(min_const) = mir_to_const(cx, Const::from_ty_const(min_val, cx.tcx))
1537+
&& let Some(min_const) = mir_to_const(cx, Const::from_ty_const(min_val, bnd_ty, cx.tcx))
15381538
&& let Some(start_const) = constant(cx, cx.typeck_results(), start)
15391539
{
15401540
start_const == min_const
@@ -1547,7 +1547,7 @@ pub fn is_range_full(cx: &LateContext<'_>, expr: &Expr<'_>, container_path: Opti
15471547
if let rustc_ty::Adt(_, subst) = ty.kind()
15481548
&& let bnd_ty = subst.type_at(0)
15491549
&& let Some(max_val) = bnd_ty.numeric_max_val(cx.tcx)
1550-
&& let Some(max_const) = mir_to_const(cx, Const::from_ty_const(max_val, cx.tcx))
1550+
&& let Some(max_const) = mir_to_const(cx, Const::from_ty_const(max_val, bnd_ty, cx.tcx))
15511551
&& let Some(end_const) = constant(cx, cx.typeck_results(), end)
15521552
{
15531553
end_const == max_const

0 commit comments

Comments
 (0)