Remove lower-version clang workarounds

madsmtm · Sep 1, 2023 · bffd0db · bffd0db
1 parent 94d8ac1
commit bffd0db
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/crates/header-translator/framework-includes.h b/crates/header-translator/framework-includes.h
@@ -1,9 +1,3 @@
-// Workaround for clang < 13, only used in NSBundle.h
-#define NS_FORMAT_ARGUMENT(A)
-
-// Workaround for clang < 13
-#define _Nullable_result _Nullable
-
 #include <TargetConditionals.h>
 
 #if TARGET_OS_OSX

diff --git a/crates/header-translator/src/rust_type.rs b/crates/header-translator/src/rust_type.rs
@@ -141,6 +141,10 @@ impl AttributeParser<'_, '_> {
             None
         }
     }
+
+    fn nullable_result(&mut self, position: ParsePosition) -> bool {
+        self.strip("_Nullable_result", position)
+    }
 }
 
 impl Drop for AttributeParser<'_, '_> {
@@ -584,6 +588,10 @@ impl Inner {
 
                 let is_const = get_is_const(parser.is_const(ParsePosition::Suffix));
                 lifetime.update(parser.lifetime(ParsePosition::Suffix));
+
+                // TODO: Use _Nullable_result
+                let _nullable_result = parser.nullable_result(ParsePosition::Suffix);
+
                 let nullability = if let Some(nullability) = unexposed_nullability {
                     nullability
                 } else {
@@ -672,6 +680,10 @@ impl Inner {
 
                 let is_const = get_is_const(parser.is_const(ParsePosition::Suffix));
                 lifetime.update(parser.lifetime(ParsePosition::Suffix));
+
+                // TODO: Use _Nullable_result
+                let _nullable_result = parser.nullable_result(ParsePosition::Suffix);
+
                 let mut nullability = if let Some(nullability) = unexposed_nullability {
                     nullability
                 } else {