Revert unnecessary changes

Author: nadimkobeissi

crates/mac_core/src/font.rs

@@ -85,8 +85,7 @@ cfty! {
 
 impl CTFont {
     /// Create a new font from a [`CTFontDescriptor`] and a size to render at.
-    /// Returns `None` if CoreText cannot create the font (rare, but possible).
-    pub fn new_descriptor(descriptor: &CTFontDescriptor, size: f64) -> Option<CTFont> {
+    pub fn new_descriptor(descriptor: &CTFontDescriptor, size: f64) -> CTFont {
         // SAFETY: Provided descriptor is guaranteed valid. Any size will work. Null matrix is always
         //         allowed.
         let ptr = unsafe {
@@ -96,8 +95,9 @@ impl CTFont {
                 ptr::null_mut(),
             )
         };
+        let ptr = NonNull::new(ptr.cast_mut()).unwrap();
         // SAFETY: If non-null, pointer from CTFontCreateWithFontDescriptor is a new, owned CTFont.
-        NonNull::new(ptr.cast_mut()).map(|ptr| unsafe { CTFont::new_owned(ptr) })
+        unsafe { CTFont::new_owned(ptr) }
     }
 
     /// Get an attribute of this font, if present

crates/xetex_layout/src/c_api.rs

@@ -30,7 +30,7 @@ pub struct GlyphBBox {
 pub type Fixed = i32;
 /// cbindgen:ignore
 #[cfg(target_os = "macos")]
-pub type Fixed = i32;
+pub type Fixed = u32;
 pub type OTTag = u32;
 pub type GlyphID = u16;
 /// cbindgen:ignore

crates/xetex_layout/src/font.rs

@@ -358,14 +358,13 @@ impl Font {
             CFDictionary::new([(FontAttribute::CascadeList.to_str(), empty_cascade_list)]);
 
         *descriptor = descriptor.copy_with_attrs(&attributes);
-        *font_ref = Some(
-            CTFont::new_descriptor(descriptor, self.point_size as f64 * 72.0 / 72.27).ok_or(())?,
-        );
+        *font_ref = Some(CTFont::new_descriptor(
+            descriptor,
+            self.point_size as f64 * 72.0 / 72.27,
+        ));
         let mut index = 0;
-        let pathname =
-            get_file_name_from_ct_font(font_ref.as_ref().unwrap(), &mut index).ok_or(())?;
-        let pathname_str = pathname.to_str().map_err(|_| ())?;
-        self.initialize_ft(pathname_str, index as usize)
+        let pathname = get_file_name_from_ct_font(font_ref.as_ref().unwrap(), &mut index).unwrap();
+        self.initialize_ft(pathname.to_str().unwrap(), index as usize)
     }
 
     pub(crate) fn ft_face(&self) -> std::sync::MutexGuard<'_, ft::Face> {

crates/xetex_layout/src/manager/mac.rs

@@ -55,9 +55,7 @@ impl MacBackend {
     }
 
     fn add_font_and_siblings_to_caches(&self, maps: &mut FontMaps, font: &CTFontDescriptor) {
-        let Some(font) = CTFont::new_descriptor(font, 10.0) else {
-            return;
-        };
+        let font = CTFont::new_descriptor(font, 10.0);
         let attr = font.attr(FontAttribute::FamilyName).unwrap();
         // SAFETY: CFString has no generic parameters
         let family = unsafe { attr.downcast::<CFString>() }.unwrap();
@@ -81,9 +79,7 @@ impl FontManagerBackend for MacBackend {
     fn get_platform_font_desc<'a>(&'a self, font: &'a PlatformFontRef) -> Cow<'a, CStr> {
         let mut path = Cow::Borrowed(c"[unknown]");
 
-        let Some(ct_font) = CTFont::new_descriptor(font, 0.0) else {
-            return path;
-        };
+        let ct_font = CTFont::new_descriptor(font, 0.0);
         let url = ct_font
             .attr(FontAttribute::URL)
             // SAFETY: CFUrl has no generic parameters
@@ -158,9 +154,7 @@ impl FontManagerBackend for MacBackend {
 
         names.ps_name = Some(ps_name.get_cstring());
 
-        let Some(font) = CTFont::new_descriptor(&font, 0.0) else {
-            return names;
-        };
+        let font = CTFont::new_descriptor(&font, 0.0);
         append_name_to_list(&font, &mut names.full_names, FontNameKey::Full);
         append_name_to_list(&font, &mut names.family_names, FontNameKey::Family);
         append_name_to_list(&font, &mut names.style_names, FontNameKey::Style);