From edf10f896fbfc5426eac03e5fb2343a2b369d948 Mon Sep 17 00:00:00 2001
From: dianne <diannes.gm@gmail.com>
Date: Sat, 26 Oct 2024 15:56:45 -0700
Subject: [PATCH] clippy: update `is_stable_const_fn` helper for multiple
 const-stability attrs

---
 src/tools/clippy/clippy_utils/src/qualify_min_const_fn.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/tools/clippy/clippy_utils/src/qualify_min_const_fn.rs b/src/tools/clippy/clippy_utils/src/qualify_min_const_fn.rs
index abadca7140019..cfa10044e6a52 100644
--- a/src/tools/clippy/clippy_utils/src/qualify_min_const_fn.rs
+++ b/src/tools/clippy/clippy_utils/src/qualify_min_const_fn.rs
@@ -394,7 +394,8 @@ fn is_stable_const_fn(tcx: TyCtxt<'_>, def_id: DefId, msrv: &Msrv) -> bool {
                 msrv.meets(const_stab_rust_version)
             } else {
                 // Unstable const fn, check if the feature is enabled.
-                tcx.features().enabled(const_stab.feature) && msrv.current().is_none()
+                tcx.features().all_enabled(const_stab.unstable_features())
+                    && msrv.current().is_none()
             }
         })
 }