Run cargo fmt

src/font/system/std.rs

@@ -59,7 +59,9 @@ impl FontSystem {
             //TODO only do this on demand!
             for i in 0..db.faces().len() {
                 let id = db.faces()[i].id;
-                unsafe { db.make_shared_face_data(id); }
+                unsafe {
+                    db.make_shared_face_data(id);
+                }
             }
 
             log::info!(
@@ -69,12 +71,15 @@ impl FontSystem {
             );
         }
 
-        Self(FontSystemInnerBuilder {
-            locale,
-            db,
-            font_cache_builder: |_| Mutex::new(HashMap::new()),
-            font_matches_cache_builder: |_, _| Mutex::new(HashMap::new())
-        }.build())
+        Self(
+            FontSystemInnerBuilder {
+                locale,
+                db,
+                font_cache_builder: |_| Mutex::new(HashMap::new()),
+                font_matches_cache_builder: |_, _| Mutex::new(HashMap::new()),
+            }
+            .build(),
+        )
     }
 
     pub fn locale(&self) -> &str {
@@ -93,53 +98,66 @@ impl FontSystem {
     // Clippy false positive
     #[allow(clippy::needless_lifetimes)]
     pub fn get_font<'a>(&'a self, id: fontdb::ID) -> Option<Arc<Font<'a>>> {
-        self.0.with(|fields| {
-            get_font(&fields, id)
-        })
+        self.0.with(|fields| get_font(&fields, id))
     }
 
     pub fn get_font_matches<'a>(&'a self, attrs: Attrs) -> Arc<FontMatches<'a>> {
         self.0.with(|fields| {
-            let mut font_matches_cache = fields.font_matches_cache.lock().expect("failed to lock font matches cache");
+            let mut font_matches_cache = fields
+                .font_matches_cache
+                .lock()
+                .expect("failed to lock font matches cache");
             //TODO: do not create AttrsOwned unless entry does not already exist
-            font_matches_cache.entry(AttrsOwned::new(attrs)).or_insert_with(|| {
-                let now = std::time::Instant::now();
+            font_matches_cache
+                .entry(AttrsOwned::new(attrs))
+                .or_insert_with(|| {
+                    let now = std::time::Instant::now();
 
-                let mut fonts = Vec::new();
-                for face in fields.db.faces() {
-                    if !attrs.matches(face) {
-                        continue;
+                    let mut fonts = Vec::new();
+                    for face in fields.db.faces() {
+                        if !attrs.matches(face) {
+                            continue;
+                        }
+
+                        if let Some(font) = get_font(&fields, face.id) {
+                            fonts.push(font);
+                        }
                     }
 
-                    if let Some(font) = get_font(&fields, face.id) {
-                        fonts.push(font);
-                    }
-                }
+                    let font_matches = Arc::new(FontMatches {
+                        locale: fields.locale,
+                        default_family: fields.db.family_name(&attrs.family).to_string(),
+                        fonts,
+                    });
 
-                let font_matches = Arc::new(FontMatches {
-                    locale: fields.locale,
-                    default_family: fields.db.family_name(&attrs.family).to_string(),
-                    fonts
-                });
+                    let elapsed = now.elapsed();
+                    log::debug!("font matches for {:?} in {:?}", attrs, elapsed);
 
-                let elapsed = now.elapsed();
-                log::debug!("font matches for {:?} in {:?}", attrs, elapsed);
-
-                font_matches
-            }).clone()
+                    font_matches
+                })
+                .clone()
         })
     }
 }
 
-fn get_font<'b>(fields: &ouroboros_impl_font_system_inner::BorrowedFields<'_, 'b>, id: fontdb::ID) -> Option<Arc<Font<'b>>> {
-    fields.font_cache.lock().expect("failed to lock font cache").entry(id).or_insert_with(|| {
-        let face = fields.db.face(id)?;
-        match Font::new(face) {
-            Some(font) => Some(Arc::new(font)),
-            None => {
-                log::warn!("failed to load font '{}'", face.post_script_name);
-                None
+fn get_font<'b>(
+    fields: &ouroboros_impl_font_system_inner::BorrowedFields<'_, 'b>,
+    id: fontdb::ID,
+) -> Option<Arc<Font<'b>>> {
+    fields
+        .font_cache
+        .lock()
+        .expect("failed to lock font cache")
+        .entry(id)
+        .or_insert_with(|| {
+            let face = fields.db.face(id)?;
+            match Font::new(face) {
+                Some(font) => Some(Arc::new(font)),
+                None => {
+                    log::warn!("failed to load font '{}'", face.post_script_name);
+                    None
+                }
             }
-        }
-    }).clone()
+        })
+        .clone()
 }