From f90605b4da45374b4349913e2453527525125239 Mon Sep 17 00:00:00 2001
From: Mads Marquart <mads@marquart.dk>
Date: Mon, 28 Feb 2022 15:52:49 +0100
Subject: [PATCH] Fix Id's UnwindSafe impl for upcoming changes to the compiler

See https://github.com/rust-lang/rust/issues/93367
---
 objc2-foundation/src/array.rs | 13 ++-----------
 objc2/src/rc/id.rs            |  8 +++++++-
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/objc2-foundation/src/array.rs b/objc2-foundation/src/array.rs
index 1dba1e2a6..d84015725 100644
--- a/objc2-foundation/src/array.rs
+++ b/objc2-foundation/src/array.rs
@@ -43,19 +43,10 @@ unsafe impl<T: Send> Send for NSArray<T, Owned> {}
 
 object! {
     // TODO: Ensure that this deref to NSArray is safe!
-    unsafe pub struct NSMutableArray<T, O: Ownership>: NSArray<T, O> {
-        item: PhantomData<Id<T, O>>,
-    }
+    // This "inherits" NSArray, and has the same `Send`/`Sync` impls as that.
+    unsafe pub struct NSMutableArray<T, O: Ownership>: NSArray<T, O> {}
 }
 
-// SAFETY: Same as NSArray.
-//
-// TODO: Properly verify this
-unsafe impl<T: Sync + Send> Sync for NSMutableArray<T, Shared> {}
-unsafe impl<T: Sync + Send> Send for NSMutableArray<T, Shared> {}
-unsafe impl<T: Sync> Sync for NSMutableArray<T, Owned> {}
-unsafe impl<T: Send> Send for NSMutableArray<T, Owned> {}
-
 unsafe fn from_refs<T: Message + ?Sized>(cls: &Class, refs: &[&T]) -> NonNull<Object> {
     let obj: *mut Object = unsafe { msg_send![cls, alloc] };
     let obj: *mut Object = unsafe {
diff --git a/objc2/src/rc/id.rs b/objc2/src/rc/id.rs
index 01c3c215c..79ba29cfe 100644
--- a/objc2/src/rc/id.rs
+++ b/objc2/src/rc/id.rs
@@ -2,8 +2,8 @@ use core::fmt;
 use core::marker::PhantomData;
 use core::mem::ManuallyDrop;
 use core::ops::{Deref, DerefMut};
+use core::panic::{RefUnwindSafe, UnwindSafe};
 use core::ptr::NonNull;
-use std::panic::{RefUnwindSafe, UnwindSafe};
 
 use super::AutoreleasePool;
 use super::{Owned, Ownership, Shared};
@@ -117,6 +117,11 @@ pub struct Id<T: ?Sized, O: Ownership> {
     item: PhantomData<T>,
     /// To prevent warnings about unused type parameters.
     own: PhantomData<O>,
+    /// Marks the type as !UnwindSafe. Later on we'll re-enable this.
+    ///
+    /// See <https://github.com/rust-lang/rust/issues/93367> for why this is
+    /// required.
+    notunwindsafe: PhantomData<&'static mut ()>,
 }
 
 impl<T: Message + ?Sized, O: Ownership> Id<T, O> {
@@ -171,6 +176,7 @@ impl<T: Message + ?Sized, O: Ownership> Id<T, O> {
             ptr,
             item: PhantomData,
             own: PhantomData,
+            notunwindsafe: PhantomData,
         }
     }