Make unstable-darwin-objc augment the other unstable features

Instead of overriding.

Author: madsmtm

crates/objc2/Cargo.toml

@@ -72,20 +72,22 @@ disable-encoding-assertions = []
 # no longer required.
 verify = []
 
-# Make the `sel!` macro look up the selector statically.
+# Make the `sel!`/`class!` macro look up the item statically.
 #
 # The plan is to enable this by default, but right now we are uncertain of
 # its stability, and it might need significant changes before being fully
 # ready!
 #
 # Please test it, and report any issues you may find:
 # https://github.com/madsmtm/objc2/issues/new
-unstable-darwin-objc = []
 unstable-static-sel = ["dep:objc2-proc-macros"]
 unstable-static-sel-inlined = ["unstable-static-sel"]
 unstable-static-class = ["dep:objc2-proc-macros"]
 unstable-static-class-inlined = ["unstable-static-class"]
 
+# Augment the above with the nightly `darwin_objc` feature.
+unstable-darwin-objc = []
+
 # Uses nightly features to make autorelease pools fully sound
 unstable-autoreleasesafe = []
 

crates/objc2/src/__macros/class.rs

@@ -27,9 +27,9 @@ use crate::runtime::AnyClass;
 ///
 /// # Features
 ///
-/// If the experimental `"unstable-static-class"` or `"unstable-darwin-objc"`
-/// features are enabled, this will emit special statics that will be replaced
-/// by dyld when the program starts up.
+/// If the experimental `"unstable-static-class"` feature is enabled, this
+/// will emit special statics that will be replaced by dyld when the program
+/// starts up.
 ///
 /// Errors that were previously runtime panics may now turn into linker errors
 /// if you try to use a class which is not available. Additionally, you may
@@ -78,10 +78,7 @@ macro_rules! class {
 
 #[doc(hidden)]
 #[macro_export]
-#[cfg(not(any(
-    feature = "unstable-darwin-objc",
-    feature = "unstable-static-class"
-)))]
+#[cfg(not(feature = "unstable-static-class"))]
 macro_rules! __class_inner {
     ($name:expr, $_hash:expr) => {{
         static CACHED_CLASS: $crate::__macros::CachedClass = $crate::__macros::CachedClass::new();
@@ -95,8 +92,9 @@ macro_rules! __class_inner {
 #[doc(hidden)]
 #[macro_export]
 #[cfg(all(
+    feature = "unstable-static-class",
     feature = "unstable-darwin-objc",
-    not(feature = "unstable-static-class")
+    not(feature = "gnustep-1-7"),
 ))]
 macro_rules! __class_inner {
     ($name:expr, $_hash:expr) => {{
@@ -194,6 +192,7 @@ macro_rules! __statics_class {
 #[macro_export]
 #[cfg(all(
     feature = "unstable-static-class",
+    not(feature = "unstable-darwin-objc"),
     not(feature = "gnustep-1-7"),
     not(feature = "unstable-static-class-inlined")
 ))]
@@ -218,6 +217,7 @@ macro_rules! __class_inner {
 #[macro_export]
 #[cfg(all(
     feature = "unstable-static-class",
+    not(feature = "unstable-darwin-objc"),
     not(feature = "gnustep-1-7"),
     feature = "unstable-static-class-inlined"
 ))]

crates/objc2/src/__macros/sel.rs

@@ -67,9 +67,6 @@ use crate::runtime::Sel;
 ///
 /// See [rust-lang/rust#145496] for the tracking issue for the feature.
 ///
-/// `"unstable-static-sel"` and `"unstable-static-sel-inlined"` take
-/// precedence over `"unstable-darwin-objc"`.
-///
 /// [rust-lang/rust#53929]: https://github.com/rust-lang/rust/issues/53929
 /// [rust-lang/rust#145496]: https://github.com/rust-lang/rust/issues/145496
 ///
@@ -241,7 +238,7 @@ macro_rules! __sel_data {
 
 #[doc(hidden)]
 #[macro_export]
-#[cfg(not(any(feature = "unstable-darwin-objc", feature = "unstable-static-sel")))]
+#[cfg(not(feature = "unstable-static-sel"))]
 macro_rules! __sel_inner {
     ($data:expr, $_hash:expr) => {{
         static CACHED_SEL: $crate::__macros::CachedSel = $crate::__macros::CachedSel::new();
@@ -254,10 +251,7 @@ macro_rules! __sel_inner {
 
 #[doc(hidden)]
 #[macro_export]
-#[cfg(all(
-    feature = "unstable-darwin-objc",
-    not(feature = "unstable-static-sel")
-))]
+#[cfg(all(feature = "unstable-static-sel", feature = "unstable-darwin-objc"))]
 macro_rules! __sel_inner {
     ($data:expr, $_hash:expr) => {{
         let ptr = $crate::__macros::core_darwin_objc::selector!($data);
@@ -353,7 +347,8 @@ macro_rules! __statics_sel {
 #[macro_export]
 #[cfg(all(
     feature = "unstable-static-sel",
-    not(feature = "unstable-static-sel-inlined")
+    not(feature = "unstable-darwin-objc"),
+    not(feature = "unstable-static-sel-inlined"),
 ))]
 macro_rules! __sel_inner {
     ($data:expr, $hash:expr) => {{
@@ -385,7 +380,11 @@ macro_rules! __sel_inner {
 
 #[doc(hidden)]
 #[macro_export]
-#[cfg(feature = "unstable-static-sel-inlined")]
+#[cfg(all(
+    feature = "unstable-static-sel",
+    not(feature = "unstable-darwin-objc"),
+    feature = "unstable-static-sel-inlined",
+))]
 macro_rules! __sel_inner {
     ($data:expr, $hash:expr) => {{
         $crate::__statics_sel! {