fix block2

Author: grant0417

Cargo.lock

@@ -35,6 +35,7 @@ appkit-nsworkspace-bindings = { path = "crates/macos-utils/appkit-nsworkspace-bi
 async-trait = "0.1.74"
 aws-types = "1.2.0"
 base64 = "0.22.1"
+block2 = "0.5.1"
 bytes = "1.5.0"
 bitflags = { version = "2.6.0", features = ["serde"] }
 bstr = "1.1.0"

Cargo.toml

@@ -56,9 +56,9 @@ struct Ivars {
 declare_class!(
     struct MyInputController;
 
-    // - The superclass NSObject does not have any subclassing requirements.
+    // - The superclass IMKInputController does not have any subclassing requirements.
     // - Interior mutability is a safe default.
-    // - `MyCustomObject` does not implement `Drop`.
+    // - `MyInputController` does not implement `Drop`.
     unsafe impl ClassType for MyInputController {
         type Super = IMKInputController;
         type Mutability = InteriorMutable;

crates/fig_input_method/src/imk.rs

@@ -8,7 +8,7 @@ version.workspace = true
 license.workspace = true
 
 [target.'cfg(target_os = "macos")'.dependencies]
-block = "0.1.6"
+block2.workspace = true
 core-graphics.workspace = true
 core-foundation.workspace = true
 cocoa.workspace = true
@@ -42,6 +42,3 @@ appkit-nsworkspace-bindings.workspace = true
 tracing.workspace = true
 tokio.workspace = true
 nix.workspace = true
-
-[dependencies]
-block2 = "0.5.1"

crates/macos-utils/Cargo.toml

@@ -31,6 +31,7 @@ use core_foundation::string::{
 };
 use dashmap::DashMap;
 use flume::Sender;
+use objc2::mutability::InteriorMutable;
 use objc2::rc::{
     Allocated,
     Retained,
@@ -41,7 +42,6 @@ use objc2::{
     DeclaredClass,
     declare_class,
     msg_send_id,
-    mutability,
     sel,
 };
 use objc2_app_kit::{
@@ -213,9 +213,12 @@ pub struct Ivars {
 declare_class! {
     pub struct ObserverClass;
 
+    // - The superclass NSObject does not have any subclassing requirements.
+    // - Interior mutability is a safe default.
+    // - `ObserverClass` does not implement `Drop`.
     unsafe impl ClassType for ObserverClass {
         type Super = NSObject;
-        type Mutability = mutability::InteriorMutable;
+        type Mutability = InteriorMutable;
         const NAME: &'static str = OBSERVER_CLASS_NAME;
     }