From 51938ef9f4254322e0fd3b795789e96aee48c6f3 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Sat, 11 Nov 2023 22:02:27 +0100 Subject: [PATCH] Remove unnecessary std::result:: Prefix --- crates/eframe/src/lib.rs | 2 +- crates/eframe/src/native/run.rs | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/crates/eframe/src/lib.rs b/crates/eframe/src/lib.rs index 2c36d428782..ea1d7ced951 100644 --- a/crates/eframe/src/lib.rs +++ b/crates/eframe/src/lib.rs @@ -320,7 +320,7 @@ pub enum Error { } /// Short for `Result`. -pub type Result = std::result::Result; +pub type Result = std::result::Result; // --------------------------------------------------------------------------- diff --git a/crates/eframe/src/native/run.rs b/crates/eframe/src/native/run.rs index 55df0fe1b7e..fc7aaa78b41 100644 --- a/crates/eframe/src/native/run.rs +++ b/crates/eframe/src/native/run.rs @@ -1927,8 +1927,7 @@ mod wgpu_integration { storage: Option<&dyn epi::Storage>, title: &str, native_options: &mut NativeOptions, - ) -> std::result::Result<(winit::window::Window, ViewportBuilder), winit::error::OsError> - { + ) -> Result<(winit::window::Window, ViewportBuilder), winit::error::OsError> { crate::profile_function!(); let window_settings = epi_integration::load_window_settings(storage); @@ -2004,7 +2003,7 @@ mod wgpu_integration { } } - fn set_window(&mut self, id: ViewportId) -> std::result::Result<(), egui_wgpu::WgpuError> { + fn set_window(&mut self, id: ViewportId) -> Result<(), egui_wgpu::WgpuError> { if let Some(running) = &mut self.running { crate::profile_function!(); let mut shared = running.shared.borrow_mut(); @@ -2023,7 +2022,7 @@ mod wgpu_integration { } #[cfg(target_os = "android")] - fn drop_window(&mut self) -> std::result::Result<(), egui_wgpu::WgpuError> { + fn drop_window(&mut self) -> Result<(), egui_wgpu::WgpuError> { if let Some(running) = &mut self.running { let mut shared = running.shared.borrow_mut(); shared.viewports.remove(&ViewportId::ROOT); @@ -2038,7 +2037,7 @@ mod wgpu_integration { storage: Option>, window: winit::window::Window, builder: ViewportBuilder, - ) -> std::result::Result<(), egui_wgpu::WgpuError> { + ) -> Result<(), egui_wgpu::WgpuError> { crate::profile_function!(); #[allow(unsafe_code, unused_mut, unused_unsafe)]