From 6153ea8dce1dcd60ecff446332c2639be8a6b452 Mon Sep 17 00:00:00 2001
From: Daniel Eades <danieleades@hotmail.com>
Date: Tue, 10 Jan 2023 08:28:28 +0000
Subject: [PATCH 1/2] loop-that-never-loops

---
 crates/hir-def/src/attr.rs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/crates/hir-def/src/attr.rs b/crates/hir-def/src/attr.rs
index ab5d180e1b..fb1e72b0d0 100644
--- a/crates/hir-def/src/attr.rs
+++ b/crates/hir-def/src/attr.rs
@@ -251,17 +251,17 @@ impl Attrs {
                 let enum_ = &item_tree[loc.id.value];
 
                 let cfg_options = &crate_graph[krate].cfg_options;
-                let variant = 'tri: loop {
-                    let mut idx = 0;
-                    for variant in enum_.variants.clone() {
-                        let attrs = item_tree.attrs(db, krate, variant.into());
-                        if attrs.is_cfg_enabled(cfg_options) {
-                            if it.local_id == Idx::from_raw(RawIdx::from(idx)) {
-                                break 'tri variant;
-                            }
-                            idx += 1;
+                let mut idx = 0;
+                let Some(variant) = enum_.variants.clone().find(|variant| {
+                    let attrs = item_tree.attrs(db, krate, (*variant).into());
+                    if attrs.is_cfg_enabled(cfg_options) {
+                        if it.local_id == Idx::from_raw(RawIdx::from(idx)) {
+                            return true
                         }
+                        idx += 1;
                     }
+                    false
+                }) else {
                     return Arc::new(res);
                 };
                 (item_tree[variant].fields.clone(), item_tree, krate)

From a3114c3697c21310dbf8a11feea74712bf1eddd7 Mon Sep 17 00:00:00 2001
From: "daniel.eades" <daniel.eades@hotmail.com>
Date: Wed, 11 Jan 2023 16:07:35 +0000
Subject: [PATCH 2/2] move loop index inside iterator

---
 crates/hir-def/src/attr.rs | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/crates/hir-def/src/attr.rs b/crates/hir-def/src/attr.rs
index fb1e72b0d0..c209bd9490 100644
--- a/crates/hir-def/src/attr.rs
+++ b/crates/hir-def/src/attr.rs
@@ -251,19 +251,18 @@ impl Attrs {
                 let enum_ = &item_tree[loc.id.value];
 
                 let cfg_options = &crate_graph[krate].cfg_options;
-                let mut idx = 0;
-                let Some(variant) = enum_.variants.clone().find(|variant| {
+
+                let Some(variant) = enum_.variants.clone().filter(|variant| {
                     let attrs = item_tree.attrs(db, krate, (*variant).into());
-                    if attrs.is_cfg_enabled(cfg_options) {
-                        if it.local_id == Idx::from_raw(RawIdx::from(idx)) {
-                            return true
-                        }
-                        idx += 1;
-                    }
-                    false
-                }) else {
+                    attrs.is_cfg_enabled(cfg_options)
+                })
+                .zip(0u32..)
+                .find(|(_variant, idx)| it.local_id == Idx::from_raw(RawIdx::from(*idx)))
+                .map(|(variant, _idx)| variant)
+                else {
                     return Arc::new(res);
                 };
+
                 (item_tree[variant].fields.clone(), item_tree, krate)
             }
             VariantId::StructId(it) => {