language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-08-04 10:50:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Workaround compiler bug with Rust 1.64 and aarch64

Browse source
This commit is contained in:
Olivier Goffart 2022-11-07 12:50:09 +01:00
parent 53739314ee
commit ca616857b1
1 changed files with 41 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

78
internal/compiler/passes/embed_glyphs.rs
View file

@ -70,43 +70,7 @@ pub fn embed_glyphs<'a>(
fontdb.set_sans_serif_family(default_sans_serif_family);
}
let fallback_families = if cfg!(target_os = "macos") {
["Menlo", "Apple Symbols", "Apple Color Emoji"].iter()
} else if cfg!(not(any(
target_family = "windows",
target_os = "macos",
target_os = "ios",
target_arch = "wasm32"
))) {
["Noto Sans Symbols", "Noto Sans Symbols2", "DejaVu Sans"].iter()
} else {
[].iter()
};
let fallback_fonts = fallback_families
.filter_map(|fallback_family| {
fontdb
.query(&fontdb::Query {
families: &[fontdb::Family::Name(*fallback_family)],
..Default::default()
})
.and_then(|face_id| {
fontdb
.with_face_data(face_id, |face_data, face_index| {
fontdue::Font::from_bytes(
face_data,
fontdue::FontSettings { collection_index: face_index, scale: 40. },
)
.ok()
})
.flatten()
})
})
.collect::<Vec<_>>();
let fallback_font = fontdb
.query(&fontdb::Query { families: &[fontdb::Family::SansSerif], ..Default::default() })
.expect("internal error: Failed to locate default system font");
let (fallback_fonts, fallback_font) = get_fallback_fonts(&fontdb);
let mut custom_fonts = Vec::new();
@ -227,6 +191,46 @@ pub fn embed_glyphs<'a>(
}
}
#[inline(never)] // workaround https://github.com/rust-lang/rust/issues/104099
fn get_fallback_fonts(fontdb: &fontdb::Database) -> (Vec<fontdue::Font>, fontdb::ID) {
let fallback_families = if cfg!(target_os = "macos") {
["Menlo", "Apple Symbols", "Apple Color Emoji"].iter()
} else if cfg!(not(any(
target_family = "windows",
target_os = "macos",
target_os = "ios",
target_arch = "wasm32"
))) {
["Noto Sans Symbols", "Noto Sans Symbols2", "DejaVu Sans"].iter()
} else {
[].iter()
};
let fallback_fonts = fallback_families
.filter_map(|fallback_family| {
fontdb
.query(&fontdb::Query {
families: &[fontdb::Family::Name(*fallback_family)],
..Default::default()
})
.and_then(|face_id| {
fontdb
.with_face_data(face_id, |face_data, face_index| {
fontdue::Font::from_bytes(
face_data,
fontdue::FontSettings { collection_index: face_index, scale: 40. },
)
.ok()
})
.flatten()
})
})
.collect::<Vec<_>>();
let fallback_font = fontdb
.query(&fontdb::Query { families: &[fontdb::Family::SansSerif], ..Default::default() })
.expect("internal error: Failed to locate default system font");
(fallback_fonts, fallback_font)
}
#[cfg(not(target_arch = "wasm32"))]
fn embed_font(
family_name: String,