Merge pull request #2809 from iced-rs/rust-2024

Update to Rust 2024

2 files changed, 10 insertions, 10 deletions

diff --git a/src/advanced.rs b/src/advanced.rs
index 843b381a..ac88776e 100644
--- a/src/advanced.rs
+++ b/src/advanced.rs
@@ -2,8 +2,8 @@
 pub mod subscription {
     //! Write your own subscriptions.
     pub use crate::runtime::futures::subscription::{
-        from_recipe, into_recipes, Event, EventStream, Hasher, MacOS,
-        PlatformSpecific, Recipe,
+        Event, EventStream, Hasher, MacOS, PlatformSpecific, Recipe,
+        from_recipe, into_recipes,
     };
 }
 
@@ -13,6 +13,7 @@ pub mod widget {
     pub use crate::runtime::task::widget as operate;
 }
 
+pub use crate::core::Shell;
 pub use crate::core::clipboard::{self, Clipboard};
 pub use crate::core::image;
 pub use crate::core::layout::{self, Layout};
@@ -21,6 +22,5 @@ pub use crate::core::overlay::{self, Overlay};
 pub use crate::core::renderer::{self, Renderer};
 pub use crate::core::svg;
 pub use crate::core::text::{self, Text};
-pub use crate::core::Shell;
 pub use crate::renderer::graphics;
 pub use widget::Widget;
diff --git a/src/lib.rs b/src/lib.rs
index 441826d6..95820ed7 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -505,22 +505,22 @@ pub use crate::core::gradient;
 pub use crate::core::padding;
 pub use crate::core::theme;
 pub use crate::core::{
-    never, Alignment, Animation, Background, Border, Color, ContentFit,
-    Degrees, Function, Gradient, Length, Padding, Pixels, Point, Radians,
-    Rectangle, Rotation, Settings, Shadow, Size, Theme, Transformation, Vector,
+    Alignment, Animation, Background, Border, Color, ContentFit, Degrees,
+    Function, Gradient, Length, Padding, Pixels, Point, Radians, Rectangle,
+    Rotation, Settings, Shadow, Size, Theme, Transformation, Vector, never,
 };
 pub use crate::runtime::exit;
 pub use iced_futures::Subscription;
 
-pub use alignment::Horizontal::{Left, Right};
-pub use alignment::Vertical::{Bottom, Top};
 pub use Alignment::Center;
 pub use Length::{Fill, FillPortion, Shrink};
+pub use alignment::Horizontal::{Left, Right};
+pub use alignment::Vertical::{Bottom, Top};
 
 pub mod task {
     //! Create runtime tasks.
     pub use crate::runtime::task::{
-        sipper, stream, Handle, Never, Sipper, Straw, Task,
+        Handle, Never, Sipper, Straw, Task, sipper, stream,
     };
 }
 
@@ -683,7 +683,7 @@ pub fn run<State, Message, Theme, Renderer>(
     title: impl application::Title<State> + 'static,
     update: impl application::Update<State, Message> + 'static,
     view: impl for<'a> application::View<'a, State, Message, Theme, Renderer>
-        + 'static,
+    + 'static,
 ) -> Result
 where
     State: Default + 'static,