Merge pull request #3030 from iced-rs/rust-1.89

Fix lints for Rust 1.89 and bump MSRV to `1.88`

Author: hecrj

.github/workflows/test.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
-        rust: [stable, beta, "1.85"]
+        rust: [stable, beta, "1.88"]
     steps:
     - uses: hecrj/setup-rust-action@v2
       with:
@@ -23,5 +23,7 @@ jobs:
         sudo apt-get install -y libxkbcommon-dev libgtk-3-dev
     - name: Run tests
       run: |
+        cargo test --verbose --workspace
         cargo test --verbose --workspace -- --ignored
+        cargo test --verbose --workspace --all-features
         cargo test --verbose --workspace --all-features -- --ignored

Cargo.toml

@@ -145,7 +145,7 @@ repository = "https://github.com/iced-rs/iced"
 homepage = "https://iced.rs"
 categories = ["gui"]
 keywords = ["gui", "ui", "graphics", "interface", "widgets"]
-rust-version = "1.85"
+rust-version = "1.88"
 
 [workspace.dependencies]
 iced = { version = "0.14.0-dev", path = "." }

examples/editor/src/main.rs

@@ -119,10 +119,10 @@ impl Editor {
 
                     let mut text = self.content.text();
 
-                    if let Some(ending) = self.content.line_ending() {
-                        if !text.ends_with(ending.as_str()) {
-                            text.push_str(ending.as_str());
-                        }
+                    if let Some(ending) = self.content.line_ending()
+                        && !text.ends_with(ending.as_str())
+                    {
+                        text.push_str(ending.as_str());
                     }
 
                     Task::perform(

examples/pane_grid/src/main.rs

@@ -71,11 +71,10 @@ impl Example {
                 }
             }
             Message::FocusAdjacent(direction) => {
-                if let Some(pane) = self.focus {
-                    if let Some(adjacent) = self.panes.adjacent(pane, direction)
-                    {
-                        self.focus = Some(adjacent);
-                    }
+                if let Some(pane) = self.focus
+                    && let Some(adjacent) = self.panes.adjacent(pane, direction)
+                {
+                    self.focus = Some(adjacent);
                 }
             }
             Message::Clicked(pane) => {
@@ -106,14 +105,12 @@ impl Example {
                 }
             }
             Message::CloseFocused => {
-                if let Some(pane) = self.focus {
-                    if let Some(Pane { is_pinned, .. }) = self.panes.get(pane) {
-                        if !is_pinned {
-                            if let Some((_, sibling)) = self.panes.close(pane) {
-                                self.focus = Some(sibling);
-                            }
-                        }
-                    }
+                if let Some(pane) = self.focus
+                    && let Some(Pane { is_pinned, .. }) = self.panes.get(pane)
+                    && !is_pinned
+                    && let Some((_, sibling)) = self.panes.close(pane)
+                {
+                    self.focus = Some(sibling);
                 }
             }
         }

examples/todos/snapshots/creates_a_new_task-tiny-skia.sha256

@@ -1 +1 @@
-0e355b080ad33905145e9f70a3b29e2481197c8fc8f42491acd5358238ebbd5f
+99f418007af163f172e163565f166da31015521e1bf7de95fa55cda2fb5a7db5

examples/todos/snapshots/creates_a_new_task-wgpu.sha256

@@ -116,11 +116,11 @@ impl WebSocket {
             let mut button = button(text("Send").height(40).align_y(Center))
                 .padding([0, 20]);
 
-            if matches!(self.state, State::Connected(_)) {
-                if let Some(message) = echo::Message::new(&self.new_message) {
-                    input = input.on_submit(Message::Send(message.clone()));
-                    button = button.on_press(Message::Send(message));
-                }
+            if matches!(self.state, State::Connected(_))
+                && let Some(message) = echo::Message::new(&self.new_message)
+            {
+                input = input.on_submit(Message::Send(message.clone()));
+                button = button.on_press(Message::Send(message));
             }
 
             row![input, button].spacing(10).align_y(Center)

examples/websocket/src/main.rs

@@ -321,10 +321,11 @@ impl editor::Editor for Editor {
                 );
 
                 // Deselect if selection matches cursor position
-                if let Some((start, end)) = editor.selection_bounds() {
-                    if start.line == end.line && start.index == end.index {
-                        editor.set_selection(cosmic_text::Selection::None);
-                    }
+                if let Some((start, end)) = editor.selection_bounds()
+                    && start.line == end.line
+                    && start.index == end.index
+                {
+                    editor.set_selection(cosmic_text::Selection::None);
                 }
             }
             Action::SelectWord => {
@@ -438,10 +439,11 @@ impl editor::Editor for Editor {
                 );
 
                 // Deselect if selection matches cursor position
-                if let Some((start, end)) = editor.selection_bounds() {
-                    if start.line == end.line && start.index == end.index {
-                        editor.set_selection(cosmic_text::Selection::None);
-                    }
+                if let Some((start, end)) = editor.selection_bounds()
+                    && start.line == end.line
+                    && start.index == end.index
+                {
+                    editor.set_selection(cosmic_text::Selection::None);
                 }
             }
             Action::Scroll { lines } => {

graphics/src/text/editor.rs

@@ -99,10 +99,8 @@ impl Cache {
         self.map.retain(|k, memory| {
             let retain = hits.contains(k);
 
-            if !retain {
-                if let Memory::Device(entry) = memory {
-                    atlas.remove(entry);
-                }
+            if !retain && let Memory::Device(entry) = memory {
+                atlas.remove(entry);
             }
 
             retain

wgpu/src/image/raster.rs

@@ -320,11 +320,9 @@ where
             | Event::Touch(touch::Event::FingerPressed { .. }) => {
                 let mouse_over = cursor.is_over(layout.bounds());
 
-                if mouse_over {
-                    if let Some(on_toggle) = &self.on_toggle {
-                        shell.publish((on_toggle)(!self.is_checked));
-                        shell.capture_event();
-                    }
+                if mouse_over && let Some(on_toggle) = &self.on_toggle {
+                    shell.publish((on_toggle)(!self.is_checked));
+                    shell.capture_event();
                 }
             }
             _ => {}