diff options
-rw-r--r-- | Cargo.lock | 9 | ||||
-rw-r--r-- | Cargo.toml | 1 | ||||
-rw-r--r-- | core/Cargo.toml | 1 | ||||
-rw-r--r-- | core/src/theme.rs | 6 | ||||
-rw-r--r-- | core/src/theme/palette.rs | 91 | ||||
-rw-r--r-- | examples/loading_spinners/Cargo.toml | 1 | ||||
-rw-r--r-- | examples/loading_spinners/src/easing.rs | 15 | ||||
-rw-r--r-- | examples/scrollable/Cargo.toml | 2 | ||||
-rw-r--r-- | examples/scrollable/src/main.rs | 7 | ||||
-rw-r--r-- | examples/visible_bounds/Cargo.toml | 2 | ||||
-rw-r--r-- | examples/visible_bounds/src/main.rs | 10 | ||||
-rw-r--r-- | examples/websocket/Cargo.toml | 1 | ||||
-rw-r--r-- | examples/websocket/src/main.rs | 6 | ||||
-rw-r--r-- | graphics/Cargo.toml | 1 | ||||
-rw-r--r-- | graphics/src/text.rs | 5 | ||||
-rw-r--r-- | highlighter/Cargo.toml | 1 | ||||
-rw-r--r-- | highlighter/src/lib.rs | 10 | ||||
-rw-r--r-- | wgpu/Cargo.toml | 1 | ||||
-rw-r--r-- | widget/Cargo.toml | 1 | ||||
-rw-r--r-- | widget/src/helpers.rs | 5 |
20 files changed, 80 insertions, 96 deletions
@@ -2435,7 +2435,6 @@ dependencies = [ "glam", "log", "num-traits", - "once_cell", "palette", "rustc-hash 2.1.0", "smol_str", @@ -2472,7 +2471,6 @@ dependencies = [ "kamadak-exif", "log", "lyon_path", - "once_cell", "raw-window-handle 0.6.2", "rustc-hash 2.1.0", "thiserror 1.0.69", @@ -2484,7 +2482,6 @@ name = "iced_highlighter" version = "0.14.0-dev" dependencies = [ "iced_core", - "once_cell", "syntect", ] @@ -2549,7 +2546,6 @@ dependencies = [ "iced_graphics", "log", "lyon", - "once_cell", "resvg", "rustc-hash 2.1.0", "thiserror 1.0.69", @@ -2564,7 +2560,6 @@ dependencies = [ "iced_renderer", "iced_runtime", "num-traits", - "once_cell", "ouroboros", "pulldown-cmark", "qrcode", @@ -3066,7 +3061,6 @@ version = "0.1.0" dependencies = [ "iced", "lyon_algorithms", - "once_cell", ] [[package]] @@ -4738,7 +4732,6 @@ name = "scrollable" version = "0.1.0" dependencies = [ "iced", - "once_cell", ] [[package]] @@ -5936,7 +5929,6 @@ name = "visible_bounds" version = "0.1.0" dependencies = [ "iced", - "once_cell", ] [[package]] @@ -6290,7 +6282,6 @@ version = "1.0.0" dependencies = [ "async-tungstenite", "iced", - "once_cell", "tokio", "warp", ] @@ -162,7 +162,6 @@ log = "0.4" lyon = "1.0" lyon_path = "1.0" num-traits = "0.2" -once_cell = "1.0" ouroboros = "0.18" palette = "0.7" png = "0.17" diff --git a/core/Cargo.toml b/core/Cargo.toml index a1228909..a3bc6745 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -23,7 +23,6 @@ bytes.workspace = true glam.workspace = true log.workspace = true num-traits.workspace = true -once_cell.workspace = true palette.workspace = true rustc-hash.workspace = true smol_str.workspace = true diff --git a/core/src/theme.rs b/core/src/theme.rs index 23480cec..1f9e4fdf 100644 --- a/core/src/theme.rs +++ b/core/src/theme.rs @@ -166,10 +166,10 @@ impl Default for Theme { fn default() -> Self { #[cfg(feature = "auto-detect-theme")] { - use once_cell::sync::Lazy; + use std::sync::LazyLock; - static DEFAULT: Lazy<Theme> = - Lazy::new(|| match dark_light::detect() { + static DEFAULT: LazyLock<Theme> = + LazyLock::new(|| match dark_light::detect() { dark_light::Mode::Dark => Theme::Dark, dark_light::Mode::Light | dark_light::Mode::Default => { Theme::Light diff --git a/core/src/theme/palette.rs b/core/src/theme/palette.rs index 00c38019..5947bf6b 100644 --- a/core/src/theme/palette.rs +++ b/core/src/theme/palette.rs @@ -1,7 +1,8 @@ //! Define the colors of a theme. +use std::sync::LazyLock; + use crate::{color, Color}; -use once_cell::sync::Lazy; use palette::color_difference::Wcag21RelativeContrast; use palette::rgb::Rgb; use palette::{FromColor, Hsl, Mix}; @@ -341,92 +342,92 @@ pub struct Extended { } /// The built-in light variant of an [`Extended`] palette. -pub static EXTENDED_LIGHT: Lazy<Extended> = - Lazy::new(|| Extended::generate(Palette::LIGHT)); +pub static EXTENDED_LIGHT: LazyLock<Extended> = + LazyLock::new(|| Extended::generate(Palette::LIGHT)); /// The built-in dark variant of an [`Extended`] palette. -pub static EXTENDED_DARK: Lazy<Extended> = - Lazy::new(|| Extended::generate(Palette::DARK)); +pub static EXTENDED_DARK: LazyLock<Extended> = + LazyLock::new(|| Extended::generate(Palette::DARK)); /// The built-in Dracula variant of an [`Extended`] palette. -pub static EXTENDED_DRACULA: Lazy<Extended> = - Lazy::new(|| Extended::generate(Palette::DRACULA)); +pub static EXTENDED_DRACULA: LazyLock<Extended> = + LazyLock::new(|| Extended::generate(Palette::DRACULA)); /// The built-in Nord variant of an [`Extended`] palette. -pub static EXTENDED_NORD: Lazy<Extended> = - Lazy::new(|| Extended::generate(Palette::NORD)); +pub static EXTENDED_NORD: LazyLock<Extended> = + LazyLock::new(|| Extended::generate(Palette::NORD)); /// The built-in Solarized Light variant of an [`Extended`] palette. -pub static EXTENDED_SOLARIZED_LIGHT: Lazy<Extended> = - Lazy::new(|| Extended::generate(Palette::SOLARIZED_LIGHT)); +pub static EXTENDED_SOLARIZED_LIGHT: LazyLock<Extended> = + LazyLock::new(|| Extended::generate(Palette::SOLARIZED_LIGHT)); /// The built-in Solarized Dark variant of an [`Extended`] palette. -pub static EXTENDED_SOLARIZED_DARK: Lazy<Extended> = - Lazy::new(|| Extended::generate(Palette::SOLARIZED_DARK)); +pub static EXTENDED_SOLARIZED_DARK: LazyLock<Extended> = + LazyLock::new(|| Extended::generate(Palette::SOLARIZED_DARK)); /// The built-in Gruvbox Light variant of an [`Extended`] palette. -pub static EXTENDED_GRUVBOX_LIGHT: Lazy<Extended> = - Lazy::new(|| Extended::generate(Palette::GRUVBOX_LIGHT)); +pub static EXTENDED_GRUVBOX_LIGHT: LazyLock<Extended> = + LazyLock::new(|| Extended::generate(Palette::GRUVBOX_LIGHT)); /// The built-in Gruvbox Dark variant of an [`Extended`] palette. -pub static EXTENDED_GRUVBOX_DARK: Lazy<Extended> = - Lazy::new(|| Extended::generate(Palette::GRUVBOX_DARK)); +pub static EXTENDED_GRUVBOX_DARK: LazyLock<Extended> = + LazyLock::new(|| Extended::generate(Palette::GRUVBOX_DARK)); /// The built-in Catppuccin Latte variant of an [`Extended`] palette. -pub static EXTENDED_CATPPUCCIN_LATTE: Lazy<Extended> = - Lazy::new(|| Extended::generate(Palette::CATPPUCCIN_LATTE)); +pub static EXTENDED_CATPPUCCIN_LATTE: LazyLock<Extended> = + LazyLock::new(|| Extended::generate(Palette::CATPPUCCIN_LATTE)); /// The built-in Catppuccin Frappé variant of an [`Extended`] palette. -pub static EXTENDED_CATPPUCCIN_FRAPPE: Lazy<Extended> = - Lazy::new(|| Extended::generate(Palette::CATPPUCCIN_FRAPPE)); +pub static EXTENDED_CATPPUCCIN_FRAPPE: LazyLock<Extended> = + LazyLock::new(|| Extended::generate(Palette::CATPPUCCIN_FRAPPE)); /// The built-in Catppuccin Macchiato variant of an [`Extended`] palette. -pub static EXTENDED_CATPPUCCIN_MACCHIATO: Lazy<Extended> = - Lazy::new(|| Extended::generate(Palette::CATPPUCCIN_MACCHIATO)); +pub static EXTENDED_CATPPUCCIN_MACCHIATO: LazyLock<Extended> = + LazyLock::new(|| Extended::generate(Palette::CATPPUCCIN_MACCHIATO)); /// The built-in Catppuccin Mocha variant of an [`Extended`] palette. -pub static EXTENDED_CATPPUCCIN_MOCHA: Lazy<Extended> = - Lazy::new(|| Extended::generate(Palette::CATPPUCCIN_MOCHA)); +pub static EXTENDED_CATPPUCCIN_MOCHA: LazyLock<Extended> = + LazyLock::new(|| Extended::generate(Palette::CATPPUCCIN_MOCHA)); /// The built-in Tokyo Night variant of an [`Extended`] palette. -pub static EXTENDED_TOKYO_NIGHT: Lazy<Extended> = - Lazy::new(|| Extended::generate(Palette::TOKYO_NIGHT)); +pub static EXTENDED_TOKYO_NIGHT: LazyLock<Extended> = + LazyLock::new(|| Extended::generate(Palette::TOKYO_NIGHT)); /// The built-in Tokyo Night Storm variant of an [`Extended`] palette. -pub static EXTENDED_TOKYO_NIGHT_STORM: Lazy<Extended> = - Lazy::new(|| Extended::generate(Palette::TOKYO_NIGHT_STORM)); +pub static EXTENDED_TOKYO_NIGHT_STORM: LazyLock<Extended> = + LazyLock::new(|| Extended::generate(Palette::TOKYO_NIGHT_STORM)); /// The built-in Tokyo Night variant of an [`Extended`] palette. -pub static EXTENDED_TOKYO_NIGHT_LIGHT: Lazy<Extended> = - Lazy::new(|| Extended::generate(Palette::TOKYO_NIGHT_LIGHT)); +pub static EXTENDED_TOKYO_NIGHT_LIGHT: LazyLock<Extended> = + LazyLock::new(|| Extended::generate(Palette::TOKYO_NIGHT_LIGHT)); /// The built-in Kanagawa Wave variant of an [`Extended`] palette. -pub static EXTENDED_KANAGAWA_WAVE: Lazy<Extended> = - Lazy::new(|| Extended::generate(Palette::KANAGAWA_WAVE)); +pub static EXTENDED_KANAGAWA_WAVE: LazyLock<Extended> = + LazyLock::new(|| Extended::generate(Palette::KANAGAWA_WAVE)); /// The built-in Kanagawa Dragon variant of an [`Extended`] palette. -pub static EXTENDED_KANAGAWA_DRAGON: Lazy<Extended> = - Lazy::new(|| Extended::generate(Palette::KANAGAWA_DRAGON)); +pub static EXTENDED_KANAGAWA_DRAGON: LazyLock<Extended> = + LazyLock::new(|| Extended::generate(Palette::KANAGAWA_DRAGON)); /// The built-in Kanagawa Lotus variant of an [`Extended`] palette. -pub static EXTENDED_KANAGAWA_LOTUS: Lazy<Extended> = - Lazy::new(|| Extended::generate(Palette::KANAGAWA_LOTUS)); +pub static EXTENDED_KANAGAWA_LOTUS: LazyLock<Extended> = + LazyLock::new(|| Extended::generate(Palette::KANAGAWA_LOTUS)); /// The built-in Moonfly variant of an [`Extended`] palette. -pub static EXTENDED_MOONFLY: Lazy<Extended> = - Lazy::new(|| Extended::generate(Palette::MOONFLY)); +pub static EXTENDED_MOONFLY: LazyLock<Extended> = + LazyLock::new(|| Extended::generate(Palette::MOONFLY)); /// The built-in Nightfly variant of an [`Extended`] palette. -pub static EXTENDED_NIGHTFLY: Lazy<Extended> = - Lazy::new(|| Extended::generate(Palette::NIGHTFLY)); +pub static EXTENDED_NIGHTFLY: LazyLock<Extended> = + LazyLock::new(|| Extended::generate(Palette::NIGHTFLY)); /// The built-in Oxocarbon variant of an [`Extended`] palette. -pub static EXTENDED_OXOCARBON: Lazy<Extended> = - Lazy::new(|| Extended::generate(Palette::OXOCARBON)); +pub static EXTENDED_OXOCARBON: LazyLock<Extended> = + LazyLock::new(|| Extended::generate(Palette::OXOCARBON)); /// The built-in Ferra variant of an [`Extended`] palette. -pub static EXTENDED_FERRA: Lazy<Extended> = - Lazy::new(|| Extended::generate(Palette::FERRA)); +pub static EXTENDED_FERRA: LazyLock<Extended> = + LazyLock::new(|| Extended::generate(Palette::FERRA)); impl Extended { /// Generates an [`Extended`] palette from a simple [`Palette`]. diff --git a/examples/loading_spinners/Cargo.toml b/examples/loading_spinners/Cargo.toml index a32da386..abd28aec 100644 --- a/examples/loading_spinners/Cargo.toml +++ b/examples/loading_spinners/Cargo.toml @@ -10,4 +10,3 @@ iced.workspace = true iced.features = ["advanced", "canvas"] lyon_algorithms = "1.0" -once_cell.workspace = true
\ No newline at end of file diff --git a/examples/loading_spinners/src/easing.rs b/examples/loading_spinners/src/easing.rs index 45089ef6..be644d31 100644 --- a/examples/loading_spinners/src/easing.rs +++ b/examples/loading_spinners/src/easing.rs @@ -1,41 +1,42 @@ +use std::sync::LazyLock; + use iced::Point; use lyon_algorithms::measure::PathMeasurements; use lyon_algorithms::path::{builder::NoAttributes, path::BuilderImpl, Path}; -use once_cell::sync::Lazy; -pub static EMPHASIZED: Lazy<Easing> = Lazy::new(|| { +pub static EMPHASIZED: LazyLock<Easing> = LazyLock::new(|| { Easing::builder() .cubic_bezier_to([0.05, 0.0], [0.133333, 0.06], [0.166666, 0.4]) .cubic_bezier_to([0.208333, 0.82], [0.25, 1.0], [1.0, 1.0]) .build() }); -pub static EMPHASIZED_DECELERATE: Lazy<Easing> = Lazy::new(|| { +pub static EMPHASIZED_DECELERATE: LazyLock<Easing> = LazyLock::new(|| { Easing::builder() .cubic_bezier_to([0.05, 0.7], [0.1, 1.0], [1.0, 1.0]) .build() }); -pub static EMPHASIZED_ACCELERATE: Lazy<Easing> = Lazy::new(|| { +pub static EMPHASIZED_ACCELERATE: LazyLock<Easing> = LazyLock::new(|| { Easing::builder() .cubic_bezier_to([0.3, 0.0], [0.8, 0.15], [1.0, 1.0]) .build() }); -pub static STANDARD: Lazy<Easing> = Lazy::new(|| { +pub static STANDARD: LazyLock<Easing> = LazyLock::new(|| { Easing::builder() .cubic_bezier_to([0.2, 0.0], [0.0, 1.0], [1.0, 1.0]) .build() }); -pub static STANDARD_DECELERATE: Lazy<Easing> = Lazy::new(|| { +pub static STANDARD_DECELERATE: LazyLock<Easing> = LazyLock::new(|| { Easing::builder() .cubic_bezier_to([0.0, 0.0], [0.0, 1.0], [1.0, 1.0]) .build() }); -pub static STANDARD_ACCELERATE: Lazy<Easing> = Lazy::new(|| { +pub static STANDARD_ACCELERATE: LazyLock<Easing> = LazyLock::new(|| { Easing::builder() .cubic_bezier_to([0.3, 0.0], [1.0, 1.0], [1.0, 1.0]) .build() diff --git a/examples/scrollable/Cargo.toml b/examples/scrollable/Cargo.toml index f8c735c0..ba291520 100644 --- a/examples/scrollable/Cargo.toml +++ b/examples/scrollable/Cargo.toml @@ -8,5 +8,3 @@ publish = false [dependencies] iced.workspace = true iced.features = ["debug"] - -once_cell.workspace = true diff --git a/examples/scrollable/src/main.rs b/examples/scrollable/src/main.rs index de4f2f9a..bd12e43b 100644 --- a/examples/scrollable/src/main.rs +++ b/examples/scrollable/src/main.rs @@ -1,12 +1,13 @@ +use std::sync::LazyLock; + use iced::widget::{ button, column, container, horizontal_space, progress_bar, radio, row, scrollable, slider, text, vertical_space, }; use iced::{Border, Center, Color, Element, Fill, Task, Theme}; -use once_cell::sync::Lazy; - -static SCROLLABLE_ID: Lazy<scrollable::Id> = Lazy::new(scrollable::Id::unique); +static SCROLLABLE_ID: LazyLock<scrollable::Id> = + LazyLock::new(scrollable::Id::unique); pub fn main() -> iced::Result { iced::application( diff --git a/examples/visible_bounds/Cargo.toml b/examples/visible_bounds/Cargo.toml index 37594b84..1193334d 100644 --- a/examples/visible_bounds/Cargo.toml +++ b/examples/visible_bounds/Cargo.toml @@ -8,5 +8,3 @@ publish = false [dependencies] iced.workspace = true iced.features = ["debug"] - -once_cell.workspace = true diff --git a/examples/visible_bounds/src/main.rs b/examples/visible_bounds/src/main.rs index 77fec65e..f8f9f420 100644 --- a/examples/visible_bounds/src/main.rs +++ b/examples/visible_bounds/src/main.rs @@ -157,9 +157,9 @@ impl Example { } } -use once_cell::sync::Lazy; +use std::sync::LazyLock; -static OUTER_CONTAINER: Lazy<container::Id> = - Lazy::new(|| container::Id::new("outer")); -static INNER_CONTAINER: Lazy<container::Id> = - Lazy::new(|| container::Id::new("inner")); +static OUTER_CONTAINER: LazyLock<container::Id> = + LazyLock::new(|| container::Id::new("outer")); +static INNER_CONTAINER: LazyLock<container::Id> = + LazyLock::new(|| container::Id::new("inner")); diff --git a/examples/websocket/Cargo.toml b/examples/websocket/Cargo.toml index c7075fb3..787dbbe1 100644 --- a/examples/websocket/Cargo.toml +++ b/examples/websocket/Cargo.toml @@ -9,7 +9,6 @@ publish = false iced.workspace = true iced.features = ["debug", "tokio"] -once_cell.workspace = true warp = "0.3" [dependencies.async-tungstenite] diff --git a/examples/websocket/src/main.rs b/examples/websocket/src/main.rs index 8b1efb41..399ce2ff 100644 --- a/examples/websocket/src/main.rs +++ b/examples/websocket/src/main.rs @@ -1,10 +1,11 @@ mod echo; +use std::sync::LazyLock; + use iced::widget::{ self, button, center, column, row, scrollable, text, text_input, }; use iced::{color, Center, Element, Fill, Subscription, Task}; -use once_cell::sync::Lazy; pub fn main() -> iced::Result { iced::application("WebSocket - Iced", WebSocket::update, WebSocket::view) @@ -138,4 +139,5 @@ enum State { Connected(echo::Connection), } -static MESSAGE_LOG: Lazy<scrollable::Id> = Lazy::new(scrollable::Id::unique); +static MESSAGE_LOG: LazyLock<scrollable::Id> = + LazyLock::new(scrollable::Id::unique); diff --git a/graphics/Cargo.toml b/graphics/Cargo.toml index 7e2d767b..43191a59 100644 --- a/graphics/Cargo.toml +++ b/graphics/Cargo.toml @@ -33,7 +33,6 @@ bytemuck.workspace = true cosmic-text.workspace = true half.workspace = true log.workspace = true -once_cell.workspace = true raw-window-handle.workspace = true rustc-hash.workspace = true thiserror.workspace = true diff --git a/graphics/src/text.rs b/graphics/src/text.rs index ca3fc6fc..7694ff1f 100644 --- a/graphics/src/text.rs +++ b/graphics/src/text.rs @@ -14,10 +14,9 @@ use crate::core::font::{self, Font}; use crate::core::text::{Shaping, Wrapping}; use crate::core::{Color, Pixels, Point, Rectangle, Size, Transformation}; -use once_cell::sync::OnceCell; use std::borrow::Cow; use std::collections::HashSet; -use std::sync::{Arc, RwLock, Weak}; +use std::sync::{Arc, OnceLock, RwLock, Weak}; /// A text primitive. #[derive(Debug, Clone, PartialEq)] @@ -157,7 +156,7 @@ pub const FIRA_SANS_REGULAR: &[u8] = /// Returns the global [`FontSystem`]. pub fn font_system() -> &'static RwLock<FontSystem> { - static FONT_SYSTEM: OnceCell<RwLock<FontSystem>> = OnceCell::new(); + static FONT_SYSTEM: OnceLock<RwLock<FontSystem>> = OnceLock::new(); FONT_SYSTEM.get_or_init(|| { RwLock::new(FontSystem { diff --git a/highlighter/Cargo.toml b/highlighter/Cargo.toml index 7962b89d..4c20a678 100644 --- a/highlighter/Cargo.toml +++ b/highlighter/Cargo.toml @@ -16,5 +16,4 @@ workspace = true [dependencies] iced_core.workspace = true -once_cell.workspace = true syntect.workspace = true diff --git a/highlighter/src/lib.rs b/highlighter/src/lib.rs index 83a15cb1..d2abc6b1 100644 --- a/highlighter/src/lib.rs +++ b/highlighter/src/lib.rs @@ -5,16 +5,16 @@ use crate::core::font::{self, Font}; use crate::core::text::highlighter::{self, Format}; use crate::core::Color; -use once_cell::sync::Lazy; use std::ops::Range; +use std::sync::LazyLock; use syntect::highlighting; use syntect::parsing; -static SYNTAXES: Lazy<parsing::SyntaxSet> = - Lazy::new(parsing::SyntaxSet::load_defaults_nonewlines); +static SYNTAXES: LazyLock<parsing::SyntaxSet> = + LazyLock::new(parsing::SyntaxSet::load_defaults_nonewlines); -static THEMES: Lazy<highlighting::ThemeSet> = - Lazy::new(highlighting::ThemeSet::load_defaults); +static THEMES: LazyLock<highlighting::ThemeSet> = + LazyLock::new(highlighting::ThemeSet::load_defaults); const LINES_PER_SNAPSHOT: usize = 50; diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml index a8ebf3aa..4b6b0483 100644 --- a/wgpu/Cargo.toml +++ b/wgpu/Cargo.toml @@ -35,7 +35,6 @@ glam.workspace = true glyphon.workspace = true guillotiere.workspace = true log.workspace = true -once_cell.workspace = true rustc-hash.workspace = true thiserror.workspace = true wgpu.workspace = true diff --git a/widget/Cargo.toml b/widget/Cargo.toml index 98a81145..e19cad08 100644 --- a/widget/Cargo.toml +++ b/widget/Cargo.toml @@ -33,7 +33,6 @@ iced_renderer.workspace = true iced_runtime.workspace = true num-traits.workspace = true -once_cell.workspace = true rustc-hash.workspace = true thiserror.workspace = true unicode-segmentation.workspace = true diff --git a/widget/src/helpers.rs b/widget/src/helpers.rs index cdfd2daf..563d84e2 100644 --- a/widget/src/helpers.rs +++ b/widget/src/helpers.rs @@ -1706,11 +1706,12 @@ where + 'a, Theme: text::Catalog + crate::svg::Catalog + 'a, { + use std::sync::LazyLock; + use crate::core::{Alignment, Font}; use crate::svg; - use once_cell::sync::Lazy; - static LOGO: Lazy<svg::Handle> = Lazy::new(|| { + static LOGO: LazyLock<svg::Handle> = LazyLock::new(|| { svg::Handle::from_memory(include_bytes!("../assets/iced-logo.svg")) }); |