From dc0acd2dd1c8fa0b34b7c03390d589a6206cfb0e Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
Date: Mon, 17 Nov 2025 05:10:43 +0100
Subject: [PATCH] clippy +nightly fix (#7723)

---
 crates/egui/src/containers/menu.rs                | 11 +++++------
 crates/egui/src/memory/mod.rs                     |  3 +--
 crates/egui/src/menu.rs                           |  2 +-
 crates/egui/src/ui_stack.rs                       |  2 +-
 crates/egui_demo_lib/src/demo/misc_demo_window.rs |  2 +-
 crates/epaint/src/shapes/shape.rs                 |  2 +-
 tests/test_viewports/src/main.rs                  |  2 +-
 7 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/crates/egui/src/containers/menu.rs b/crates/egui/src/containers/menu.rs
index f2aaee046..756d68dd3 100644
--- a/crates/egui/src/containers/menu.rs
+++ b/crates/egui/src/containers/menu.rs
@@ -161,14 +161,13 @@ impl MenuState {
             if state.last_visible_pass + 1 < pass_nr {
                 state.open_item = None;
             }
-            if let Some(item) = state.open_item {
-                if data
+            if let Some(item) = state.open_item
+                && data
                     .get_temp(item.with(Self::ID))
                     .is_none_or(|item: Self| item.last_visible_pass + 1 < pass_nr)
-                {
-                    // If the open item wasn't shown for at least a frame, reset the open item
-                    state.open_item = None;
-                }
+            {
+                // If the open item wasn't shown for at least a frame, reset the open item
+                state.open_item = None;
             }
             let r = f(&mut state);
             data.insert_temp(state_id, state);
diff --git a/crates/egui/src/memory/mod.rs b/crates/egui/src/memory/mod.rs
index 6192f3e72..d215a3bec 100644
--- a/crates/egui/src/memory/mod.rs
+++ b/crates/egui/src/memory/mod.rs
@@ -1272,8 +1272,7 @@ impl Areas {
     pub fn top_layer_id(&self, order: Order) -> Option<LayerId> {
         self.order
             .iter()
-            .filter(|layer| layer.order == order && !self.is_sublayer(layer))
-            .next_back()
+            .rfind(|layer| layer.order == order && !self.is_sublayer(layer))
             .copied()
     }
 
diff --git a/crates/egui/src/menu.rs b/crates/egui/src/menu.rs
index 348f42c21..4d746c074 100644
--- a/crates/egui/src/menu.rs
+++ b/crates/egui/src/menu.rs
@@ -634,7 +634,7 @@ impl SubMenu {
 /// Usually you don't need to use it directly.
 pub struct MenuState {
     /// The opened sub-menu and its [`Id`]
-    sub_menu: Option<(Id, Arc<RwLock<MenuState>>)>,
+    sub_menu: Option<(Id, Arc<RwLock<Self>>)>,
 
     /// Bounding box of this menu (without the sub-menu),
     /// including the frame and everything.
diff --git a/crates/egui/src/ui_stack.rs b/crates/egui/src/ui_stack.rs
index 0122f5681..4136218bd 100644
--- a/crates/egui/src/ui_stack.rs
+++ b/crates/egui/src/ui_stack.rs
@@ -209,7 +209,7 @@ pub struct UiStack {
     pub layout_direction: Direction,
     pub min_rect: Rect,
     pub max_rect: Rect,
-    pub parent: Option<Arc<UiStack>>,
+    pub parent: Option<Arc<Self>>,
 }
 
 // these methods act on this specific node
diff --git a/crates/egui_demo_lib/src/demo/misc_demo_window.rs b/crates/egui_demo_lib/src/demo/misc_demo_window.rs
index bb62f1822..b502fa767 100644
--- a/crates/egui_demo_lib/src/demo/misc_demo_window.rs
+++ b/crates/egui_demo_lib/src/demo/misc_demo_window.rs
@@ -451,7 +451,7 @@ enum Action {
 
 #[derive(Clone, Default)]
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
-struct Tree(Vec<Tree>);
+struct Tree(Vec<Self>);
 
 impl Tree {
     pub fn demo() -> Self {
diff --git a/crates/epaint/src/shapes/shape.rs b/crates/epaint/src/shapes/shape.rs
index 8ee852c61..fa8a3e75c 100644
--- a/crates/epaint/src/shapes/shape.rs
+++ b/crates/epaint/src/shapes/shape.rs
@@ -30,7 +30,7 @@ pub enum Shape {
 
     /// Recursively nest more shapes - sometimes a convenience to be able to do.
     /// For performance reasons it is better to avoid it.
-    Vec(Vec<Shape>),
+    Vec(Vec<Self>),
 
     /// Circle with optional outline and fill.
     Circle(CircleShape),
diff --git a/tests/test_viewports/src/main.rs b/tests/test_viewports/src/main.rs
index ab31a4ece..a862dbd32 100644
--- a/tests/test_viewports/src/main.rs
+++ b/tests/test_viewports/src/main.rs
@@ -31,7 +31,7 @@ pub struct ViewportState {
     pub visible: bool,
     pub immediate: bool,
     pub title: String,
-    pub children: Vec<Arc<RwLock<ViewportState>>>,
+    pub children: Vec<Arc<RwLock<Self>>>,
 }
 
 impl ViewportState {