Fix objc2 imports in objc2::foundation

madsmtm · madsmtm · commit f56d1ca35309 · 2022-07-27T19:19:25.000+02:00
diff --git a/objc2/src/foundation/array.rs b/objc2/src/foundation/array.rs
@@ -4,16 +4,14 @@ use core::marker::PhantomData;
 use core::ops::{Index, IndexMut, Range};
 use core::panic::{RefUnwindSafe, UnwindSafe};
 
-use objc2::rc::{DefaultId, Id, Owned, Ownership, Shared, SliceId};
-use objc2::runtime::{Class, Object};
-use objc2::Message;
-use objc2::{msg_send, msg_send_id};
-
 use super::{
     NSCopying, NSEnumerator, NSFastEnumeration, NSFastEnumerator, NSMutableArray, NSMutableCopying,
     NSObject, NSRange,
 };
-use crate::__inner_extern_class;
+use crate::rc::{DefaultId, Id, Owned, Ownership, Shared, SliceId};
+use crate::runtime::{Class, Object};
+use crate::Message;
+use crate::{__inner_extern_class, msg_send, msg_send_id};
 
 __inner_extern_class! {
     /// TODO
@@ -244,10 +242,9 @@ mod tests {
     use alloc::format;
     use alloc::vec::Vec;
 
-    use objc2::rc::autoreleasepool;
-
     use super::*;
     use crate::foundation::{NSString, NSValue};
+    use crate::rc::autoreleasepool;
 
     fn sample_array(len: usize) -> Id<NSArray<NSObject, Owned>, Owned> {
         let mut vec = Vec::with_capacity(len);
diff --git a/objc2/src/foundation/attributed_string.rs b/objc2/src/foundation/attributed_string.rs
@@ -1,14 +1,12 @@
 use core::fmt;
 use core::panic::{RefUnwindSafe, UnwindSafe};
 
-use objc2::rc::{DefaultId, Id, Shared};
-use objc2::runtime::Object;
-use objc2::{msg_send, msg_send_id};
-
 use super::{
     NSCopying, NSDictionary, NSMutableAttributedString, NSMutableCopying, NSObject, NSString,
 };
-use crate::extern_class;
+use crate::rc::{DefaultId, Id, Shared};
+use crate::runtime::Object;
+use crate::{extern_class, msg_send, msg_send_id};
 
 extern_class! {
     /// A string that has associated attributes for portions of its text.
@@ -145,9 +143,9 @@ impl fmt::Debug for NSAttributedString {
 mod tests {
     use alloc::string::ToString;
     use alloc::{format, vec};
-    use objc2::rc::{autoreleasepool, Owned};
 
     use super::*;
+    use crate::rc::{autoreleasepool, Owned};
 
     #[test]
     fn test_new() {
diff --git a/objc2/src/foundation/comparison_result.rs b/objc2/src/foundation/comparison_result.rs
@@ -1,6 +1,6 @@
 use core::cmp::Ordering;
 
-use objc2::{Encode, Encoding, RefEncode};
+use crate::{Encode, Encoding, RefEncode};
 
 /// Constants that indicate sort order.
 ///
diff --git a/objc2/src/foundation/copying.rs b/objc2/src/foundation/copying.rs
@@ -1,5 +1,5 @@
-use objc2::rc::{Id, Owned, Ownership};
-use objc2::{msg_send_id, Message};
+use crate::rc::{Id, Owned, Ownership};
+use crate::{msg_send_id, Message};
 
 pub unsafe trait NSCopying: Message {
     /// Indicates whether the type is mutable or immutable.
diff --git a/objc2/src/foundation/data.rs b/objc2/src/foundation/data.rs
@@ -6,12 +6,10 @@ use core::ops::Index;
 use core::panic::{RefUnwindSafe, UnwindSafe};
 use core::slice::{self, SliceIndex};
 
-use objc2::rc::{DefaultId, Id, Shared};
-use objc2::runtime::{Class, Object};
-use objc2::{msg_send, msg_send_id};
-
 use super::{NSCopying, NSMutableCopying, NSMutableData, NSObject};
-use crate::extern_class;
+use crate::rc::{DefaultId, Id, Shared};
+use crate::runtime::{Class, Object};
+use crate::{extern_class, msg_send, msg_send_id};
 
 extern_class! {
     /// A static byte buffer in memory.
@@ -70,7 +68,7 @@ impl NSData {
         //
         // NSMutableData does not have this problem.
         #[cfg(feature = "gnustep-1-7")]
-        let cls = objc2::class!(NSDataWithDeallocatorBlock);
+        let cls = crate::class!(NSDataWithDeallocatorBlock);
         #[cfg(not(feature = "gnustep-1-7"))]
         let cls = Self::class();
 
diff --git a/objc2/src/foundation/dictionary.rs b/objc2/src/foundation/dictionary.rs
@@ -6,11 +6,9 @@ use core::ops::Index;
 use core::panic::{RefUnwindSafe, UnwindSafe};
 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};
-use crate::__inner_extern_class;
+use crate::rc::{DefaultId, Id, Owned, Shared, SliceId};
+use crate::{__inner_extern_class, msg_send, msg_send_id, Message};
 
 __inner_extern_class! {
     #[derive(PartialEq, Eq, Hash)]
@@ -173,10 +171,10 @@ impl<K: fmt::Debug + Message, V: fmt::Debug + Message> fmt::Debug for NSDictiona
 mod tests {
     use alloc::format;
     use alloc::vec;
-    use objc2::rc::{autoreleasepool, Id, Shared};
 
-    use super::NSDictionary;
-    use crate::foundation::{NSObject, NSString};
+    use super::*;
+    use crate::foundation::NSString;
+    use crate::rc::autoreleasepool;
 
     fn sample_dict(key: &str) -> Id<NSDictionary<NSString, NSObject>, Shared> {
         let string = NSString::from_str(key);
diff --git a/objc2/src/foundation/enumerator.rs b/objc2/src/foundation/enumerator.rs
@@ -4,9 +4,9 @@ use core::ptr;
 use core::slice;
 use std::os::raw::c_ulong;
 
-use objc2::rc::{Id, Owned};
-use objc2::runtime::Object;
-use objc2::{msg_send, Encode, Encoding, Message, RefEncode};
+use crate::rc::{Id, Owned};
+use crate::runtime::Object;
+use crate::{msg_send, Encode, Encoding, Message, RefEncode};
 
 // TODO: https://doc.rust-lang.org/stable/reference/trait-bounds.html#lifetime-bounds
 pub struct NSEnumerator<'a, T: Message> {
diff --git a/objc2/src/foundation/exception.rs b/objc2/src/foundation/exception.rs
@@ -2,13 +2,11 @@ use core::fmt;
 use core::hint::unreachable_unchecked;
 use core::panic::{RefUnwindSafe, UnwindSafe};
 
-use objc2::exception::Exception;
-use objc2::rc::{Id, Shared};
-use objc2::runtime::Object;
-use objc2::{msg_send, msg_send_id, sel};
-
 use super::{NSCopying, NSDictionary, NSObject, NSString};
-use crate::extern_class;
+use crate::exception::Exception;
+use crate::rc::{Id, Shared};
+use crate::runtime::Object;
+use crate::{extern_class, msg_send, msg_send_id, sel};
 
 extern_class! {
     /// A special condition that interrupts the normal flow of program
diff --git a/objc2/src/foundation/geometry.rs b/objc2/src/foundation/geometry.rs
@@ -1,4 +1,4 @@
-use objc2::{Encode, Encoding, RefEncode};
+use crate::{Encode, Encoding, RefEncode};
 
 #[cfg(target_pointer_width = "64")]
 type InnerFloat = f64;
@@ -313,7 +313,7 @@ mod tests {
     #[test]
     #[cfg(any(all(feature = "apple", target_os = "macos"), feature = "gnustep-1-7"))] // or macabi
     fn test_partial_eq() {
-        use objc2::runtime::Bool;
+        use crate::runtime::Bool;
 
         // Note: No need to use "C-unwind"
         extern "C" {
diff --git a/objc2/src/foundation/mod.rs b/objc2/src/foundation/mod.rs
@@ -52,7 +52,7 @@ pub use self::zone::NSZone;
 // Available under Foundation, so makes sense here as well:
 // https://developer.apple.com/documentation/foundation/numbers_data_and_basic_values?language=objc
 #[doc(no_inline)]
-pub use objc2::ffi::{NSInteger, NSUInteger};
+pub use crate::ffi::{NSInteger, NSUInteger};
 
 #[cfg(feature = "apple")]
 #[link(name = "Foundation", kind = "framework")]
@@ -89,9 +89,9 @@ mod zone;
 #[cfg(test)]
 mod tests {
     use core::panic::{RefUnwindSafe, UnwindSafe};
-    use objc2::rc::{Id, Owned, Shared};
 
     use super::*;
+    use crate::rc::{Id, Owned, Shared};
 
     // We expect most Foundation types to be UnwindSafe and RefUnwindSafe,
     // since they follow Rust's usual mutability rules (&T = immutable).
diff --git a/objc2/src/foundation/mutable_array.rs b/objc2/src/foundation/mutable_array.rs
@@ -5,16 +5,14 @@ use core::fmt;
 use core::marker::PhantomData;
 use core::ops::{Index, IndexMut};
 
-use objc2::rc::{DefaultId, Id, Owned, Ownership, Shared, SliceId};
-use objc2::Message;
-use objc2::{msg_send, msg_send_id};
-
 use super::array::from_refs;
 use super::{
     NSArray, NSComparisonResult, NSCopying, NSFastEnumeration, NSFastEnumerator, NSMutableCopying,
     NSObject,
 };
-use crate::__inner_extern_class;
+use crate::rc::{DefaultId, Id, Owned, Ownership, Shared, SliceId};
+use crate::Message;
+use crate::{__inner_extern_class, msg_send, msg_send_id};
 
 __inner_extern_class! {
     // TODO: Ensure that this deref to NSArray is safe!
@@ -226,10 +224,9 @@ impl<T: fmt::Debug + Message, O: Ownership> fmt::Debug for NSMutableArray<T, O>
 mod tests {
     use alloc::vec;
 
-    use objc2::rc::autoreleasepool;
-
     use super::*;
     use crate::foundation::NSString;
+    use crate::rc::autoreleasepool;
 
     #[test]
     fn test_adding() {
diff --git a/objc2/src/foundation/mutable_attributed_string.rs b/objc2/src/foundation/mutable_attributed_string.rs
@@ -1,10 +1,8 @@
 use core::fmt;
 
-use objc2::rc::{DefaultId, Id, Owned, Shared};
-use objc2::{msg_send, msg_send_id};
-
 use super::{NSAttributedString, NSCopying, NSMutableCopying, NSObject, NSString};
-use crate::extern_class;
+use crate::rc::{DefaultId, Id, Owned, Shared};
+use crate::{extern_class, msg_send, msg_send_id};
 
 extern_class! {
     /// A mutable string that has associated attributes.
diff --git a/objc2/src/foundation/mutable_data.rs b/objc2/src/foundation/mutable_data.rs
@@ -6,12 +6,10 @@ use core::ops::{Index, IndexMut, Range};
 use core::slice::{self, SliceIndex};
 use std::io;
 
-use objc2::rc::{DefaultId, Id, Owned, Shared};
-use objc2::{msg_send, msg_send_id};
-
 use super::data::data_with_bytes;
 use super::{NSCopying, NSData, NSMutableCopying, NSObject, NSRange};
-use crate::extern_class;
+use crate::rc::{DefaultId, Id, Owned, Shared};
+use crate::{extern_class, msg_send, msg_send_id};
 
 extern_class! {
     /// A dynamic byte buffer in memory.
@@ -244,9 +242,8 @@ impl<'a> IntoIterator for &'a mut NSMutableData {
 
 #[cfg(test)]
 mod tests {
-    use objc2::runtime::Object;
-
     use super::*;
+    use crate::runtime::Object;
 
     #[test]
     fn test_bytes_mut() {
diff --git a/objc2/src/foundation/mutable_string.rs b/objc2/src/foundation/mutable_string.rs
@@ -3,11 +3,9 @@ use core::fmt;
 use core::ops::AddAssign;
 use core::str;
 
-use objc2::rc::{DefaultId, Id, Owned, Shared};
-use objc2::{msg_send, msg_send_id};
-
 use super::{NSCopying, NSMutableCopying, NSObject, NSString};
-use crate::extern_class;
+use crate::rc::{DefaultId, Id, Owned, Shared};
+use crate::{extern_class, msg_send, msg_send_id};
 
 extern_class! {
     /// A dynamic plain-text Unicode string object.
diff --git a/objc2/src/foundation/object.rs b/objc2/src/foundation/object.rs
@@ -1,12 +1,10 @@
 use core::fmt;
 use core::hash;
 
-use objc2::rc::{DefaultId, Id, Owned, Shared};
-use objc2::runtime::{Class, Object};
-use objc2::{class, msg_send, msg_send_bool, msg_send_id};
-
 use super::NSString;
-use crate::__inner_extern_class;
+use crate::rc::{DefaultId, Id, Owned, Shared};
+use crate::runtime::{Class, Object};
+use crate::{__inner_extern_class, class, msg_send, msg_send_bool, msg_send_id};
 
 __inner_extern_class! {
     @__inner
diff --git a/objc2/src/foundation/process_info.rs b/objc2/src/foundation/process_info.rs
@@ -1,11 +1,9 @@
 use core::fmt;
 use core::panic::{RefUnwindSafe, UnwindSafe};
 
-use objc2::msg_send_id;
-use objc2::rc::{Id, Shared};
-
 use super::{NSObject, NSString};
-use crate::extern_class;
+use crate::rc::{Id, Shared};
+use crate::{extern_class, msg_send_id};
 
 extern_class! {
     /// A collection of information about the current process.
diff --git a/objc2/src/foundation/range.rs b/objc2/src/foundation/range.rs
@@ -1,8 +1,7 @@
 use core::ops::Range;
 
-use objc2::{Encode, Encoding, RefEncode};
-
 use super::NSUInteger;
+use crate::{Encode, Encoding, RefEncode};
 
 /// TODO.
 ///
diff --git a/objc2/src/foundation/string.rs b/objc2/src/foundation/string.rs
@@ -9,15 +9,13 @@ use core::slice;
 use core::str;
 use std::os::raw::c_char;
 
-use objc2::ffi;
-use objc2::rc::DefaultId;
-use objc2::rc::{autoreleasepool, AutoreleasePool};
-use objc2::rc::{Id, Shared};
-use objc2::runtime::{Class, Object};
-use objc2::{msg_send, msg_send_bool, msg_send_id};
-
 use super::{NSComparisonResult, NSCopying, NSMutableCopying, NSMutableString, NSObject};
-use crate::extern_class;
+use crate::ffi;
+use crate::rc::DefaultId;
+use crate::rc::{autoreleasepool, AutoreleasePool};
+use crate::rc::{Id, Shared};
+use crate::runtime::{Class, Object};
+use crate::{extern_class, msg_send, msg_send_bool, msg_send_id};
 
 #[cfg(feature = "apple")]
 const UTF8_ENCODING: usize = 4;
diff --git a/objc2/src/foundation/thread.rs b/objc2/src/foundation/thread.rs
@@ -2,11 +2,9 @@ use core::fmt;
 use core::marker::PhantomData;
 use core::panic::{RefUnwindSafe, UnwindSafe};
 
-use objc2::rc::{Id, Shared};
-use objc2::{msg_send, msg_send_bool, msg_send_id};
-
 use super::{NSObject, NSString};
-use crate::extern_class;
+use crate::rc::{Id, Shared};
+use crate::{extern_class, msg_send, msg_send_bool, msg_send_id};
 
 extern_class! {
     /// A thread of execution.
diff --git a/objc2/src/foundation/uuid.rs b/objc2/src/foundation/uuid.rs
@@ -1,12 +1,10 @@
 use core::fmt;
 use core::panic::{RefUnwindSafe, UnwindSafe};
 
-use objc2::rc::DefaultId;
-use objc2::rc::{Id, Shared};
-use objc2::{msg_send, msg_send_id, Encode, Encoding, RefEncode};
-
 use super::{NSCopying, NSObject, NSString};
-use crate::extern_class;
+use crate::rc::DefaultId;
+use crate::rc::{Id, Shared};
+use crate::{extern_class, msg_send, msg_send_id, Encode, Encoding, RefEncode};
 
 extern_class! {
     /// A universally unique value.
diff --git a/objc2/src/foundation/value.rs b/objc2/src/foundation/value.rs
diff --git a/objc2/src/foundation/zone.rs b/objc2/src/foundation/zone.rs
diff --git a/objc2/src/lib.rs b/objc2/src/lib.rs
diff --git a/objc2/src/macros/declare_class.rs b/objc2/src/macros/declare_class.rs
diff --git a/objc2/src/macros/extern_class.rs b/objc2/src/macros/extern_class.rs
diff --git a/objc2/src/macros/ns_string.rs b/objc2/src/macros/ns_string.rs
diff --git a/test-assembly/crates/test_ns_string/expected/gnustep-x86.s b/test-assembly/crates/test_ns_string/expected/gnustep-x86.s
diff --git a/test-assembly/crates/test_ns_string/expected/gnustep-x86_64.s b/test-assembly/crates/test_ns_string/expected/gnustep-x86_64.s
diff --git a/tests/src/test_object.rs b/tests/src/test_object.rs
