Merge pull request #427 from madsmtm/refactor-modules

Refactor modules

Author: madsmtm

crates/header-translator/translation-config.toml

@@ -198,7 +198,6 @@ imports = []
 extra-features = [
     "objective-c",
     "block",
-    "Foundation_NSProxy",
     # Temporary, since some structs and statics use these
     "Foundation_NSError",
     "Foundation_NSAppleEventDescriptor",
@@ -558,13 +557,12 @@ countForFetchRequest_error = { skipped = true }
 [class.NSBundle.methods.localizedAttributedStringForKey_value_table]
 skipped = true
 
-# Root class
+# Root classes, defined in `objc2` for now
 [class.NSProxy]
-definition-skipped = true
-
-# Ignore categories on NSObject for now
-[class.NSObject]
 skipped = true
+[class.NSObject]
+skipped = true # Also ignore categories on NSObject for now
+
 [protocol.NSObject]
 renamed = "NSObjectProtocol"
 

crates/icrate/CHANGELOG.md

@@ -17,6 +17,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   - `MetricKit`
   - `PhotoKit`
 
+### Removed
+* **BREAKING**: Removed various redundant `NSProxy` methods.
+
 
 ## icrate 0.0.2 - 2023-02-07
 

crates/icrate/Cargo.toml

@@ -2193,7 +2193,6 @@ FileProvider_all = [
 Foundation = [
     "objective-c",
     "block",
-    "Foundation_NSProxy",
     "Foundation_NSError",
     "Foundation_NSAppleEventDescriptor",
     "Foundation_NSHashTable",

crates/icrate/examples/browser.rs

@@ -6,8 +6,8 @@ use icrate::{
         declare::{Ivar, IvarDrop},
         declare_class, extern_methods, msg_send,
         rc::{Allocated, Id},
-        runtime::{Object, Sel},
-        sel, ClassType, ProtocolObject,
+        runtime::{Object, ProtocolObject, Sel},
+        sel, ClassType,
     },
     AppKit::{
         NSApplication, NSApplicationActivationPolicyRegular, NSBackingStoreBuffered,

crates/icrate/src/Foundation/fixes/NSProxy.rs

@@ -3,8 +3,6 @@ mod NSUUID;
 mod __NSDecimal;
 #[path = "NSNotFound.rs"]
 mod __NSNotFound;
-#[path = "NSProxy.rs"]
-mod __NSProxy;
 mod copy;
 mod debug;
 mod generic_return;
@@ -13,8 +11,6 @@ mod ns_consumed;
 
 pub use self::__NSDecimal::NSDecimal;
 pub use self::__NSNotFound::NSNotFound;
-#[cfg(feature = "Foundation_NSProxy")]
-pub use self::__NSProxy::NSProxy;
 #[cfg(feature = "Foundation_NSMapTable")]
 pub use self::ns_consumed::NSFreeMapTable;
 #[cfg(feature = "Foundation_NSUUID")]

crates/icrate/src/Foundation/fixes/mod.rs

@@ -112,6 +112,9 @@ pub use self::additions::*;
 pub use self::fixes::*;
 pub use self::generated::*;
 
+#[doc(inline)]
+#[cfg(feature = "Foundation_NSProxy")]
+pub use objc2::runtime::__NSProxy as NSProxy;
 pub use objc2::runtime::{NSObject, NSObjectProtocol, NSZone};
 // Available under Foundation, so makes sense here as well:
 // https://developer.apple.com/documentation/foundation/numbers_data_and_basic_values?language=objc

crates/icrate/src/Foundation/mod.rs

@@ -17,11 +17,11 @@ pub(crate) use objc2::rc::{Allocated, Id, Owned, Ownership, Shared};
 #[cfg(feature = "objective-c")]
 pub(crate) use objc2::runtime::{Bool, Class, Object, Sel};
 #[cfg(feature = "objective-c")]
-pub(crate) use objc2::runtime::{NSObject, NSObjectProtocol};
+pub(crate) use objc2::runtime::{NSObject, NSObjectProtocol, ProtocolObject};
 #[cfg(feature = "objective-c")]
 pub(crate) use objc2::{
     __inner_extern_class, extern_class, extern_methods, extern_protocol, ClassType, Message,
-    ProtocolObject, ProtocolType,
+    ProtocolType,
 };
 
 #[cfg(feature = "block")]

crates/icrate/src/common.rs

@@ -0,0 +1,8 @@
+#![cfg(feature = "Foundation_NSProxy")]
+use icrate::Foundation::NSProxy;
+use objc2::ClassType;
+
+#[test]
+fn dummy() {
+    let _cls = NSProxy::class();
+}