From b0f860533e9fac4fee309a930b5fd5af37cc8ea3 Mon Sep 17 00:00:00 2001
From: Ricardo Fernández Serrata <76864299+Rudxain@users.noreply.github.com>
Date: Thu, 9 Jan 2025 19:30:09 -0400
Subject: migrate core::theme to `dark-light` v2

---
 core/src/theme.rs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'core/src')

diff --git a/core/src/theme.rs b/core/src/theme.rs
index 1f9e4fdf..fe556a41 100644
--- a/core/src/theme.rs
+++ b/core/src/theme.rs
@@ -168,13 +168,12 @@ impl Default for Theme {
         {
             use std::sync::LazyLock;
 
-            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
-                    }
-                });
+            static DEFAULT: LazyLock<Theme> = LazyLock::new(|| match dark_light::detect() {
+                Ok(dark_light::Mode::Dark) => Theme::Dark,
+                Ok(dark_light::Mode::Light) | Ok(dark_light::Mode::Unspecified) | Err(_) => {
+                    Theme::Light
+                }
+            });
 
             DEFAULT.clone()
         }
-- 
cgit 


From 6fb7ec6cd4abfddd9e697bc2e96c9a360a053910 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 14 Jan 2025 11:36:02 +0000
Subject: Use `unwrap_or` in `Theme::default`

---
 core/src/theme.rs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'core/src')

diff --git a/core/src/theme.rs b/core/src/theme.rs
index fe556a41..cc5b77df 100644
--- a/core/src/theme.rs
+++ b/core/src/theme.rs
@@ -168,10 +168,14 @@ impl Default for Theme {
         {
             use std::sync::LazyLock;
 
-            static DEFAULT: LazyLock<Theme> = LazyLock::new(|| match dark_light::detect() {
-                Ok(dark_light::Mode::Dark) => Theme::Dark,
-                Ok(dark_light::Mode::Light) | Ok(dark_light::Mode::Unspecified) | Err(_) => {
-                    Theme::Light
+            static DEFAULT: LazyLock<Theme> = LazyLock::new(|| {
+                match dark_light::detect()
+                    .unwrap_or(dark_light::Mode::Unspecified)
+                {
+                    dark_light::Mode::Dark => Theme::Dark,
+                    dark_light::Mode::Light | dark_light::Mode::Unspecified => {
+                        Theme::Light
+                    }
                 }
             });
 
-- 
cgit