Update to Xcode 15.0.1

madsmtm · Nov 23, 2023 · 481f1d7 · 481f1d7
1 parent 7e37e46
commit 481f1d7
Show file tree

Hide file tree

Showing 9 changed files with 294 additions and 12 deletions.
diff --git a/crates/header-translator/src/availability.rs b/crates/header-translator/src/availability.rs
@@ -14,6 +14,7 @@ struct Unavailable {
     maccatalyst: bool,
     watchos: bool,
     tvos: bool,
+    visionos: bool,
 }
 
 #[derive(Debug, Clone, PartialEq, Default)]
@@ -25,6 +26,7 @@ struct Versions {
     maccatalyst: Option<Version>,
     watchos: Option<Version>,
     tvos: Option<Version>,
+    visionos: Option<Version>,
 }
 
 #[derive(Debug, Clone, PartialEq)]
@@ -116,6 +118,12 @@ impl Availability {
                     &mut introduced.tvos,
                     &mut deprecated.tvos,
                 ),
+                "xros" => set(
+                    availability,
+                    &mut unavailable.visionos,
+                    &mut introduced.visionos,
+                    &mut deprecated.visionos,
+                ),
                 "swift" => {
                     _swift = Some(availability);
                 }
@@ -144,6 +152,7 @@ impl fmt::Display for Availability {
                 maccatalyst: None,
                 watchos: None,
                 tvos: None,
+                visionos: None,
             } => {
                 // Not deprecated
             }

diff --git a/crates/header-translator/src/rust_type.rs b/crates/header-translator/src/rust_type.rs
@@ -1684,7 +1684,8 @@ impl fmt::Display for Ty {
                         }
                     }
                     Inner::C99Bool => {
-                        panic!("C99's bool as Objective-C method return is unsupported")
+                        warn!("C99's bool as Objective-C method return is ill supported");
+                        write!(f, "bool")
                     }
                     Inner::ObjcBool => write!(f, "bool"),
                     ty => write!(f, "{ty}"),

diff --git a/crates/header-translator/src/unexposed_attr.rs b/crates/header-translator/src/unexposed_attr.rs
@@ -98,13 +98,15 @@ impl UnexposedAttr {
             | "__WATCHOS_AVAILABLE"
             | "API_AVAILABLE_BEGIN"
             | "API_AVAILABLE"
-            | "API_DEPRECATED_WITH_REPLACEMENT"
             | "API_DEPRECATED"
+            | "API_DEPRECATED_BEGIN"
+            | "API_DEPRECATED_WITH_REPLACEMENT"
             | "API_UNAVAILABLE_BEGIN"
             | "API_UNAVAILABLE"
             | "CF_SWIFT_UNAVAILABLE"
             | "CG_AVAILABLE_BUT_DEPRECATED"
             | "CG_AVAILABLE_STARTING"
+            | "CK_UNAVAILABLE"
             | "FPUI_AVAILABLE"
             | "MP_API"
             | "MP_DEPRECATED_WITH_REPLACEMENT"
@@ -140,6 +142,9 @@ impl UnexposedAttr {
                 let _ = get_arguments();
                 None
             }
+            // For some reason we don't need to extract the arguments for
+            // these, perhaps because they simply delegate to other macros.
+            "AS_API_AVAILABLE" | "AS_HEADER_AUDIT_BEGIN" => None,
             "__IOS_PROHIBITED"
             | "__IOS_UNAVAILABLE"
             | "__OSX_AVAILABLE_BUT_DEPRECATED"

diff --git a/crates/header-translator/translation-config.toml b/crates/header-translator/translation-config.toml
@@ -907,6 +907,12 @@ skipped = true
 skipped = true
 [class.NSBezierPath.methods.appendBezierPathWithCGGlyphs_count_inFont]
 skipped = true
+[class.NSBezierPath.methods.bezierPathWithCGPath]
+skipped = true
+[class.NSBezierPath.methods.CGPath]
+skipped = true
+[class.NSBezierPath.methods.setCGPath]
+skipped = true
 [class.NSBitmapImageRep.methods.initWithCGImage]
 skipped = true
 [class.NSBitmapImageRep.methods.initWithCIImage]
@@ -1551,6 +1557,10 @@ skipped = true
 [static.GCInputRightPaddle]
 skipped = true
 
+# Uses GCInputButtonName
+[fn.GCInputArcadeButtonName]
+skipped = true
+
 # tries to derive with `PartialEq` which fails because of `Bool` fields; manually define for now
 [struct.GCExtendedGamepadSnapshotData]
 skipped = true

diff --git a/crates/icrate/CHANGELOG.md b/crates/icrate/CHANGELOG.md
@@ -24,9 +24,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   be more efficient than the previous insertion methods.
 
 ### Changed
+* Updated SDK from Xcode 14.2 to 15.0.1.
 * Moved the `ns_string!` macro to `icrate::Foundation::ns_string`. The old
   location in the crate root is deprecated.
-* Use SDK from Xcode 14.3.1 (previously Xcode 14.2).
 * **BREAKING**: The following two methods on
   `MTLAccelerationStructureCommandEncoder` now take a nullable scratch buffer:
   - `refitAccelerationStructure_descriptor_destination_scratchBuffer_scratchBufferOffset`