Fix compile errors from changes, require newer mac_core

Author: CraftSpider

crates/xetex_layout/Cargo.toml

@@ -44,7 +44,7 @@ tectonic_mac_core = { path = "../mac_core", version = "0.0.0-dev.0" }
 external-harfbuzz = ["tectonic_bridge_harfbuzz/external-harfbuzz"]
 
 [package.metadata.internal_dep_versions]
-tectonic_mac_core = "6932d5f15fec0fb5c219b887bdd11b72641af07a"
+tectonic_mac_core = "thiscommit:2026-04-27:052BNSA"
 tectonic_bridge_core = "thiscommit:2021-01-16:wie2Ejoh"
 tectonic_bridge_fontconfig = "89268e8317eee0e23f9c0d572aa764d4504d85b5"
 tectonic_bridge_graphite2 = "2722731f9e32c6963fe8c8566a201b33672c5c5a"

crates/xetex_layout/src/font.rs

@@ -581,7 +581,9 @@ pub(crate) fn get_file_name_from_ct_font(ct_font: &CTFont, index: &mut u32) -> O
                             *index = i as u32;
                             break;
                         }
-                        (Some(name1), Some(name2)) if &*name1.as_cstr() == name2 => {
+                        (Some(name1), Some(name2))
+                            if name1.as_cstr().is_some_and(|name1| name1 == name2) =>
+                        {
                             *index = i as u32;
                             break;
                         }

crates/xetex_layout/src/manager/mac.rs

@@ -30,12 +30,12 @@ fn find_font_with_name(name: CFString, key: FontAttribute) -> Option<CTFontDescr
 
 fn append_name_to_list(font: &CTFont, name_list: &mut Vec<CString>, name_key: FontNameKey) {
     let name = font.name(name_key);
-    if let Some(name) = name {
-        FontManager::append_to_list(name_list, name.as_cstr());
+    if let Some(name) = name.as_ref().and_then(|n| n.as_cstr()) {
+        FontManager::append_to_list(name_list, name);
     }
     let name = font.localized_name(name_key);
-    if let Some(name) = name {
-        FontManager::append_to_list(name_list, name.as_cstr());
+    if let Some(name) = name.as_ref().and_then(|n| n.as_cstr()) {
+        FontManager::append_to_list(name_list, name);
     }
 }
 
@@ -152,7 +152,7 @@ impl FontManagerBackend for MacBackend {
         // SAFETY: CFString has no generic parameters
         let ps_name = unsafe { ps_name.downcast::<CFString>() }.unwrap();
 
-        names.ps_name = Some(ps_name.get_cstring());
+        names.ps_name = ps_name.get_cstring();
 
         let font = CTFont::new_descriptor(&font, 0.0);
         append_name_to_list(&font, &mut names.full_names, FontNameKey::Full);