1 files changed, 17 insertions, 39 deletions

diff --git a/alacritty/src/macos/locale.rs b/alacritty/src/macos/locale.rs
index 2a47ace8..46996515 100644
--- a/alacritty/src/macos/locale.rs
+++ b/alacritty/src/macos/locale.rs
@@ -1,13 +1,12 @@
 #![allow(clippy::let_unit_value)]
 
 use std::ffi::{CStr, CString};
-use std::os::raw::c_char;
-use std::{env, slice, str};
+use std::{env, str};
 
 use libc::{setlocale, LC_ALL, LC_CTYPE};
 use log::debug;
-use objc::runtime::{Class, Object};
-use objc::{msg_send, sel, sel_impl};
+use objc2::sel;
+use objc2_foundation::{NSLocale, NSObjectProtocol};
 
 const FALLBACK_LOCALE: &str = "UTF-8";
 
@@ -50,9 +49,7 @@ pub fn set_locale_environment() {
 /// Determine system locale based on language and country code.
 fn system_locale() -> String {
     unsafe {
-        let locale_class = Class::get("NSLocale").unwrap();
-        let locale: *const Object = msg_send![locale_class, currentLocale];
-        let _: () = msg_send![locale_class, release];
+        let locale = NSLocale::currentLocale();
 
         // `localeIdentifier` returns extra metadata with the locale (including currency and
         // collator) on newer versions of macOS. This is not a valid locale, so we use
@@ -61,38 +58,19 @@ fn system_locale() -> String {
         // https://developer.apple.com/documentation/foundation/nslocale/1416263-localeidentifier?language=objc
         // https://developer.apple.com/documentation/foundation/nslocale/1643060-countrycode?language=objc
         // https://developer.apple.com/documentation/foundation/nslocale/1643026-languagecode?language=objc
-        let is_language_code_supported: bool =
-            msg_send![locale, respondsToSelector: sel!(languageCode)];
-        let is_country_code_supported: bool =
-            msg_send![locale, respondsToSelector: sel!(countryCode)];
-        let locale_id = if is_language_code_supported && is_country_code_supported {
-            let language_code: *const Object = msg_send![locale, languageCode];
-            let language_code_str = nsstring_as_str(language_code).to_owned();
-            let _: () = msg_send![language_code, release];
-
-            let country_code: *const Object = msg_send![locale, countryCode];
-            let country_code_str = nsstring_as_str(country_code).to_owned();
-            let _: () = msg_send![country_code, release];
-
-            format!("{}_{}.UTF-8", &language_code_str, &country_code_str)
+        let is_language_code_supported: bool = locale.respondsToSelector(sel!(languageCode));
+        let is_country_code_supported: bool = locale.respondsToSelector(sel!(countryCode));
+        if is_language_code_supported && is_country_code_supported {
+            let language_code = locale.languageCode();
+            #[allow(deprecated)]
+            if let Some(country_code) = locale.countryCode() {
+                format!("{}_{}.UTF-8", language_code, country_code)
+            } else {
+                // Fall back to en_US in case the country code is not available.
+                "en_US.UTF-8".into()
+            }
         } else {
-            let identifier: *const Object = msg_send![locale, localeIdentifier];
-            let identifier_str = nsstring_as_str(identifier).to_owned();
-            let _: () = msg_send![identifier, release];
-
-            identifier_str + ".UTF-8"
-        };
-
-        let _: () = msg_send![locale, release];
-
-        locale_id
+            locale.localeIdentifier().to_string() + ".UTF-8"
+        }
     }
 }
-
-const UTF8_ENCODING: usize = 4;
-
-unsafe fn nsstring_as_str<'a>(nsstring: *const Object) -> &'a str {
-    let cstr: *const c_char = msg_send![nsstring, UTF8String];
-    let len: usize = msg_send![nsstring, lengthOfBytesUsingEncoding: UTF8_ENCODING];
-    str::from_utf8(slice::from_raw_parts(cstr as *const u8, len)).unwrap()
-}