From 23ad0a2c58393bfff7c1b5b8927524257ffcae5f Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Tue, 24 Oct 2023 13:31:01 +0200 Subject: [PATCH] Return a `Result` from `load_embedded_fonts` --- crates/storybook2/src/storybook2.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/storybook2/src/storybook2.rs b/crates/storybook2/src/storybook2.rs index f8b8b747e9960474e68c06bd4eb9f05d2b188d01..bbd62230cc21622dbb9f2fff724db9c1557af5af 100644 --- a/crates/storybook2/src/storybook2.rs +++ b/crates/storybook2/src/storybook2.rs @@ -54,7 +54,7 @@ fn main() { let asset_source = Arc::new(Assets); gpui3::App::production(asset_source).run(move |cx| { - load_embedded_fonts(cx); + load_embedded_fonts(cx).unwrap(); let selector = story_selector.unwrap_or(StorySelector::Component(ComponentStory::Workspace)); @@ -114,16 +114,16 @@ impl StoryWrapper { } } -fn load_embedded_fonts(cx: &AppContext) { - let font_paths = Assets.list(&"fonts".into()).unwrap(); +fn load_embedded_fonts(cx: &AppContext) -> gpui3::Result<()> { + let font_paths = Assets.list(&"fonts".into())?; let mut embedded_fonts = Vec::new(); for font_path in &font_paths { if font_path.ends_with(".ttf") { let font_path = &*font_path; - let font_bytes = Assets.load(font_path).unwrap().to_vec(); + let font_bytes = Assets.load(font_path)?.to_vec(); embedded_fonts.push(Arc::from(font_bytes)); } } - cx.text_system().add_fonts(&embedded_fonts).unwrap(); + cx.text_system().add_fonts(&embedded_fonts) }