about summary refs log tree commit diff
path: root/clippy_lints/src/trailing_empty_array.rs
diff options
context:
space:
mode:
authorNoah Lev <camelidcamel@gmail.com>2024-06-04 18:24:08 -0700
committerNoah Lev <camelidcamel@gmail.com>2024-07-16 19:27:28 -0700
commit6e99e2d748353174e23bf2849f0d523d8128a201 (patch)
treeb17879ad9440024e083978125e108b8c5c9148d6 /clippy_lints/src/trailing_empty_array.rs
parent620a056a336971a4ca67d83fe472e4ca234bd51f (diff)
downloadrust-6e99e2d748353174e23bf2849f0d523d8128a201.tar.gz
rust-6e99e2d748353174e23bf2849f0d523d8128a201.zip
Use `ConstArg` for array lengths
Diffstat (limited to 'clippy_lints/src/trailing_empty_array.rs')
-rw-r--r--clippy_lints/src/trailing_empty_array.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/clippy_lints/src/trailing_empty_array.rs b/clippy_lints/src/trailing_empty_array.rs
index 462084e96a8..db8c63892b8 100644
--- a/clippy_lints/src/trailing_empty_array.rs
+++ b/clippy_lints/src/trailing_empty_array.rs
@@ -2,7 +2,7 @@ use clippy_utils::diagnostics::span_lint_and_help;
 use clippy_utils::has_repr_attr;
 use rustc_hir::{Item, ItemKind};
 use rustc_lint::{LateContext, LateLintPass};
-use rustc_middle::ty::Const;
+use rustc_middle::ty::{Const, FeedConstTy};
 use rustc_session::declare_lint_pass;
 
 declare_clippy_lint! {
@@ -53,14 +53,14 @@ impl<'tcx> LateLintPass<'tcx> for TrailingEmptyArray {
     }
 }
 
-fn is_struct_with_trailing_zero_sized_array(cx: &LateContext<'_>, item: &Item<'_>) -> bool {
+fn is_struct_with_trailing_zero_sized_array<'tcx>(cx: &LateContext<'tcx>, item: &Item<'tcx>) -> bool {
     if let ItemKind::Struct(data, _) = &item.kind
         // First check if last field is an array
         && let Some(last_field) = data.fields().last()
         && let rustc_hir::TyKind::Array(_, rustc_hir::ArrayLen::Body(length)) = last_field.ty.kind
 
         // Then check if that array is zero-sized
-        && let length = Const::from_anon_const(cx.tcx, length.def_id)
+        && let length = Const::from_const_arg(cx.tcx, length, FeedConstTy::No)
         && let length = length.try_eval_target_usize(cx.tcx, cx.param_env)
         && let Some(length) = length
     {