From 77748b7f8887270de9d68a74db6c374919682179 Mon Sep 17 00:00:00 2001
From: Mads Marquart <mads@marquart.dk>
Date: Wed, 24 Apr 2024 02:06:34 +0200
Subject: [PATCH] Use objc2 and objc2-foundation

These crates are the successor crates to objc and objc-foundation.

Relevant to locale_config is that bindings to `NSLocale` is provided,
avoiding the error-prone `msg_send!` macros.
---
 Cargo.toml   |  4 ++--
 src/lib.rs   |  8 +++++---
 src/macos.rs | 17 ++++++-----------
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index ae383c0..5ff6934 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,5 +32,5 @@ regex = "1"
 winapi = { version = "0.3", features = ["winnls"] }
 
 [target.'cfg(target_os = "macos")'.dependencies]
-objc = "^0.2"
-objc-foundation = "^0.1"
+objc2 = "0.5.1"
+objc2-foundation = { version = "0.2", features = ["NSLocale", "NSString"] }
diff --git a/src/lib.rs b/src/lib.rs
index b7b956b..dd9e9f6 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -15,11 +15,13 @@
 #[macro_use]
 extern crate lazy_static;
 
-extern crate regex;
+#[cfg(target_os = "macos")]
+extern crate objc2;
 
 #[cfg(target_os = "macos")]
-#[macro_use]
-extern crate objc;
+extern crate objc2_foundation;
+
+extern crate regex;
 
 use regex::Regex;
 use std::borrow::{Borrow,Cow};
diff --git a/src/macos.rs b/src/macos.rs
index 5da31b8..cc034c4 100644
--- a/src/macos.rs
+++ b/src/macos.rs
@@ -1,17 +1,12 @@
 //! Inspect macOS system for locale configuration
-extern crate objc_foundation;
-
 use super::{LanguageRange, Locale};
 
-use objc::runtime::Object;
-use self::objc_foundation::{INSString, NSString};
+use objc2_foundation::NSLocale;
 
 pub fn system_locale() -> Option<Locale> {
-	let locale_identifier = unsafe {
-		let nslocale = class!(NSLocale);
-		let current_locale: *mut Object = msg_send![nslocale, currentLocale];
-		let locale_identifier: *const NSString = msg_send![current_locale, localeIdentifier];
-		locale_identifier.as_ref().unwrap()
-	};
-	Some(Locale::from(LanguageRange::from_unix(locale_identifier.as_str()).unwrap()))
+    let current_locale = unsafe { NSLocale::currentLocale() };
+    let locale_identifier = unsafe { current_locale.localeIdentifier() };
+    Some(Locale::from(
+        LanguageRange::from_unix(&locale_identifier.to_string()).unwrap(),
+    ))
 }