Fixing compilation on Windows

Condvar isn't UnwindSafe on Windows either. See
rust-lang/rust#118009

Author: ecton

Cargo.lock

@@ -38,8 +38,8 @@ unicode-segmentation = "1.10.1"
 
 # [patch."https://github.com/khonsulabs/kludgine"]
 # kludgine = { path = "../kludgine" }
-# [patch."https://github.com/khonsulabs/appit"]
-# appit = { path = "../appit" }
+# [patch.crates-io]
+# appit = { version = "0.1.0", path = "../appit" }
 # [patch."https://github.com/khonsulabs/figures"]
 # figures = { path = "../figures" }
 

Cargo.toml

@@ -6,13 +6,13 @@ use intentional::Assert;
 use kludgine::app::winit::event::Modifiers;
 use kludgine::app::winit::keyboard::ModifiersState;
 
-/// This [`Condvar`] is a wrapper that on Mac OS/iOS asserts unwind safety. On
+/// This [`Condvar`] is a wrapper that on Mac OS/iOS/Windows asserts unwind safety. On
 /// all other platforms, this is a transparent wrapper around `Condvar`. See
 /// <https://github.com/rust-lang/rust/issues/118009> for more information.
 #[derive(Debug, Default)]
 pub struct UnwindsafeCondvar(
-    #[cfg(any(target_os = "ios", target_os = "macos"))] std::panic::AssertUnwindSafe<Condvar>,
-    #[cfg(not(any(target_os = "ios", target_os = "macos")))] Condvar,
+    #[cfg(any(target_os = "ios", target_os = "macos", target_os = "windows"))] std::panic::AssertUnwindSafe<Condvar>,
+    #[cfg(not(any(target_os = "ios", target_os = "macos", target_os = "windows")))] Condvar,
 );
 
 impl Deref for UnwindsafeCondvar {
@@ -25,12 +25,12 @@ impl Deref for UnwindsafeCondvar {
 
 impl UnwindsafeCondvar {
     pub const fn new() -> Self {
-        #[cfg(any(target_os = "ios", target_os = "macos"))]
+        #[cfg(any(target_os = "ios", target_os = "macos", target_os = "windows"))]
         {
             Self(std::panic::AssertUnwindSafe(Condvar::new()))
         }
 
-        #[cfg(not(any(target_os = "ios", target_os = "macos")))]
+        #[cfg(not(any(target_os = "ios", target_os = "macos", target_os = "windows")))]
         {
             Self(Condvar::new())
         }

src/utils.rs

@@ -5,7 +5,6 @@ use std::ffi::OsStr;
 use std::ops::{Deref, DerefMut, Not};
 use std::panic::{AssertUnwindSafe, UnwindSafe};
 use std::path::Path;
-use std::process::Command;
 use std::string::ToString;
 use std::sync::{MutexGuard, OnceLock};
 
@@ -1340,7 +1339,7 @@ impl Ranged for ThemeMode {
 }
 
 #[cfg(any(target_os = "macos", target_os = "ios", target_os = "windows"))]
-fn default_family(query: Family<'_>) -> Option<FamilyOwned> {
+fn default_family(_query: Family<'_>) -> Option<FamilyOwned> {
     // fontdb uses system APIs to determine these defaults.
     None
 }
@@ -1360,7 +1359,7 @@ fn default_family(query: Family<'_>) -> Option<FamilyOwned> {
         Family::Name(_) => return None,
     };
 
-    Command::new("fc-match")
+    std::process::Command::new("fc-match")
         .arg("-f")
         .arg("%{family}")
         .arg(query)