Simplification, now using ??.

plotters-rs · Oct 18, 2023 · 4ac399e · 4ac399e
1 parent 33257bf
commit 4ac399e
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/plotters/src/style/font/ttf.rs b/plotters/src/style/font/ttf.rs
@@ -132,16 +132,13 @@ fn load_font_data(face: FontFamily, style: FontStyle) -> FontResult<FontExt> {
     // Then we need to check if the data cache contains the font data
     let cache = DATA_CACHE.read().unwrap();
     if let Some(data) = cache.get(Borrow::<str>::borrow(&key)) {
-        let font_ext = data.clone().map(|handle| {
+        data.clone().map(|handle| {
             handle
                 .load()
                 .map(FontExt::new)
                 .map_err(|e| FontError::FontLoadError(Arc::new(e)))
-        })?;
+        })??;
 
-        if font_ext.is_err() {
-          return font_ext;
-        }
     }
     drop(cache);