Prepare for moving objc2-foundation

Author: madsmtm

objc2-foundation/src/__string_macro.rs

@@ -17,7 +17,7 @@ use core::sync::atomic::{AtomicPtr, Ordering};
 use objc2::rc::Id;
 use objc2::runtime::Class;
 
-use crate::NSString;
+use super::NSString;
 
 // This is defined in CoreFoundation, but we don't emit a link attribute
 // here because it is already linked via Foundation.

objc2-foundation/src/array.rs

@@ -9,10 +9,11 @@ use objc2::runtime::{Class, Object};
 use objc2::Message;
 use objc2::{msg_send, msg_send_id};
 
-use crate::{
+use super::{
     NSCopying, NSEnumerator, NSFastEnumeration, NSFastEnumerator, NSMutableArray, NSMutableCopying,
-    NSObject, NSRange, __inner_extern_class,
+    NSObject, NSRange,
 };
+use crate::__inner_extern_class;
 
 __inner_extern_class! {
     /// TODO

objc2-foundation/src/attributed_string.rs

@@ -5,10 +5,10 @@ use objc2::rc::{DefaultId, Id, Shared};
 use objc2::runtime::Object;
 use objc2::{msg_send, msg_send_id};
 
-use crate::{
-    extern_class, NSCopying, NSDictionary, NSMutableAttributedString, NSMutableCopying, NSObject,
-    NSString,
+use super::{
+    NSCopying, NSDictionary, NSMutableAttributedString, NSMutableCopying, NSObject, NSString,
 };
+use crate::extern_class;
 
 extern_class! {
     /// A string that has associated attributes for portions of its text.

objc2-foundation/src/data.rs

@@ -10,7 +10,8 @@ use objc2::rc::{DefaultId, Id, Shared};
 use objc2::runtime::{Class, Object};
 use objc2::{msg_send, msg_send_id};
 
-use crate::{extern_class, NSCopying, NSMutableCopying, NSMutableData, NSObject};
+use super::{NSCopying, NSMutableCopying, NSMutableData, NSObject};
+use crate::extern_class;
 
 extern_class! {
     /// A static byte buffer in memory.

objc2-foundation/src/dictionary.rs

@@ -9,7 +9,8 @@ use core::ptr;
 use objc2::rc::{DefaultId, Id, Owned, Shared, SliceId};
 use objc2::{msg_send, msg_send_id, Message};
 
-use super::{NSArray, NSCopying, NSEnumerator, NSFastEnumeration, NSObject, __inner_extern_class};
+use super::{NSArray, NSCopying, NSEnumerator, NSFastEnumeration, NSObject};
+use crate::__inner_extern_class;
 
 __inner_extern_class! {
     #[derive(PartialEq, Eq, Hash)]

objc2-foundation/src/exception.rs

@@ -7,7 +7,8 @@ use objc2::rc::{Id, Shared};
 use objc2::runtime::Object;
 use objc2::{msg_send, msg_send_id, sel};
 
-use crate::{extern_class, NSCopying, NSDictionary, NSObject, NSString};
+use super::{NSCopying, NSDictionary, NSObject, NSString};
+use crate::extern_class;
 
 extern_class! {
     /// A special condition that interrupts the normal flow of program

objc2-foundation/src/mutable_array.rs

@@ -9,11 +9,12 @@ use objc2::rc::{DefaultId, Id, Owned, Ownership, Shared, SliceId};
 use objc2::Message;
 use objc2::{msg_send, msg_send_id};
 
-use crate::array::from_refs;
-use crate::{
+use super::array::from_refs;
+use super::{
     NSArray, NSComparisonResult, NSCopying, NSFastEnumeration, NSFastEnumerator, NSMutableCopying,
-    NSObject, __inner_extern_class,
+    NSObject,
 };
+use crate::__inner_extern_class;
 
 __inner_extern_class! {
     // TODO: Ensure that this deref to NSArray is safe!

objc2-foundation/src/mutable_attributed_string.rs

@@ -3,7 +3,8 @@ use core::fmt;
 use objc2::rc::{DefaultId, Id, Owned, Shared};
 use objc2::{msg_send, msg_send_id};
 
-use crate::{extern_class, NSAttributedString, NSCopying, NSMutableCopying, NSObject, NSString};
+use super::{NSAttributedString, NSCopying, NSMutableCopying, NSObject, NSString};
+use crate::extern_class;
 
 extern_class! {
     /// A mutable string that has associated attributes.

objc2-foundation/src/mutable_data.rs

@@ -9,8 +9,9 @@ use std::io;
 use objc2::rc::{DefaultId, Id, Owned, Shared};
 use objc2::{msg_send, msg_send_id};
 
-use crate::data::data_with_bytes;
-use crate::{extern_class, NSCopying, NSData, NSMutableCopying, NSObject, NSRange};
+use super::data::data_with_bytes;
+use super::{NSCopying, NSData, NSMutableCopying, NSObject, NSRange};
+use crate::extern_class;
 
 extern_class! {
     /// A dynamic byte buffer in memory.
@@ -36,7 +37,7 @@ impl NSMutableData {
 
     #[cfg(feature = "block")]
     pub fn from_vec(bytes: Vec<u8>) -> Id<Self, Owned> {
-        unsafe { Id::new(crate::data::data_from_vec(Self::class(), bytes).cast()).unwrap() }
+        unsafe { Id::new(super::data::data_from_vec(Self::class(), bytes).cast()).unwrap() }
     }
 
     // TODO: Use malloc_buf/mbox and `initWithBytesNoCopy:...`?

objc2-foundation/src/mutable_string.rs

@@ -6,7 +6,8 @@ use core::str;
 use objc2::rc::{DefaultId, Id, Owned, Shared};
 use objc2::{msg_send, msg_send_id};
 
-use crate::{extern_class, NSCopying, NSMutableCopying, NSObject, NSString};
+use super::{NSCopying, NSMutableCopying, NSObject, NSString};
+use crate::extern_class;
 
 extern_class! {
     /// A dynamic plain-text Unicode string object.