Ready for Review: Fix font-config crash

src/window/concept_frame.rs

@@ -1,6 +1,5 @@
 use std::cell::RefCell;
 use std::cmp::max;
-use std::io::Read;
 use std::rc::Rc;
 
 use andrew::line;
@@ -14,6 +13,8 @@ use wayland_client::protocol::{
 };
 use wayland_client::{Attached, DispatchData};
 
+use log::error;
+
 use super::{
     ARGBColor, ButtonColorSpec, ButtonState, ColorSpec, Frame, FrameRequest, State, WindowState,
 };
@@ -639,22 +640,20 @@ impl Frame for ConceptFrame {
                             // If theres no stored font data, find the first ttf regular sans font and
                             // store it
                             if self.font_data.is_none() {
-                                if let Some(font) = fontconfig::FontConfig::new()
-                                    .unwrap()
-                                    .get_regular_family_fonts(&font_face)
-                                    .unwrap()
-                                    .iter()
-                                    .find(|p| p.extension().map(|e| e == "ttf").unwrap_or(false))
-                                {
-                                    let mut font_data = Vec::new();
-                                    if let Ok(mut file) = ::std::fs::File::open(font) {
-                                        match file.read_to_end(&mut font_data) {
-                                            Ok(_) => self.font_data = Some(font_data),
-                                            Err(err) => {
-                                                log::error!("Could not read font file: {}", err)
-                                            }
-                                        }
-                                    }
+                                let font_config = fontconfig::FontConfig::new().ok();
+                                let fonts = font_config.and_then(|font_config| {
+                                    font_config.get_regular_family_fonts(&font_face).ok()
+                                });
+                                let font = fonts.and_then(|regular_family_fonts| {
+                                    regular_family_fonts
+                                        .iter()
+                                        .cloned()
+                                        .find(|p| p.extension().map_or(false, |e| e == "ttf"))
+                                });
+                                let font_bytes = font.and_then(|font| std::fs::read(font).ok());
+                                match font_bytes {
+                                    Some(bytes) => self.font_data = Some(bytes),
+                                    None => error!("No font could be found"),
                                 }
                             }
 
@@ -714,7 +713,7 @@ impl Frame for ConceptFrame {
                     }
                 }
                 if let Err(err) = mmap.flush() {
-                    log::error!("Failed to flush frame memory map: {}", err);
+                    error!("Failed to flush frame memory map: {}", err);
                 }
             }
 
@@ -928,7 +927,7 @@ fn change_pointer(pointer: &ThemedPointer, inner: &Inner, location: Location, se
     };
 
     if pointer.set_cursor(name, serial).is_err() {
-        log::error!("Failed to set cursor");
+        error!("Failed to set cursor");
     }
 }
 

src/window/mod.rs

@@ -169,6 +169,7 @@ impl<F: Frame + 'static> Window<F> {
     ///
     /// Providing non `None` value for `theme_manager` should prevent theming pointer
     /// over the `surface`.
+    #[allow(clippy::match_like_matches_macro)]
     fn init_with_decorations<Impl, E>(
         env: &crate::environment::Environment<E>,
         surface: wl_surface::WlSurface,