update egui usage

nickysemenza · Jul 11, 2024 · 701d278 · 701d278
1 parent 735530a
commit 701d278
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/food_ui/src/main.rs b/food_ui/src/main.rs
@@ -11,7 +11,7 @@ fn main() -> eframe::Result<()> {
         options,
         Box::new(|cc| {
             egui_extras::install_image_loaders(&cc.egui_ctx);
-            Box::<food_ui::MyApp>::default()
+            Ok(Box::<food_ui::MyApp>::default())
         }),
     )
 }
diff --git a/food_web/src/main.rs b/food_web/src/main.rs
@@ -14,7 +14,7 @@ fn main() -> eframe::Result<()> {
         native_options,
         Box::new(|cc| {
             egui_extras::install_image_loaders(&cc.egui_ctx);
-            Box::new(MyApp::new(cc))
+            Ok(Box::new(MyApp::new(cc)))
         }),
     )
 }

diff --git a/ingredient-parser/src/lib.rs b/ingredient-parser/src/lib.rs
@@ -203,10 +203,7 @@ impl IngredientParser {
                 }
             });
 
-            let mut amounts = match amounts {
-                Some(a) => a,
-                None => vec![],
-            };
+            let mut amounts = amounts.unwrap_or_default();
             amounts = match amounts2 {
                 Some(a) => amounts.into_iter().chain(a.into_iter()).collect(),
                 None => amounts,