From 9e7fa311e552f3cfc41670e5a346ab1681508f5b Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 13 Oct 2022 19:18:51 -0600 Subject: [PATCH] Fix fallback platforms --- examples/text/src/font/fallback/mod.rs | 34 ++++++++++++++------------ 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/examples/text/src/font/fallback/mod.rs b/examples/text/src/font/fallback/mod.rs index 4eca6f19..6d2f1e94 100644 --- a/examples/text/src/font/fallback/mod.rs +++ b/examples/text/src/font/fallback/mod.rs @@ -2,25 +2,27 @@ use unicode_script::Script; use super::Font; -#[cfg(not(any(macos, unix, windows)))] -use self::other::*; -#[cfg(not(any(macos, unix, windows)))] -mod other; +use self::platform::*; -#[cfg(macos)] -use self::macos::*; -#[cfg(macos)] -mod macos; +#[cfg(not(any( + target_os = "linux", + target_os = "macos", + target_os = "windows", +)))] +#[path = "other.rs"] +mod platform; -#[cfg(unix)] -use self::unix::*; -#[cfg(unix)] -mod unix; +#[cfg(target_os = "macos")] +#[path = "macos.rs"] +mod platform; -#[cfg(windows)] -use self::windows::*; -#[cfg(windows)] -mod windows; +#[cfg(target_os = "linux")] +#[path = "unix.rs"] +mod platform; + +#[cfg(target_os = "windows")] +#[path = "windows.rs"] +mod platform; pub struct FontFallbackIter<'a> { fonts: &'a [Font<'a>],