Remove #[macro_use] on macOS

src/lib.rs

@@ -145,7 +145,7 @@ extern crate log;
 extern crate serde;
 #[macro_use]
 extern crate bitflags;
-#[cfg(any(target_os = "macos", target_os = "ios"))]
+#[cfg(target_os = "ios")]
 #[macro_use]
 extern crate objc;
 #[cfg(target_os = "macos")]

src/platform_impl/macos/app.rs

@@ -1,7 +1,7 @@
 use std::collections::VecDeque;
 
 use objc2::foundation::NSObject;
-use objc2::{declare_class, ClassType};
+use objc2::{declare_class, msg_send, ClassType};
 
 use super::appkit::{NSApplication, NSEvent, NSEventModifierFlags, NSEventType, NSResponder};
 use super::{app_state::AppState, event::EventWrapper, DEVICE_ID};

src/platform_impl/macos/app_delegate.rs

@@ -1,7 +1,7 @@
 use objc2::foundation::NSObject;
 use objc2::rc::{Id, Shared};
 use objc2::runtime::Object;
-use objc2::{declare_class, ClassType};
+use objc2::{declare_class, msg_send, msg_send_id, ClassType};
 
 use super::app_state::AppState;
 use super::appkit::NSApplicationActivationPolicy;

src/platform_impl/macos/appkit/cursor.rs

@@ -3,7 +3,7 @@ use once_cell::sync::Lazy;
 use objc2::foundation::{NSData, NSDictionary, NSNumber, NSObject, NSPoint, NSString};
 use objc2::rc::{DefaultId, Id, Shared};
 use objc2::runtime::Sel;
-use objc2::{extern_class, extern_methods, msg_send_id, ns_string, ClassType};
+use objc2::{extern_class, extern_methods, msg_send_id, ns_string, sel, ClassType};
 
 use super::NSImage;
 use crate::window::CursorIcon;

src/platform_impl/macos/appkit/screen.rs

@@ -1,7 +1,7 @@
 use objc2::foundation::{CGFloat, NSArray, NSDictionary, NSNumber, NSObject, NSRect, NSString};
 use objc2::rc::{Id, Shared};
 use objc2::runtime::Object;
-use objc2::{extern_class, extern_methods, msg_send_id, ClassType};
+use objc2::{extern_class, extern_methods, msg_send_id, ns_string, ClassType};
 
 extern_class!(
     #[derive(Debug, PartialEq, Eq, Hash)]

src/platform_impl/macos/event_loop.rs

@@ -13,7 +13,7 @@ use std::{
 
 use objc2::foundation::is_main_thread;
 use objc2::rc::{autoreleasepool, Id, Shared};
-use objc2::ClassType;
+use objc2::{msg_send_id, ClassType};
 use raw_window_handle::{AppKitDisplayHandle, RawDisplayHandle};
 
 use super::appkit::{NSApp, NSApplicationActivationPolicy, NSEvent};
@@ -141,8 +141,8 @@ impl<T> EventLoop<T> {
         // `sharedApplication`) is called anywhere else, or we'll end up
         // with the wrong `NSApplication` class and the wrong thread could
         // be marked as main.
-        let app: &WinitApplication =
-            unsafe { msg_send![WinitApplication::class(), sharedApplication] };
+        let app: Id<WinitApplication, Shared> =
+            unsafe { msg_send_id![WinitApplication::class(), sharedApplication] };
 
         use NSApplicationActivationPolicy::*;
         let activation_policy = match attributes.activation_policy {

src/platform_impl/macos/menu.rs

@@ -1,7 +1,7 @@
 use objc2::foundation::{NSProcessInfo, NSString};
-use objc2::ns_string;
 use objc2::rc::{Id, Shared};
 use objc2::runtime::Sel;
+use objc2::{ns_string, sel};
 
 use super::appkit::{NSApp, NSEventModifierFlags, NSMenu, NSMenuItem};
 

src/platform_impl/macos/view.rs

@@ -7,7 +7,7 @@ use objc2::foundation::{
 };
 use objc2::rc::{Id, Owned, Shared};
 use objc2::runtime::{Object, Sel};
-use objc2::{declare_class, ClassType};
+use objc2::{class, declare_class, msg_send, msg_send_id, sel, ClassType};
 
 use super::appkit::{
     NSApp, NSCursor, NSEvent, NSEventModifierFlags, NSEventPhase, NSResponder, NSTrackingRectTag,

src/platform_impl/macos/window.rs

@@ -40,7 +40,7 @@ use objc2::foundation::{
     is_main_thread, CGFloat, NSArray, NSCopying, NSObject, NSPoint, NSRect, NSSize, NSString,
 };
 use objc2::rc::{autoreleasepool, Id, Owned, Shared};
-use objc2::{declare_class, ClassType};
+use objc2::{declare_class, msg_send, msg_send_id, ClassType};
 
 use super::appkit::{
     NSApp, NSAppKitVersion, NSApplicationPresentationOptions, NSBackingStoreType, NSColor,

src/platform_impl/macos/window_delegate.rs

@@ -4,7 +4,7 @@ use std::ptr;
 use objc2::foundation::{NSArray, NSObject, NSString};
 use objc2::rc::{autoreleasepool, Id, Shared};
 use objc2::runtime::Object;
-use objc2::{declare_class, ClassType};
+use objc2::{declare_class, msg_send, msg_send_id, sel, ClassType};
 
 use super::appkit::{
     NSApplicationPresentationOptions, NSFilenamesPboardType, NSPasteboard, NSWindowOcclusionState,