Skip to content

Commit e5b1cae

Browse files
committed
Consolidate type system const evaluation under traits::evaluate_const
mew
1 parent e2962cc commit e5b1cae

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

clippy_lints/src/large_const_arrays.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ impl<'tcx> LateLintPass<'tcx> for LargeConstArrays {
5656
&& !item.span.from_expansion()
5757
&& let ty = cx.tcx.type_of(item.owner_id).instantiate_identity()
5858
&& let ty::Array(element_type, cst) = ty.kind()
59-
&& let Ok((_, ty::ValTree::Leaf(element_count))) = cst.eval_valtree(cx.tcx, ParamEnv::empty(), item.span)
59+
&& let Some((ty::ValTree::Leaf(element_count), _)) = cx.tcx.try_normalize_erasing_regions(ParamEnv::empty(), *cst).unwrap_or(*cst).try_to_valtree()
6060
&& let element_count = element_count.to_target_usize(cx.tcx)
6161
&& let Ok(element_size) = cx.layout_of(*element_type).map(|l| l.size.bytes())
6262
&& u128::from(self.maximum_allowed_size) < u128::from(element_count) * u128::from(element_size)

0 commit comments

Comments
 (0)