Handle builtin NSObject differently

madsmtm · Jan 10, 2023 · d614bd4 · d614bd4
1 parent 2d55538
commit d614bd4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/crates/header-translator/src/output.rs b/crates/header-translator/src/output.rs
@@ -47,8 +47,13 @@ impl Output {
                             // since the rest will be enabled transitively.
                             if let Some(superclass) = superclasses.first() {
                                 let feature = format!("{}_{}", ty.library, ty.name);
-                                let superclass_feature = format!("{}_{}", superclass.library, superclass.name);
-                                if let Some(existing) = features.insert(feature, vec![superclass_feature]) {
+                                let superclass_features = (superclass.library != "Foundation" && superclass.name != "NSObject")
+                                    .then(|| format!("{}_{}", superclass.library, superclass.name))
+                                    .into_iter()
+                                    .collect::<Vec<_>>();
+                                if let Some(existing) =
+                                    features.insert(feature, superclass_features)
+                                {
                                     error!(?existing, "duplicate feature");
                                 }
                             }

diff --git a/crates/header-translator/src/rust_type.rs b/crates/header-translator/src/rust_type.rs
@@ -240,7 +240,6 @@ impl IdType {
         }
     }
 
-    #[allow(dead_code)]
     fn library(&self) -> Option<&str> {
         match self {
             Self::Class { library, .. } => Some(library),
@@ -419,7 +418,10 @@ impl IdType {
 
     fn visit_required_features(&self, f: &mut impl FnMut(&str, &str)) {
         if let Some(library) = self.library() {
-            f(&library, self.name());
+            let name = self.name();
+            if library != "Foundation" && name != "NSObject" {
+                f(&library, name);
+            }
         }
 
         if let Self::Class {