Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't make fonts::Features Copy

Browse source
This commit is contained in:
Antonio Scandurra 2023-03-17 13:54:56 +01:00
parent 989c9f0196
commit 4d915f4530
13 changed files with 36 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/gpui/src/font_cache.rs
View file

@ -59,21 +59,21 @@ impl FontCache {
.map(|family| family.name.clone())
}
pub fn load_family(&self, names: &[&str], features: Features) -> Result<FamilyId> {
pub fn load_family(&self, names: &[&str], features: &Features) -> Result<FamilyId> {
for name in names {
let state = self.0.upgradable_read();
if let Some(ix) = state
.families
.iter()
.position(|f| f.name.as_ref() == *name && f.font_features == features)
.position(|f| f.name.as_ref() == *name && f.font_features == *features)
{
return Ok(FamilyId(ix));
}
let mut state = RwLockUpgradableReadGuard::upgrade(state);
if let Ok(font_ids) = state.fonts.load_family(name, &features) {
if let Ok(font_ids) = state.fonts.load_family(name, features) {
if font_ids.is_empty() {
continue;
}
@ -87,7 +87,7 @@ impl FontCache {
state.families.push(Family {
name: Arc::from(*name),
font_features: features,
font_features: features.clone(),
font_ids,
});
return Ok(family_id);
@ -263,7 +263,7 @@ mod tests {
let arial = fonts
.load_family(
&["Arial"],
Features {
&Features {
calt: Some(false),
..Default::default()
},
@ -283,7 +283,7 @@ mod tests {
let arial_with_calt = fonts
.load_family(
&["Arial"],
Features {
&Features {
calt: Some(true),
..Default::default()
},