diff options
author | 2025-02-21 19:21:10 +0100 | |
---|---|---|
committer | 2025-02-21 19:21:10 +0100 | |
commit | f1ed99cb47997e1d194a41e7cdf2846f8eb5f8fa (patch) | |
tree | b2eeb7537ffd49bfbdd24c1a9580870eca99caa6 /runtime | |
parent | 81ca3d2a223d62fbb48b93dcea5409f6212605fa (diff) | |
parent | 800a73ddd7d4a2e0b1ed23ec565cbc6325b3b7f0 (diff) | |
download | iced-f1ed99cb47997e1d194a41e7cdf2846f8eb5f8fa.tar.gz iced-f1ed99cb47997e1d194a41e7cdf2846f8eb5f8fa.tar.bz2 iced-f1ed99cb47997e1d194a41e7cdf2846f8eb5f8fa.zip |
Merge pull request #2809 from iced-rs/rust-2024
Update to Rust 2024
Diffstat (limited to '')
-rw-r--r-- | runtime/src/font.rs | 2 | ||||
-rw-r--r-- | runtime/src/multi_window/program.rs | 2 | ||||
-rw-r--r-- | runtime/src/program.rs | 2 | ||||
-rw-r--r-- | runtime/src/task.rs | 7 | ||||
-rw-r--r-- | runtime/src/window.rs | 2 |
5 files changed, 7 insertions, 8 deletions
diff --git a/runtime/src/font.rs b/runtime/src/font.rs index 75fdfc11..2d73566d 100644 --- a/runtime/src/font.rs +++ b/runtime/src/font.rs @@ -1,6 +1,6 @@ //! Load and use fonts. -use crate::task::{self, Task}; use crate::Action; +use crate::task::{self, Task}; use std::borrow::Cow; /// An error while loading a font. diff --git a/runtime/src/multi_window/program.rs b/runtime/src/multi_window/program.rs index e8c71b26..4ea44791 100644 --- a/runtime/src/multi_window/program.rs +++ b/runtime/src/multi_window/program.rs @@ -1,8 +1,8 @@ //! Build interactive programs using The Elm Architecture. +use crate::Task; use crate::core::text; use crate::core::window; use crate::core::{Element, Renderer}; -use crate::Task; /// The core of a user interface for a multi-window application following The Elm Architecture. pub trait Program: Sized { diff --git a/runtime/src/program.rs b/runtime/src/program.rs index 77acf497..964157db 100644 --- a/runtime/src/program.rs +++ b/runtime/src/program.rs @@ -1,8 +1,8 @@ //! Build interactive programs using The Elm Architecture. use crate::Task; -use iced_core::text; use iced_core::Element; +use iced_core::text; mod state; diff --git a/runtime/src/task.rs b/runtime/src/task.rs index 022483f7..710be5d9 100644 --- a/runtime/src/task.rs +++ b/runtime/src/task.rs @@ -1,17 +1,16 @@ //! Create runtime tasks. +use crate::Action; use crate::core::widget; use crate::futures::futures::channel::mpsc; use crate::futures::futures::channel::oneshot; use crate::futures::futures::future::{self, FutureExt}; use crate::futures::futures::stream::{self, Stream, StreamExt}; -use crate::futures::{boxed_stream, BoxStream, MaybeSend}; -use crate::Action; +use crate::futures::{BoxStream, MaybeSend, boxed_stream}; -use std::future::Future; use std::sync::Arc; #[doc(no_inline)] -pub use sipper::{sipper, stream, Never, Sender, Sipper, Straw}; +pub use sipper::{Never, Sender, Sipper, Straw, sipper, stream}; /// A set of concurrent actions to be performed by the iced runtime. /// diff --git a/runtime/src/window.rs b/runtime/src/window.rs index 183fab97..ccd8721b 100644 --- a/runtime/src/window.rs +++ b/runtime/src/window.rs @@ -5,9 +5,9 @@ use crate::core::window::{ UserAttention, }; use crate::core::{Point, Size}; +use crate::futures::Subscription; use crate::futures::event; use crate::futures::futures::channel::oneshot; -use crate::futures::Subscription; use crate::task::{self, Task}; pub use raw_window_handle; |