Update all examples to Rust 2024

Author: hecrj

examples/arc/Cargo.toml

@@ -2,7 +2,7 @@
 name = "arc"
 version = "0.1.0"
 authors = ["ThatsNoMoon <[email protected]>"]
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]

examples/arc/src/main.rs

@@ -2,7 +2,7 @@ use std::{f32::consts::PI, time::Instant};
 
 use iced::mouse;
 use iced::widget::canvas::{
-    self, stroke, Cache, Canvas, Geometry, Path, Stroke,
+    self, Cache, Canvas, Geometry, Path, Stroke, stroke,
 };
 use iced::window;
 use iced::{Element, Fill, Point, Rectangle, Renderer, Subscription, Theme};

examples/bezier_tool/Cargo.toml

@@ -2,7 +2,7 @@
 name = "bezier_tool"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <[email protected]>"]
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]

examples/changelog/Cargo.toml

@@ -2,7 +2,7 @@
 name = "changelog"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <[email protected]>"]
-edition = "2021"
+edition = "2024"
 publish = false
 
 [lints.clippy]

examples/checkbox/Cargo.toml

@@ -2,7 +2,7 @@
 name = "checkbox"
 version = "0.1.0"
 authors = ["Casper Rogild Storm<[email protected]>"]
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]

examples/clock/Cargo.toml

@@ -2,7 +2,7 @@
 name = "clock"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <[email protected]>"]
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]

examples/clock/src/main.rs

@@ -1,12 +1,12 @@
 use iced::mouse;
 use iced::time::{self, milliseconds};
-use iced::widget::canvas::{stroke, Cache, Geometry, LineCap, Path, Stroke};
+use iced::widget::canvas::{Cache, Geometry, LineCap, Path, Stroke, stroke};
 use iced::widget::{canvas, container};
-use iced::{alignment, Radians};
 use iced::{
     Degrees, Element, Fill, Font, Point, Rectangle, Renderer, Size,
     Subscription, Theme, Vector,
 };
+use iced::{Radians, alignment};
 
 pub fn main() -> iced::Result {
     tracing_subscriber::fmt::init();

examples/color_palette/Cargo.toml

@@ -2,7 +2,7 @@
 name = "color_palette"
 version = "0.1.0"
 authors = ["Clark Moody <[email protected]>"]
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]

examples/color_palette/src/main.rs

@@ -1,12 +1,12 @@
 use iced::alignment;
 use iced::mouse;
 use iced::widget::canvas::{self, Canvas, Frame, Geometry, Path};
-use iced::widget::{column, row, text, Slider};
+use iced::widget::{Slider, column, row, text};
 use iced::{
     Center, Color, Element, Fill, Font, Pixels, Point, Rectangle, Renderer,
     Size, Vector,
 };
-use palette::{convert::FromColor, rgb::Rgb, Darken, Hsl, Lighten, ShiftHue};
+use palette::{Darken, Hsl, Lighten, ShiftHue, convert::FromColor, rgb::Rgb};
 use std::marker::PhantomData;
 use std::ops::RangeInclusive;
 

examples/combo_box/Cargo.toml

@@ -2,7 +2,7 @@
 name = "combo_box"
 version = "0.1.0"
 authors = ["Joao Freitas <[email protected]>"]
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]

examples/counter/Cargo.toml

@@ -2,7 +2,7 @@
 name = "counter"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <[email protected]>"]
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]

examples/counter/src/main.rs

@@ -1,5 +1,5 @@
-use iced::widget::{button, column, text, Column};
 use iced::Center;
+use iced::widget::{Column, button, column, text};
 
 pub fn main() -> iced::Result {
     iced::run("A cool counter", Counter::update, Counter::view)
@@ -43,7 +43,7 @@ impl Counter {
 mod tests {
     use super::*;
     use iced_test::selector::text;
-    use iced_test::{simulator, Error};
+    use iced_test::{Error, simulator};
 
     #[test]
     fn it_counts() -> Result<(), Error> {

examples/custom_quad/Cargo.toml

@@ -2,7 +2,7 @@
 name = "custom_quad"
 version = "0.1.0"
 authors = ["Robert Krahn"]
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]

examples/custom_shader/Cargo.toml

@@ -2,7 +2,7 @@
 name = "custom_shader"
 version = "0.1.0"
 authors = ["Bingus <[email protected]>"]
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 iced.workspace = true

examples/custom_shader/src/scene/pipeline/cube.rs

@@ -1,8 +1,8 @@
 use crate::scene::pipeline::Vertex;
 use crate::wgpu;
 
-use glam::{vec2, vec3, Vec3};
-use rand::{thread_rng, Rng};
+use glam::{Vec3, vec2, vec3};
+use rand::{Rng, thread_rng};
 
 /// A single instance of a cube.
 #[derive(Debug, Clone)]

examples/custom_widget/Cargo.toml

@@ -2,7 +2,7 @@
 name = "custom_widget"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <[email protected]>"]
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]

examples/download_progress/Cargo.toml

@@ -2,7 +2,7 @@
 name = "download_progress"
 version = "0.1.0"
 authors = ["Songtronix <[email protected]>", "Folyd <[email protected]>"]
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]

examples/download_progress/src/download.rs

@@ -1,5 +1,5 @@
 use iced::futures::StreamExt;
-use iced::task::{sipper, Straw};
+use iced::task::{Straw, sipper};
 
 use std::sync::Arc;
 

examples/download_progress/src/main.rs

@@ -3,7 +3,7 @@ mod download;
 use download::download;
 
 use iced::task;
-use iced::widget::{button, center, column, progress_bar, text, Column};
+use iced::widget::{Column, button, center, column, progress_bar, text};
 use iced::{Center, Element, Function, Right, Task};
 
 pub fn main() -> iced::Result {

examples/editor/Cargo.toml

@@ -2,7 +2,7 @@
 name = "editor"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <[email protected]>"]
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]

examples/events/Cargo.toml

@@ -2,7 +2,7 @@
 name = "events"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <[email protected]>"]
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]

examples/events/src/main.rs

@@ -1,5 +1,5 @@
 use iced::event::{self, Event};
-use iced::widget::{button, center, checkbox, text, Column};
+use iced::widget::{Column, button, center, checkbox, text};
 use iced::window;
 use iced::{Center, Element, Fill, Subscription, Task};
 

examples/exit/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "exit"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]

examples/ferris/Cargo.toml

@@ -2,7 +2,7 @@
 name = "ferris"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <[email protected]>"]
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]

examples/gallery/Cargo.toml

@@ -2,7 +2,7 @@
 name = "gallery"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <[email protected]>"]
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]

examples/gallery/src/civitai.rs

@@ -1,6 +1,6 @@
 use bytes::Bytes;
 use serde::Deserialize;
-use sipper::{sipper, Straw};
+use sipper::{Straw, sipper};
 use tokio::task;
 
 use std::fmt;

examples/gallery/src/main.rs

@@ -7,15 +7,15 @@ mod civitai;
 use crate::civitai::{Error, Id, Image, Rgba, Size};
 
 use iced::animation;
-use iced::time::{milliseconds, Instant};
+use iced::time::{Instant, milliseconds};
 use iced::widget::{
     button, center_x, container, horizontal_space, image, mouse_area, opaque,
     pop, row, scrollable, stack,
 };
 use iced::window;
 use iced::{
-    color, Animation, ContentFit, Element, Fill, Function, Subscription, Task,
-    Theme,
+    Animation, ContentFit, Element, Fill, Function, Subscription, Task, Theme,
+    color,
 };
 
 use std::collections::HashMap;

examples/game_of_life/Cargo.toml

@@ -2,7 +2,7 @@
 name = "game_of_life"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <[email protected]>"]
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]

examples/game_of_life/src/main.rs

@@ -261,7 +261,7 @@ mod grid {
         pub fn tick(
             &mut self,
             amount: usize,
-        ) -> Option<impl Future<Output = Message>> {
+        ) -> Option<impl Future<Output = Message> + use<>> {
             let tick = self.state.tick(amount)?;
 
             self.last_queued_ticks = amount;
@@ -722,7 +722,8 @@ mod grid {
         fn tick(
             &mut self,
             amount: usize,
-        ) -> Option<impl Future<Output = Result<Life, TickError>>> {
+        ) -> Option<impl Future<Output = Result<Life, TickError>> + use<>>
+        {
             if self.is_ticking {
                 return None;
             }

examples/geometry/Cargo.toml

@@ -2,7 +2,7 @@
 name = "geometry"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <[email protected]>"]
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]

examples/geometry/src/main.rs

@@ -47,10 +47,10 @@ mod rainbow {
             cursor: mouse::Cursor,
             _viewport: &Rectangle,
         ) {
+            use iced::advanced::Renderer as _;
             use iced::advanced::graphics::mesh::{
                 self, Mesh, Renderer as _, SolidVertex2D,
             };
-            use iced::advanced::Renderer as _;
 
             let bounds = layout.bounds();
 
@@ -152,8 +152,8 @@ mod rainbow {
     }
 }
 
-use iced::widget::{center_x, center_y, column, scrollable};
 use iced::Element;
+use iced::widget::{center_x, center_y, column, scrollable};
 use rainbow::rainbow;
 
 pub fn main() -> iced::Result {

examples/gradient/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "gradient"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]

examples/gradient/src/main.rs

@@ -3,7 +3,7 @@ use iced::theme;
 use iced::widget::{
     checkbox, column, container, horizontal_space, row, slider, text,
 };
-use iced::{color, Center, Color, Element, Fill, Radians, Theme};
+use iced::{Center, Color, Element, Fill, Radians, Theme, color};
 
 pub fn main() -> iced::Result {
     tracing_subscriber::fmt::init();

examples/integration/Cargo.toml

@@ -2,7 +2,7 @@
 name = "integration"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <[email protected]>"]
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]

examples/integration/src/main.rs

@@ -5,16 +5,16 @@ use controls::Controls;
 use scene::Scene;
 
 use iced_wgpu::graphics::Viewport;
-use iced_wgpu::{wgpu, Engine, Renderer};
+use iced_wgpu::{Engine, Renderer, wgpu};
+use iced_winit::Clipboard;
 use iced_winit::conversion;
 use iced_winit::core::mouse;
 use iced_winit::core::renderer;
 use iced_winit::core::{Color, Font, Pixels, Size, Theme};
 use iced_winit::futures;
-use iced_winit::runtime::program;
 use iced_winit::runtime::Debug;
+use iced_winit::runtime::program;
 use iced_winit::winit;
-use iced_winit::Clipboard;
 
 use winit::{
     event::WindowEvent,

examples/layout/Cargo.toml

@@ -2,7 +2,7 @@
 name = "layout"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <[email protected]>"]
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]

examples/layout/src/main.rs

@@ -7,8 +7,8 @@ use iced::widget::{
     text, vertical_rule,
 };
 use iced::{
-    color, Center, Element, Fill, Font, Length, Point, Rectangle, Renderer,
-    Shrink, Subscription, Theme,
+    Center, Element, Fill, Font, Length, Point, Rectangle, Renderer, Shrink,
+    Subscription, Theme, color,
 };
 
 pub fn main() -> iced::Result {