eframe::Result is now short for eframe::Result<()> (emilk#4706)

Author: emilk

crates/eframe/src/lib.rs

@@ -197,7 +197,7 @@ pub mod icon_data;
 /// ``` no_run
 /// use eframe::egui;
 ///
-/// fn main() -> eframe::Result<()> {
+/// fn main() -> eframe::Result {
 ///     let native_options = eframe::NativeOptions::default();
 ///     eframe::run_native("MyApp", native_options, Box::new(|cc| Ok(Box::new(MyEguiApp::new(cc)))))
 /// }
@@ -233,7 +233,7 @@ pub fn run_native(
     app_name: &str,
     mut native_options: NativeOptions,
     app_creator: AppCreator,
-) -> Result<()> {
+) -> Result {
     #[cfg(not(feature = "__screenshot"))]
     assert!(
         std::env::var("EFRAME_SCREENSHOT_TO").is_err(),
@@ -278,7 +278,7 @@ pub fn run_native(
 ///
 /// # Example
 /// ``` no_run
-/// fn main() -> eframe::Result<()> {
+/// fn main() -> eframe::Result {
 ///     // Our application state:
 ///     let mut name = "Arthur".to_owned();
 ///     let mut age = 42;
@@ -310,7 +310,7 @@ pub fn run_simple_native(
     app_name: &str,
     native_options: NativeOptions,
     update_fun: impl FnMut(&egui::Context, &mut Frame) + 'static,
-) -> Result<()> {
+) -> Result {
     struct SimpleApp<U> {
         update_fun: U,
     }
@@ -445,7 +445,7 @@ impl std::fmt::Display for Error {
 }
 
 /// Short for `Result<T, eframe::Error>`.
-pub type Result<T, E = Error> = std::result::Result<T, E>;
+pub type Result<T = (), E = Error> = std::result::Result<T, E>;
 
 // ---------------------------------------------------------------------------
 

crates/eframe/src/native/glow_integration.rs

@@ -1088,7 +1088,7 @@ impl GlutinWindowContext {
         &mut self,
         viewport_id: ViewportId,
         event_loop: &EventLoopWindowTarget<UserEvent>,
-    ) -> Result<()> {
+    ) -> Result {
         crate::profile_function!();
 
         let viewport = self
@@ -1188,7 +1188,7 @@ impl GlutinWindowContext {
     }
 
     /// only applies for android. but we basically drop surface + window and make context not current
-    fn on_suspend(&mut self) -> Result<()> {
+    fn on_suspend(&mut self) -> Result {
         log::debug!("received suspend event. dropping window and surface");
         for viewport in self.viewports.values_mut() {
             viewport.gl_surface = None;

crates/eframe/src/native/run.rs

@@ -60,10 +60,7 @@ fn with_event_loop<R>(
 }
 
 #[cfg(not(target_os = "ios"))]
-fn run_and_return(
-    event_loop: &mut EventLoop<UserEvent>,
-    mut winit_app: impl WinitApp,
-) -> Result<()> {
+fn run_and_return(event_loop: &mut EventLoop<UserEvent>, mut winit_app: impl WinitApp) -> Result {
     use winit::{event_loop::ControlFlow, platform::run_on_demand::EventLoopExtRunOnDemand};
 
     log::trace!("Entering the winit event loop (run_on_demand)…");
@@ -234,7 +231,7 @@ fn run_and_return(
 fn run_and_exit(
     event_loop: EventLoop<UserEvent>,
     mut winit_app: impl WinitApp + 'static,
-) -> Result<()> {
+) -> Result {
     use winit::event_loop::ControlFlow;
     log::trace!("Entering the winit event loop (run)…");
 
@@ -390,7 +387,7 @@ pub fn run_glow(
     app_name: &str,
     mut native_options: epi::NativeOptions,
     app_creator: epi::AppCreator,
-) -> Result<()> {
+) -> Result {
     #![allow(clippy::needless_return_with_question_mark)] // False positive
 
     use super::glow_integration::GlowWinitApp;
@@ -415,7 +412,7 @@ pub fn run_wgpu(
     app_name: &str,
     mut native_options: epi::NativeOptions,
     app_creator: epi::AppCreator,
-) -> Result<()> {
+) -> Result {
     #![allow(clippy::needless_return_with_question_mark)] // False positive
 
     use super::wgpu_integration::WgpuWinitApp;

crates/egui_demo_app/src/main.rs

@@ -5,7 +5,7 @@
 #![allow(clippy::never_loop)] // False positive
 
 // When compiling natively:
-fn main() -> Result<(), eframe::Error> {
+fn main() -> eframe::Result {
     for arg in std::env::args().skip(1) {
         match arg.as_str() {
             "--profile" => {

examples/confirm_exit/src/main.rs

@@ -3,7 +3,7 @@
 
 use eframe::egui;
 
-fn main() -> Result<(), eframe::Error> {
+fn main() -> eframe::Result {
     env_logger::init(); // Log to stderr (if you run with `RUST_LOG=debug`).
     let options = eframe::NativeOptions {
         viewport: egui::ViewportBuilder::default().with_inner_size([320.0, 240.0]),

examples/custom_3d_glow/src/main.rs

@@ -8,7 +8,7 @@ use eframe::{egui, egui_glow, glow};
 use egui::mutex::Mutex;
 use std::sync::Arc;
 
-fn main() -> Result<(), eframe::Error> {
+fn main() -> eframe::Result {
     env_logger::init(); // Log to stderr (if you run with `RUST_LOG=debug`).
     let options = eframe::NativeOptions {
         viewport: egui::ViewportBuilder::default().with_inner_size([350.0, 380.0]),

examples/custom_font/src/main.rs

@@ -3,7 +3,7 @@
 
 use eframe::egui;
 
-fn main() -> Result<(), eframe::Error> {
+fn main() -> eframe::Result {
     env_logger::init(); // Log to stderr (if you run with `RUST_LOG=debug`).
     let options = eframe::NativeOptions {
         viewport: egui::ViewportBuilder::default().with_inner_size([320.0, 240.0]),

examples/custom_font_style/src/main.rs

@@ -4,7 +4,7 @@
 use eframe::egui;
 use egui::{FontFamily, FontId, RichText, TextStyle};
 
-fn main() -> Result<(), eframe::Error> {
+fn main() -> eframe::Result {
     env_logger::init(); // Log to stderr (if you run with `RUST_LOG=debug`).
     let options = eframe::NativeOptions::default();
 

examples/custom_keypad/src/main.rs

@@ -5,7 +5,7 @@ use eframe::egui;
 mod keypad;
 use keypad::Keypad;
 
-fn main() -> Result<(), eframe::Error> {
+fn main() -> eframe::Result {
     env_logger::init(); // Log to stderr (if you run with `RUST_LOG=debug`).
     let options = eframe::NativeOptions {
         viewport: egui::ViewportBuilder::default().with_inner_size([640.0, 480.0]),

examples/custom_plot_manipulation/src/main.rs

@@ -5,7 +5,7 @@
 use eframe::egui::{self, DragValue, Event, Vec2};
 use egui_plot::{Legend, Line, PlotPoints};
 
-fn main() -> Result<(), eframe::Error> {
+fn main() -> eframe::Result {
     env_logger::init(); // Log to stderr (if you run with `RUST_LOG=debug`).
     let options = eframe::NativeOptions::default();
     eframe::run_native(