Rename features to not have a prefix of the crate name

Author: madsmtm

.github/workflows/ci.yml

@@ -497,7 +497,7 @@ jobs:
       run: >-
         cargo test $ARGS $PUBLIC_CRATES -ptests -pobjc2-foundation
         --features=unstable-static-sel,unstable-static-class,unstable-static-nsstring
-        --features=Foundation_NSString
+        --features=NSString
 
   test-ios:
     # if: ${{ env.FULL }}

crates/header-translator/src/bin/check_framework_features.rs

@@ -12,16 +12,16 @@ struct CargoToml {
     features: BTreeMap<String, Vec<String>>,
 }
 
-const POPULAR_FOUNDATION_FEATURES: &[&str] = &[
-    "Foundation_NSString",
-    "Foundation_NSArray",
-    "Foundation_NSDictionary",
-    "Foundation_NSSet",
-    "Foundation_NSEnumerator",
-    "Foundation_NSError",
-    "Foundation_NSException",
-    "Foundation_NSValue",
-    "Foundation_NSThread",
+const POPULAR_FEATURES: &[&str] = &[
+    "NSString",
+    "NSArray",
+    "NSDictionary",
+    "NSSet",
+    "NSEnumerator",
+    "NSError",
+    "NSException",
+    "NSValue",
+    "NSThread",
 ];
 
 fn get_pairs<'a>(items: &'a [&'a str]) -> impl Iterator<Item = (&'a str, &'a str)> + 'a {
@@ -86,7 +86,7 @@ fn main() -> Result<(), Box<dyn Error>> {
             .join("objc2-foundation")
             .join("Cargo.toml"),
     )?;
-    let feature_sets = get_pairs(POPULAR_FOUNDATION_FEATURES)
+    let feature_sets = get_pairs(POPULAR_FEATURES)
         .map(|(feature1, feature2)| vec![feature1, feature2])
         .chain(features.iter().map(|feature| vec![&**feature]));
     test_feature_sets(

crates/header-translator/src/id.rs

@@ -96,11 +96,7 @@ impl Location {
             Some(Feature::Dependency("block2".to_string()))
         } else if self.library == emission_location.library {
             if let Some(file_name) = &self.file_name {
-                Some(Feature::Feature(format!(
-                    "{}_{}",
-                    self.library,
-                    clean_name(file_name)
-                )))
+                Some(Feature::Feature(clean_name(file_name)))
             } else {
                 error!("tried to get feature name of location with an unknown file name");
                 Some(Feature::Feature(format!("{}_Unknown", self.library)))

crates/header-translator/src/library.rs

@@ -245,9 +245,8 @@ see that for related crates.", self.data.krate, self.link_name)?;
 
         // Own features
         for (file_name, file) in &self.files {
-            let feature_name = format!("{}_{}", self.link_name, clean_name(file_name));
             generated_features.insert(
-                feature_name.clone(),
+                clean_name(file_name),
                 file.required_features(config).into_iter().collect(),
             );
         }
@@ -340,7 +339,7 @@ see that for related crates.", self.data.krate, self.link_name)?;
 
             for name in self.files.keys() {
                 let name = clean_name(name);
-                write!(f, "#[cfg(feature = \"{}_{}\")]", self.link_name, name)?;
+                write!(f, "#[cfg(feature = \"{name}\")]")?;
                 writeln!(f, "#[path = \"{name}.rs\"]")?;
                 writeln!(f, "mod __{name};")?;
             }

crates/objc2/src/topics/about_generated/CHANGELOG.md

@@ -63,10 +63,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   [dependencies]
   # Removed `Foundation_NSMutableArray`, it is included via. `NSArray`.
   # Added `NSObject` as the `NSCopying` protocol comes from there.
-  objc2-foundation = { version = "0.2", features = ["Foundation_NSNotification", "Foundation_NSString", "Foundation_NSThread", "Foundation_NSObject", "Foundation_NSArray"] }
+  objc2-foundation = { version = "0.2", features = ["NSNotification", "NSString", "NSThread", "NSObject", "NSArray"] }
   # Added `NSResponder` as it's required by `NSApplication`.
   # Added `NSRunningApplication` as a lot of application constants come from here.
-  objc2-app-kit = { version = "0.2", features = ["AppKit_NSResponder", "AppKit_NSApplication", "AppKit_NSRunningApplication"] }
+  objc2-app-kit = { version = "0.2", features = ["NSResponder", "NSApplication", "NSRunningApplication"] }
   ```
 * Marked `NSView::isFlipped`, `NSView::convertRect_toView`,
   `NSWindow::convertRectToScreen` and `NSWindow::convertPointFromScreen` as

crates/objc2/src/topics/about_generated/cargo_features.md

@@ -16,11 +16,11 @@ was declared inside of that header is locked behind that Cargo feature.
 
 As an example, let's use `MetalKit`. This framework has four public C headers,
 `MTKDefines.h`, `MTKModel.h`, `MTKTextureLoader.h` and `MTKView.h`. This in
-turn means we get four Cargo features in `objc2-metal-kit`,
-`MetalKit_MTKDefines`, `MetalKit_MTKModel`, `MetalKit_MTKTextureLoader` and
-`MetalKit_MTKView`, that enables the functionality exposed by each of those
-headers, as well as any required dependency features (e.g. `MTKModel.h` uses
-`MTLDevice`, so `objc2-metal/Metal_MTLDevice` is enabled for you).
+turn means we get four Cargo features in `objc2-metal-kit`, `MTKDefines`,
+`MTKModel`, `MTKTextureLoader` and `MTKView`, that enables the functionality
+exposed by each of those headers, as well as any required dependency features
+(e.g. `MTKModel.h` uses `MTLDevice`, so `objc2-metal/MTLDevice` is enabled for
+you).
 
 
 ## Dependency features

crates/test-assembly/crates/test_declare_class/Cargo.toml

@@ -22,7 +22,7 @@ gnustep-1-9 = ["gnustep-1-8", "objc2?/gnustep-1-9", "objc2-foundation?/gnustep-1
 gnustep-2-0 = ["gnustep-1-9", "objc2?/gnustep-2-0", "objc2-foundation?/gnustep-2-0"]
 gnustep-2-1 = ["gnustep-2-0", "objc2?/gnustep-2-1", "objc2-foundation?/gnustep-2-1"]
 
-all = ["objc2-foundation?/block2", "objc2-foundation?/Foundation_NSObject", "objc2-foundation?/Foundation_NSZone"]
+all = ["objc2-foundation?/block2", "objc2-foundation?/NSObject", "objc2-foundation?/NSZone"]
 
 # Hack to prevent the feature flag from being enabled in the entire project
 assembly-features = ["all", "objc2?/unstable-static-sel-inlined", "objc2?/unstable-static-class-inlined"]

crates/test-assembly/crates/test_fast_enumeration/Cargo.toml

@@ -23,7 +23,7 @@ gnustep-1-9 = ["gnustep-1-8", "objc2-foundation/gnustep-1-9"]
 gnustep-2-0 = ["gnustep-1-9", "objc2-foundation/gnustep-2-0"]
 gnustep-2-1 = ["gnustep-2-0", "objc2-foundation/gnustep-2-1"]
 
-all = ["objc2-foundation/block2", "objc2-foundation/Foundation_NSEnumerator", "objc2-foundation/Foundation_NSArray"]
+all = ["objc2-foundation/block2", "objc2-foundation/NSEnumerator", "objc2-foundation/NSArray"]
 
 # Hack
 assembly-features = ["all"] # "objc2/unstable-static-sel-inlined"

crates/test-assembly/crates/test_ns_string/Cargo.toml

@@ -22,7 +22,7 @@ gnustep-1-9 = ["gnustep-1-8", "objc2-foundation/gnustep-1-9"]
 gnustep-2-0 = ["gnustep-1-9", "objc2-foundation/gnustep-2-0"]
 gnustep-2-1 = ["gnustep-2-0", "objc2-foundation/gnustep-2-1"]
 
-all = ["objc2-foundation/block2", "objc2-foundation/Foundation_NSString"]
+all = ["objc2-foundation/block2", "objc2-foundation/NSString"]
 
 # Hack
 assembly-features = ["all", "objc2-foundation/unstable-static-nsstring"]

crates/test-fuzz/Cargo.toml

@@ -27,7 +27,7 @@ gnustep-2-0 = ["gnustep-1-9", "objc2-foundation/gnustep-2-0"]
 gnustep-2-1 = ["gnustep-2-0", "objc2-foundation/gnustep-2-1"]
 
 # The features required for fuzzing all targets (used by CI)
-fuzz-all = ["objc2-foundation/Foundation_NSString"]
+fuzz-all = ["objc2-foundation/NSString"]
 
 [[bin]]
 name = "class"
@@ -52,4 +52,4 @@ name = "nsstring"
 path = "fuzz_targets/nsstring.rs"
 test = false
 doc = false
-required-features = ["objc2-foundation/Foundation_NSString"]
+required-features = ["objc2-foundation/NSString"]

crates/test-ui/Cargo.toml

@@ -17,18 +17,18 @@ default = [
     "apple",
     "std",
     "objc2-foundation/block2",
-    "objc2-foundation/Foundation_NSObjCRuntime",
-    "objc2-foundation/Foundation_NSString",
-    "objc2-foundation/Foundation_NSNotification",
-    "objc2-foundation/Foundation_NSThread",
-    "objc2-foundation/Foundation_NSError",
-    "objc2-foundation/Foundation_NSArray",
-    "objc2-foundation/Foundation_NSValue",
-    "objc2-foundation/Foundation_NSSet",
-    "objc2-foundation/Foundation_NSObject",
-    "objc2-foundation/Foundation_NSURLSession",
-    "objc2-foundation/Foundation_NSEnumerator",
-    "objc2-foundation/Foundation_NSDictionary",
+    "objc2-foundation/NSObjCRuntime",
+    "objc2-foundation/NSString",
+    "objc2-foundation/NSNotification",
+    "objc2-foundation/NSThread",
+    "objc2-foundation/NSError",
+    "objc2-foundation/NSArray",
+    "objc2-foundation/NSValue",
+    "objc2-foundation/NSSet",
+    "objc2-foundation/NSObject",
+    "objc2-foundation/NSURLSession",
+    "objc2-foundation/NSEnumerator",
+    "objc2-foundation/NSDictionary",
     "objc2/unstable-msg-send-always-comma",
 ]
 std = ["block2/std", "objc2/std", "objc2-foundation/std"]

crates/tests/Cargo.toml

@@ -19,13 +19,13 @@ exception = ["objc2/exception", "all"]
 catch-all = ["objc2/catch-all", "exception"]
 # TODO: Fix this
 all = [
-    "objc2-foundation/Foundation_NSException",
-    "objc2-foundation/Foundation_NSArray",
-    "objc2-foundation/Foundation_NSString",
-    "objc2-foundation/Foundation_NSSet",
-    "objc2-foundation/Foundation_NSDictionary",
-    "objc2-foundation/Foundation_NSValue",
-    "objc2-foundation/Foundation_NSObject",
+    "objc2-foundation/NSException",
+    "objc2-foundation/NSArray",
+    "objc2-foundation/NSString",
+    "objc2-foundation/NSSet",
+    "objc2-foundation/NSDictionary",
+    "objc2-foundation/NSValue",
+    "objc2-foundation/NSObject",
 ]
 
 apple = ["block2/apple", "objc2/apple", "objc2-foundation/apple"]

framework-crates/objc2-accessibility/Cargo.toml

@@ -21,21 +21,21 @@ gnustep-2-1 = ["gnustep-2-0", "objc2/gnustep-2-1", "block2?/gnustep-2-1", "objc2
 name = "delegate"
 required-features = [
     "apple",
-    "objc2-foundation/Foundation_NSNotification",
-    "objc2-foundation/Foundation_NSString",
-    "objc2-foundation/Foundation_NSObject",
-    "objc2-foundation/Foundation_NSThread",
-    "AppKit_NSResponder",
-    "AppKit_NSApplication",
-    "AppKit_NSRunningApplication",
+    "objc2-foundation/NSNotification",
+    "objc2-foundation/NSString",
+    "objc2-foundation/NSObject",
+    "objc2-foundation/NSThread",
+    "NSResponder",
+    "NSApplication",
+    "NSRunningApplication",
 ]
 
 [[example]]
 name = "nspasteboard"
 required-features = [
     "apple",
-    "objc2-foundation/Foundation_NSArray",
-    "objc2-foundation/Foundation_NSString",
-    "objc2-foundation/Foundation_NSObject",
-    "AppKit_NSPasteboard",
+    "objc2-foundation/NSArray",
+    "objc2-foundation/NSString",
+    "objc2-foundation/NSObject",
+    "NSPasteboard",
 ]