From 62c210fc1d51f076a1783c4b33a6b7ea834846ee Mon Sep 17 00:00:00 2001 From: galister <22305755+galister@users.noreply.github.com> Date: Sun, 12 Jul 2026 16:58:29 +0900 Subject: [PATCH] no num_enum --- Cargo.lock | 1 - wgui/Cargo.toml | 1 - wgui/src/color.rs | 7 +++---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2a49fc50..abcabdf0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6603,7 +6603,6 @@ dependencies = [ "image", "log", "lru", - "num_enum", "ouroboros", "parking_lot", "regex", diff --git a/wgui/Cargo.toml b/wgui/Cargo.toml index 73c0e102..ef6d0d5e 100644 --- a/wgui/Cargo.toml +++ b/wgui/Cargo.toml @@ -36,7 +36,6 @@ image = { ] } lru = "0.18.0" -num_enum = "0.7.6" # for converting integers into Option enums (search for TryFromPrimitive in the codebase) ouroboros = "0.18.5" parking_lot = "0.12.5" resvg = { version = "0.47.0", default-features = false } diff --git a/wgui/src/color.rs b/wgui/src/color.rs index d552eac5..0e6b0cde 100644 --- a/wgui/src/color.rs +++ b/wgui/src/color.rs @@ -1,10 +1,9 @@ use crate::drawing; -use num_enum::TryFromPrimitive; -use strum::EnumCount; +use strum::{EnumCount, VariantArray}; // Primary: button color // OnPrimary: text color placed on the Primary-colored button -#[derive(Debug, Copy, Clone, TryFromPrimitive, EnumCount)] +#[derive(Debug, Copy, Clone, EnumCount, VariantArray)] #[repr(u8)] pub enum WguiColorName { Primary, @@ -78,7 +77,7 @@ impl WguiColorPalette { fn resolve_name(&self, in_name: &str) -> Option { for (idx, (_, name)) in self.colors.iter().enumerate() { if in_name == *name { - return WguiColorName::try_from(idx as u8).ok(); + return WguiColorName::VARIANTS.get(idx).copied(); } } None