chore: more clippy

galister · Mar 23, 2024 · 7ab0360 · 7ab0360
1 parent e70aaa0
commit 7ab0360
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/gui/font.rs b/src/gui/font.rs
@@ -113,7 +113,7 @@ impl FontCache {
 
         let pattern = pattern.font_match(&mut self.fc);
 
-        for path in pattern.filename().iter() {
+        if let Some(path) = pattern.filename() {
             log::debug!(
                 "Loading font: {} {}pt",
                 pattern.name().unwrap_or(path),
@@ -126,14 +126,16 @@ impl FontCache {
                 Ok(face) => face,
                 Err(e) => {
                     log::warn!("Failed to load font at {}: {:?}", path, e);
-                    break;
+                    coll.cp_map.insert(cp, 0);
+                    return 0;
                 }
             };
             match face.set_char_size(size << 6, size << 6, 96, 96) {
                 Ok(_) => {}
                 Err(e) => {
                     log::warn!("Failed to set font size: {:?}", e);
-                    break;
+                    coll.cp_map.insert(cp, 0);
+                    return 0;
                 }
             };