Move MessageReceiver and MessageArguments to runtime module

Author: madsmtm

crates/objc2/CHANGELOG.md

@@ -27,6 +27,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   who are `IsAllocableAnyThread`.
 * **BREAKING**: Moved the `MethodImplementation` trait from the `declare`
   module to the `runtime` module.
+* **BREAKING**: Moved the `MessageReceiver` and `MessageArguments` traits to
+  the `runtime` module.
 
 ### Deprecated
 * Soft deprecated using `msg_send!` without a comma between arguments (i.e.

crates/objc2/src/__macro_helpers/declare_class.rs

@@ -2,8 +2,8 @@ use objc2_encode::Encoding;
 
 use crate::encode::Encode;
 use crate::rc::{Allocated, Id};
-use crate::runtime::AnyObject;
-use crate::{ClassType, Message, MessageReceiver};
+use crate::runtime::{AnyObject, MessageReceiver};
+use crate::{ClassType, Message};
 
 use super::{CopyOrMutCopy, Init, MaybeUnwrap, New, Other};
 use crate::mutability;

crates/objc2/src/__macro_helpers/mod.rs

@@ -6,12 +6,14 @@ use std::collections::HashSet;
 
 use crate::declare::ClassBuilder;
 use crate::encode::Encode;
-use crate::message::__TupleExtender;
 use crate::rc::{Allocated, Id};
+use crate::runtime::message::__TupleExtender;
 #[cfg(all(debug_assertions, feature = "verify"))]
 use crate::runtime::MethodDescription;
-use crate::runtime::{AnyClass, AnyObject, AnyProtocol, MethodImplementation, Sel};
-use crate::{Message, MessageArguments, MessageReceiver};
+use crate::runtime::{
+    AnyClass, AnyObject, AnyProtocol, MessageArguments, MessageReceiver, MethodImplementation, Sel,
+};
+use crate::Message;
 
 pub use core::borrow::{Borrow, BorrowMut};
 pub use core::cell::UnsafeCell;

crates/objc2/src/declare/ivar.rs

@@ -320,8 +320,8 @@ mod tests {
     use crate::declare::{IvarBool, IvarEncode};
     use crate::mutability::Mutable;
     use crate::rc::Id;
-    use crate::runtime::NSObject;
-    use crate::{declare_class, msg_send, msg_send_id, test_utils, ClassType, MessageReceiver};
+    use crate::runtime::{MessageReceiver, NSObject};
+    use crate::{declare_class, msg_send, msg_send_id, test_utils, ClassType};
 
     struct TestIvar;
 

crates/objc2/src/lib.rs

@@ -190,7 +190,6 @@ pub use objc_sys as ffi;
 
 #[doc(no_inline)]
 pub use self::encode::{Encode, Encoding, RefEncode};
-pub use self::message::{MessageArguments, MessageReceiver};
 pub use self::top_level_traits::{ClassType, Message, ProtocolType};
 
 #[cfg(feature = "objc2-proc-macros")]
@@ -213,7 +212,6 @@ pub mod declare;
 pub mod encode;
 pub mod exception;
 mod macros;
-mod message;
 pub mod mutability;
 pub mod rc;
 pub mod runtime;

crates/objc2/src/macros/declare_class.rs

@@ -590,7 +590,7 @@ macro_rules! __declare_class_inner {
                         // most Objective-C code in the wild don't contain
                         // this; but we _are_ ARC, so we must do this.
                         unsafe {
-                            $crate::MessageReceiver::__send_super_message_static(
+                            $crate::runtime::MessageReceiver::__send_super_message_static(
                                 __objc2_self,
                                 __objc2_cmd, // Reuse the selector
                                 (), // No arguments

crates/objc2/src/macros/mod.rs

@@ -717,12 +717,12 @@ macro_rules! __class_inner {
 ///
 /// Variadic arguments are currently not supported.
 ///
-/// [`MessageReceiver`]: crate::MessageReceiver
+/// [`MessageReceiver`]: crate::runtime::MessageReceiver
 /// [`rc::Id`]: crate::rc::Id
 /// [`ClassType`]: crate::ClassType
 /// [`Encode`]: crate::Encode
 /// [`sel!`]: crate::sel
-/// [`MessageReceiver::send_message`]: crate::MessageReceiver::send_message
+/// [`MessageReceiver::send_message`]: crate::runtime::MessageReceiver::send_message
 ///
 ///
 /// # `bool` handling
@@ -1007,7 +1007,7 @@ macro_rules! __msg_send_helper {
         // 1-tuple if there is only one.
         //
         // And use `::<_, _>` for better UI
-        result = $crate::MessageReceiver::$fn::<_, _>($($fn_args)+, $crate::sel!($($selector)*), ($($argument,)*));
+        result = $crate::runtime::MessageReceiver::$fn::<_, _>($($fn_args)+, $crate::sel!($($selector)*), ($($argument,)*));
         result
     });
 }
@@ -1117,7 +1117,7 @@ macro_rules! msg_send_bool {
 /// [`Id::retain`], [`Id::drop`] and [`Id::autorelease`] for that.
 ///
 /// [sel-families]: https://clang.llvm.org/docs/AutomaticReferenceCounting.html#arc-method-families
-/// [`MessageReceiver`]: crate::MessageReceiver
+/// [`MessageReceiver`]: crate::runtime::MessageReceiver
 /// [`Id::retain_autoreleased`]: crate::rc::Id::retain_autoreleased
 /// [arc-retainable]: https://clang.llvm.org/docs/AutomaticReferenceCounting.html#retainable-object-pointers-as-operands-and-arguments
 /// [#173]: https://github.com/madsmtm/objc2/pull/173

crates/objc2/src/message.rs renamed to crates/objc2/src/runtime/message.rs

@@ -313,8 +313,7 @@ fn panic_verify(cls: &AnyClass, sel: Sel, err: &crate::runtime::VerificationErro
     )
 }
 
-// TODO: Make this fully private
-pub(crate) mod private {
+mod private {
     pub trait Sealed {}
 }
 
@@ -633,6 +632,17 @@ unsafe impl<'a> MessageReceiver for &'a AnyClass {
     }
 }
 
+#[cfg(test)]
+mod test_utils_hack {
+    use super::*;
+    use crate::test_utils::CustomObject;
+
+    // TODO: Remove the need for this hack
+    impl private::Sealed for &CustomObject {}
+    impl private::Sealed for &mut CustomObject {}
+    impl private::Sealed for ManuallyDrop<CustomObject> {}
+}
+
 mod message_args_private {
     pub trait Sealed {}
 }

crates/objc2/src/runtime/mod.rs

@@ -32,6 +32,7 @@ use std::os::raw::c_uint;
 #[doc(hidden)]
 pub mod __nsstring;
 mod bool;
+pub(crate) mod message;
 mod method_encoding_iter;
 mod method_implementation;
 mod nsobject;
@@ -52,6 +53,7 @@ use crate::{ffi, Message};
 pub use self::nsproxy::NSProxy as __NSProxy;
 
 pub use self::bool::Bool;
+pub use self::message::{MessageArguments, MessageReceiver};
 pub use self::method_implementation::MethodImplementation;
 pub use self::nsobject::{NSObject, NSObjectProtocol};
 pub use self::nszone::NSZone;
@@ -1281,8 +1283,8 @@ mod tests {
     use core::mem::size_of;
 
     use super::*;
+    use crate::runtime::MessageReceiver;
     use crate::test_utils;
-    use crate::MessageReceiver;
     use crate::{msg_send, sel};
 
     #[test]

crates/objc2/src/test_utils.rs

@@ -4,8 +4,8 @@ use std::os::raw::c_char;
 use std::sync::Once;
 
 use crate::declare::{ClassBuilder, ProtocolBuilder};
-use crate::runtime::{AnyClass, AnyObject, AnyProtocol, Sel};
-use crate::{ffi, Encode, Encoding, MessageReceiver};
+use crate::runtime::{AnyClass, AnyObject, AnyProtocol, MessageReceiver, Sel};
+use crate::{ffi, Encode, Encoding};
 use crate::{msg_send, sel};
 
 #[derive(Debug)]
@@ -21,11 +21,6 @@ impl CustomObject {
     }
 }
 
-// TODO: Remove the need for this hack
-impl crate::message::private::Sealed for &CustomObject {}
-impl crate::message::private::Sealed for &mut CustomObject {}
-impl crate::message::private::Sealed for ManuallyDrop<CustomObject> {}
-
 unsafe impl MessageReceiver for &CustomObject {
     type __Inner = AnyObject;