Update to latest egui, with added error handling in eframe

Cargo.toml

@@ -25,14 +25,14 @@ opt-level = 2
 debug = true
 
 [patch.crates-io]
-# # 2022-12-08 - egui style tweaks
-# ecolor = { git = "https://github.com/emilk/egui", rev = "da0a1787019cb28c26e969bc537a191f2ed302f3" }
-# eframe = { git = "https://github.com/emilk/egui", rev = "da0a1787019cb28c26e969bc537a191f2ed302f3" }
-# egui = { git = "https://github.com/emilk/egui", rev = "da0a1787019cb28c26e969bc537a191f2ed302f3" }
-# egui_extras = { git = "https://github.com/emilk/egui", rev = "da0a1787019cb28c26e969bc537a191f2ed302f3" }
-# egui-wgpu = { git = "https://github.com/emilk/egui", rev = "da0a1787019cb28c26e969bc537a191f2ed302f3" }
-# emath = { git = "https://github.com/emilk/egui", rev = "da0a1787019cb28c26e969bc537a191f2ed302f3" }
-# epaint = { git = "https://github.com/emilk/egui", rev = "da0a1787019cb28c26e969bc537a191f2ed302f3" }
+# # 2022-12-12 - eframe::run_return can return an error
+ecolor = { git = "https://github.com/emilk/egui", rev = "e0b5bb17e5851fb5a6904847e353aa74db3441bb" }
+eframe = { git = "https://github.com/emilk/egui", rev = "e0b5bb17e5851fb5a6904847e353aa74db3441bb" }
+egui = { git = "https://github.com/emilk/egui", rev = "e0b5bb17e5851fb5a6904847e353aa74db3441bb" }
+egui_extras = { git = "https://github.com/emilk/egui", rev = "e0b5bb17e5851fb5a6904847e353aa74db3441bb" }
+egui-wgpu = { git = "https://github.com/emilk/egui", rev = "e0b5bb17e5851fb5a6904847e353aa74db3441bb" }
+emath = { git = "https://github.com/emilk/egui", rev = "e0b5bb17e5851fb5a6904847e353aa74db3441bb" }
+epaint = { git = "https://github.com/emilk/egui", rev = "e0b5bb17e5851fb5a6904847e353aa74db3441bb" }
 
 # ecolor = { path = "../../egui/crates/ecolor" }
 # eframe = { path = "../../egui/crates/eframe" }

crates/re_ui/examples/re_ui_example.rs

@@ -1,4 +1,4 @@
-fn main() {
+fn main() -> eframe::Result<()> {
     let native_options = eframe::NativeOptions {
         initial_window_size: Some([1200.0, 800.0].into()),
         follow_system_theme: false,
@@ -23,7 +23,7 @@ fn main() {
                 bottom_panel: true,
             })
         }),
-    );
+    )
 }
 
 pub struct ExampleApp {

crates/re_viewer/src/native.rs

@@ -3,7 +3,7 @@ use re_log_types::LogMsg;
 type AppCreator =
     Box<dyn FnOnce(&eframe::CreationContext<'_>, re_ui::ReUi) -> Box<dyn eframe::App>>;
 
-pub fn run_native_app(app_creator: AppCreator) {
+pub fn run_native_app(app_creator: AppCreator) -> eframe::Result<()> {
     let native_options = eframe::NativeOptions {
         depth_buffer: 0,
         multisampling: 0, // the 3D views do their own MSAA
@@ -29,13 +29,13 @@ pub fn run_native_app(app_creator: AppCreator) {
             let re_ui = crate::customize_eframe(cc);
             app_creator(cc, re_ui)
         }),
-    );
+    )
 }
 
 pub fn run_native_viewer_with_messages(
     startup_options: crate::StartupOptions,
     log_messages: Vec<LogMsg>,
-) {
+) -> eframe::Result<()> {
     let (tx, rx) = re_smart_channel::smart_channel(re_smart_channel::Source::File);
     for log_msg in log_messages {
         tx.send(log_msg).ok();
@@ -47,5 +47,5 @@ pub fn run_native_viewer_with_messages(
             cc.storage,
             rx,
         ))
-    }));
+    }))
 }

crates/rerun/src/lib.rs

@@ -152,7 +152,7 @@ async fn run_impl(args: Args) -> anyhow::Result<()> {
             let mut app = re_viewer::App::from_receiver(startup_options, re_ui, cc.storage, rx);
             app.set_profiler(profiler);
             Box::new(app)
-        }));
+        }))?;
     }
     Ok(())
 }
@@ -180,7 +180,7 @@ async fn connect_to_ws_url(
             );
             app.set_profiler(profiler);
             Box::new(app)
-        }));
+        }))?;
     }
     Ok(())
 }

crates/rerun_sdk/Cargo.toml

@@ -10,7 +10,7 @@ publish = false
 default = ["re_viewer"]
 
 ## Support for the viewer
-re_viewer = ["dep:re_viewer"]
+re_viewer = ["dep:re_viewer", "dep:eframe"]
 
 ## Support serving a web viewer over HTTP.
 ##
@@ -41,6 +41,8 @@ re_viewer = { path = "../re_viewer", features = [
   "puffin",
 ], default-features = false, optional = true }
 re_web_server = { path = "../re_web_server", optional = true }
+
+eframe = { verison = "0.20", default-features = false, optional = true }
 webbrowser = { version = "0.8", optional = true }
 
 # Native dependencies:

crates/rerun_sdk/examples/log_rects.rs

@@ -127,7 +127,10 @@ fn main() -> std::process::ExitCode {
         session.flush();
     } else {
         let log_messages = session.drain_log_messages_buffer();
-        rerun_sdk::viewer::show(log_messages);
+        if let Err(err) = rerun_sdk::viewer::show(log_messages) {
+            eprintln!("Failed to start viewer: {err}");
+            return std::process::ExitCode::FAILURE;
+        }
     }
 
     std::process::ExitCode::SUCCESS

crates/rerun_sdk/src/viewer.rs

@@ -1,7 +1,7 @@
 use re_log_types::LogMsg;
 
 #[cfg(feature = "re_viewer")]
-pub fn show(log_messages: Vec<LogMsg>) {
+pub fn show(log_messages: Vec<LogMsg>) -> eframe::Result<()> {
     let startup_options = re_viewer::StartupOptions::default();
-    re_viewer::run_native_viewer_with_messages(startup_options, log_messages);
+    re_viewer::run_native_viewer_with_messages(startup_options, log_messages)
 }

rerun_py/src/python_bridge.rs

@@ -356,11 +356,11 @@ fn show() -> PyResult<()> {
 
     if log_messages.is_empty() {
         re_log::info!("Nothing logged, so nothing to show");
+        Ok(())
     } else {
-        rerun_sdk::viewer::show(log_messages);
+        rerun_sdk::viewer::show(log_messages)
+            .map_err(|err| PyRuntimeError::new_err(format!("Failed to show Rerun Viewer: {err}")))
     }
-
-    Ok(())
 }
 
 #[pyfunction]