From 66f7483112610549e7d7784106afa3b53a39c2c4 Mon Sep 17 00:00:00 2001 From: Oskar Thornblad Date: Wed, 27 Jan 2021 14:03:40 +0100 Subject: [PATCH] Conditional YES casting --- src/backends/appkit.rs | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/backends/appkit.rs b/src/backends/appkit.rs index 259d88e..8b901da 100644 --- a/src/backends/appkit.rs +++ b/src/backends/appkit.rs @@ -196,21 +196,16 @@ impl Backend for AppKit { Ok(()) } - #[cfg(target_arch = "aarch64")] fn is_speaking(&self) -> Result { - let is_speaking: i8 = unsafe { msg_send![self.0, isSpeaking] }; - Ok(is_speaking == YES as i8) - } + #[cfg(not(target_arch = "aarch64"))] + let yes: i8 = YES; + + #[cfg(target_arch = "aarch64")] + let yes: i8 = match YES { true => 1, false => 0 }; - #[cfg(target_arch = "x86")] - #[cfg(target_arch = "x86_64")] - #[cfg(target_arch = "mips")] - #[cfg(target_arch = "powerpc")] - #[cfg(target_arch = "powerpc64")] - #[cfg(target_arch = "arm")] - fn is_speaking(&self) -> Result { let is_speaking: i8 = unsafe { msg_send![self.0, isSpeaking] }; - Ok(is_speaking == YES) + + Ok(is_speaking == yes) } }