Merge pull request #121 from a-isaiahharvey/stable-support

Add support for stable Rust

.github/workflows/rust-clippy.yml

@@ -33,7 +33,7 @@ jobs:
         uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af #@v1
         with:
           profile: minimal
-          toolchain: nightly
+          toolchain: stable
           components: clippy
           override: true
 

.github/workflows/rust.yml

@@ -18,9 +18,7 @@ jobs:
     - uses: actions/checkout@v3
     - name: Build
       run: |
-        rustup override set nightly
         cargo build --verbose
     - name: Run tests
       run: |
-        rustup override set nightly
         cargo test --verbose

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rust-macios"
-version = "0.3.0"
+version = "0.4.0"
 edition = "2021"
 authors = ["Allister Isaiah Harvey <a.i.harvey@icloud.com>"]
 description = "Apple Frameworks for Rust"
@@ -11,7 +11,7 @@ repository = "https://github.com/a-isaiahharvey/rust-macios"
 documentation = "https://docs.rs/crate/rust-macios/"
 
 [package.metadata.docs.rs]
-default-target = "x86_64-apple-darwin"
+default-target = "aarch64-apple-darwin"
 targets = [
     # MacOS
     "x86_64-apple-darwin",
@@ -46,6 +46,8 @@ block = "0.1.6"
 lazy_static = "1.4.0"
 bitflags = "1.3.2"
 
+va_list = "0.1.4"
+
 [dev-dependencies]
 test-case = "2.1.0"
 

examples/appkit/hello_world_window.rs

@@ -4,7 +4,8 @@ use rust_macios::{
         INSViewController, INSWindow, NSApplication, NSApplicationActivationPolicy,
         NSLayoutConstraint, NSTextField, NSView, NSWindow, PNSApplicationDelegate,
     },
-    foundation::{macros::nsarray, NSPoint, NSRect, NSSize, NSString},
+    foundation::{NSPoint, NSRect, NSSize, NSString},
+    nsarray,
     objective_c_runtime::{
         class_init, id, msg_send, nil, objc_sel, register_class, runtime::Object, sel, sel_impl,
         traits::PNSObject, Id, ShareId,

examples/appkit/popover.rs

@@ -7,7 +7,8 @@ use rust_macios::{
         NSPopover, NSPopoverBehavior, NSStatusBar, NSStatusItem, NSTextField, NSView,
         PNSApplicationDelegate,
     },
-    foundation::{macros::nsarray, NSPoint, NSRect, NSRectEdge, NSSize, NSString},
+    foundation::{NSPoint, NSRect, NSRectEdge, NSSize, NSString},
+    nsarray,
     objective_c_runtime::{
         class_init, id, msg_send, nil, objc_sel, register_class, runtime::Object, sel, sel_impl,
         traits::PNSObject, Id, ShareId,

examples/contacts/create_contact.rs

@@ -3,7 +3,8 @@ use rust_macios::{
         CNContactStore, CNLabelHome, CNLabelWork, CNLabeledValue, CNMutableContact,
         CNMutablePostalAddress, CNSaveRequest,
     },
-    foundation::{macros::nsarray, NSError, NSString},
+    foundation::{NSError, NSString},
+    nsarray,
     objective_c_runtime::traits::PNSObject,
 };
 

examples/natural_language/identifying_parts_of_speech.rs

@@ -1,10 +1,11 @@
 use std::ops::Range;
 
 use rust_macios::{
-    foundation::{macros::nsarray, NSRange},
+    foundation::NSRange,
     natural_language::{
         nl_tag_scheme::LexicalClass, NLTag, NLTagger, NLTaggerOptions, NLTokenUnit,
     },
+    nsarray,
     objective_c_runtime::{nil, traits::PNSObject},
 };
 

examples/natural_language/identifying_people_places_and_organizations.rs

@@ -1,12 +1,13 @@
 use std::ops::Range;
 
 use rust_macios::{
-    foundation::{macros::nsarray, NSRange},
+    foundation::NSRange,
     natural_language::{
         nl_tag::{OrganizationName, PersonalName, PlaceName},
         nl_tag_scheme::NameType,
         NLTag, NLTagger, NLTaggerOptions, NLTokenUnit,
     },
+    nsarray,
     objective_c_runtime::{nil, traits::PNSObject},
 };
 

examples/natural_language/identifying_the_language_in_text.rs

@@ -1,8 +1,8 @@
 use rust_macios::{
-    foundation::macros::{nsarray, nsdictionary},
     natural_language::{
         English, French, Italian, NLLanguageRecognizer, Portuguese, Spanish, Swedish,
     },
+    nsarray, nsdictionary,
     objective_c_runtime::traits::PNSObject,
 };
 

src/appkit/ns_appearance.rs

@@ -1,4 +1,4 @@
-use crate::objective_c_runtime::macros::object;
+use crate::object;
 
 object! {
     /// An object that manages standard appearance attributes for UI elements in an app.

src/appkit/ns_button.rs

@@ -1,7 +1,7 @@
 use objc::{msg_send, sel, sel_impl};
 
-pub(crate) use crate::objective_c_runtime::macros::{interface_impl, object};
 use crate::{foundation::NSString, objective_c_runtime::traits::FromId};
+pub(crate) use crate::{object, objective_c_runtime::macros::interface_impl};
 
 use super::{INSControl, INSResponder, INSView, NSImage};
 

src/appkit/ns_color.rs

@@ -1,4 +1,4 @@
-use super::object;
+use crate::object;
 
 object! {
     /// An object that stores color data and sometimes opacity (alpha value).

src/appkit/ns_color_space.rs

@@ -1,4 +1,4 @@
-use super::object;
+use crate::object;
 
 object! {
     /// An object that represents a custom color space.

src/appkit/ns_control.rs

@@ -1,8 +1,8 @@
 use objc::{msg_send, runtime::Sel, sel, sel_impl};
 
-use crate::appkit::INSView;
+use crate::{appkit::INSView, object};
 
-use super::{interface_impl, object, INSResponder};
+use super::{interface_impl, INSResponder};
 
 object! {
     /// A specialized view, such as a button or text field, that notifies your app of relevant events using the target-action design pattern.

src/appkit/ns_dock_tile.rs

@@ -1,4 +1,4 @@
-use super::object;
+use crate::object;
 
 object! {
     /// The visual representation of your app’s miniaturized windows and app icon as they appear in the Dock.

src/appkit/ns_image.rs

@@ -1,8 +1,8 @@
 use objc::{msg_send, sel, sel_impl};
 
-use super::{interface_impl, object, NSImageName};
+use super::{interface_impl, NSImageName};
 
-use crate::objective_c_runtime::traits::PNSObject;
+use crate::{object, objective_c_runtime::traits::PNSObject};
 
 object! {
     /// A high-level interface for manipulating image data.

src/appkit/ns_layout_anchor.rs

@@ -1,8 +1,11 @@
 use objc::{msg_send, sel, sel_impl};
 
-use crate::objective_c_runtime::{
-    macros::{interface_impl, object},
-    traits::{FromId, PNSObject},
+use crate::{
+    object,
+    objective_c_runtime::{
+        macros::interface_impl,
+        traits::{FromId, PNSObject},
+    },
 };
 
 use super::NSLayoutConstraint;

src/appkit/ns_layout_constraint.rs

@@ -2,10 +2,8 @@ use objc::{msg_send, sel, sel_impl};
 
 use crate::{
     foundation::NSArray,
-    objective_c_runtime::{
-        macros::{interface_impl, object},
-        traits::PNSObject,
-    },
+    object,
+    objective_c_runtime::{macros::interface_impl, traits::PNSObject},
 };
 
 object! {

src/appkit/ns_layout_x_axis_anchor.rs

@@ -1,4 +1,4 @@
-use crate::objective_c_runtime::macros::{interface_impl, object};
+use crate::{object, objective_c_runtime::macros::{interface_impl}};
 
 use super::INSLayoutAnchor;
 

src/appkit/ns_layout_y_axis_anchor.rs

@@ -1,4 +1,4 @@
-use crate::objective_c_runtime::macros::{interface_impl, object};
+use crate::{object, objective_c_runtime::macros::{interface_impl}};
 
 use super::INSLayoutAnchor;
 

src/appkit/ns_menu.rs

@@ -3,11 +3,12 @@ use objc::{class, msg_send, runtime::Sel, sel, sel_impl};
 use crate::{
     core_graphics::CGFloat,
     foundation::{Int, NSString},
+    object,
     objective_c_runtime::traits::{FromId, PNSObject},
     utils::to_bool,
 };
 
-use super::{interface_impl, object, NSMenuItem};
+use super::{interface_impl, NSMenuItem};
 
 object! {
     /// An object that manages an app’s menus.

src/appkit/ns_menu_item.rs

@@ -2,14 +2,15 @@ use objc::{msg_send, runtime::Sel, sel, sel_impl};
 
 use crate::{
     foundation::NSString,
+    object,
     objective_c_runtime::{
         id, nil,
         traits::{FromId, PNSObject},
     },
     utils::to_bool,
 };
 
-use super::{interface_impl, object, NSMenu};
+use super::{interface_impl, NSMenu};
 
 object! {
     /// A command item in an app menu.

src/appkit/ns_nib.rs

@@ -2,14 +2,15 @@ use objc::{msg_send, sel, sel_impl};
 
 use crate::{
     foundation::{NSArray, NSBundle, NSData, NSDictionary, NSString, NSURL},
+    object,
     objective_c_runtime::{
         id, nil,
         traits::{FromId, PNSObject},
     },
     utils::to_bool,
 };
 
-use super::{interface_impl, object};
+use super::interface_impl;
 
 pub type NSNibName = NSString;
 

src/appkit/ns_pasteboard.rs

@@ -1,9 +1,10 @@
 use objc::{msg_send, runtime::Class, sel, sel_impl};
 
-use super::{interface_impl, ns_pasteboard_item::NSPasteboardItem, object};
+use super::{interface_impl, ns_pasteboard_item::NSPasteboardItem};
 
 use crate::{
     foundation::{Int, NSArray, NSData, NSDictionary, NSFileWrapper, NSString, UInt},
+    object,
     objective_c_runtime::{
         id,
         traits::{FromId, PNSObject},

src/appkit/ns_pasteboard_item.rs

@@ -1,6 +1,6 @@
-use super::{interface_impl, object};
+use super::interface_impl;
 
-use crate::objective_c_runtime::traits::PNSObject;
+use crate::{object, objective_c_runtime::traits::PNSObject};
 
 object! {
     unsafe pub struct NSPasteboardItem;

src/appkit/ns_popover.rs

@@ -3,12 +3,13 @@ use objc::{class, msg_send, sel, sel_impl};
 use crate::{
     core_graphics::CGRectEdge,
     foundation::{NSCoder, NSRect, NSSize},
+    object,
     objective_c_runtime::{id, traits::FromId},
     utils::to_bool,
 };
 
 use super::{
-    interface_impl, ns_appearance::NSAppearance, object, INSResponder, INSView, INSViewController,
+    interface_impl, ns_appearance::NSAppearance, INSResponder, INSView, INSViewController,
     NSPopoverBehavior, NSViewController,
 };
 

src/appkit/ns_responder.rs

@@ -1,6 +1,6 @@
-use crate::objective_c_runtime::traits::PNSObject;
+use crate::{object, objective_c_runtime::traits::PNSObject};
 
-use super::{interface_impl, object};
+use super::interface_impl;
 
 object! {
     /// An abstract class that forms the basis of event and command processing

src/appkit/ns_running_application.rs

@@ -1,8 +1,11 @@
 use objc::{msg_send, sel, sel_impl};
 
-use crate::objective_c_runtime::traits::{FromId, PNSObject};
+use crate::{
+    object,
+    objective_c_runtime::traits::{FromId, PNSObject},
+};
 
-use super::{interface_impl, object, NSApplicationActivationOptions};
+use super::{interface_impl, NSApplicationActivationOptions};
 
 object! {
     /// An object that can manipulate and provide information for a single instance of an app.

src/appkit/ns_screen.rs

@@ -6,6 +6,7 @@ use crate::{
         Int, NSAlignmentOptions, NSDictionary, NSEdgeInsets, NSNotificationName, NSRect, NSString,
         NSTimeInterval,
     },
+    object,
     objective_c_runtime::{
         id,
         traits::{FromId, PNSObject},
@@ -16,7 +17,7 @@ use crate::{
 /// These constants are the keys for device description dictionaries.
 pub type NSDeviceDescriptionKey = NSString;
 
-use super::{interface_impl, object, NSColorSpace, NSWindowDepth};
+use super::{interface_impl, NSColorSpace, NSWindowDepth};
 
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy)]
 #[repr(u64)]

src/appkit/ns_status_bar.rs

@@ -2,10 +2,11 @@ use objc::{msg_send, sel, sel_impl};
 
 use crate::{
     core_graphics::CGFloat,
+    object,
     objective_c_runtime::traits::{FromId, PNSObject},
 };
 
-use super::{interface_impl, object, NSStatusItem};
+use super::{interface_impl, NSStatusItem};
 
 object! {
      /// An individual element displayed in the system menu bar.

src/appkit/ns_status_bar_button.rs

@@ -2,9 +2,9 @@
 
 use objc::{msg_send, sel, sel_impl};
 
-use crate::{objective_c_runtime::traits::PNSObject, utils::to_bool};
+use crate::{object, objective_c_runtime::traits::PNSObject, utils::to_bool};
 
-use super::{interface_impl, object, ActionHandler, INSButton, INSControl, INSResponder, INSView};
+use super::{interface_impl, ActionHandler, INSButton, INSControl, INSResponder, INSView};
 
 object! {
     /// The appearance and behavior of an item in the systemwide menu bar.

src/appkit/ns_status_item.rs

@@ -2,14 +2,15 @@ use objc::{msg_send, sel, sel_impl};
 
 use crate::{
     core_graphics::CGFloat,
+    object,
     objective_c_runtime::{
         nil,
         traits::{FromId, PNSObject},
     },
     utils::to_bool,
 };
 
-use super::{interface_impl, object, NSMenu, NSStatusBar, NSStatusBarButton, NSStatusItemBehavior};
+use super::{interface_impl, NSMenu, NSStatusBar, NSStatusBarButton, NSStatusItemBehavior};
 
 object! {
     /// An individual element displayed in the system menu bar.

src/appkit/ns_storyboard.rs

@@ -2,13 +2,14 @@ use objc::{msg_send, sel, sel_impl};
 
 use crate::{
     foundation::NSBundle,
+    object,
     objective_c_runtime::{
         id, nil,
         traits::{FromId, PNSObject},
     },
 };
 
-use super::{object, NSStoryboardName};
+use super::NSStoryboardName;
 
 object! {
     /// An encapsulation of the design-time view controller and window controller graph represented in an Interface Builder storyboard resource file.