migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-01 22:30:03 -04:00
Code Activity

Remove unnecessary std::result:: Prefix

Browse Source
This commit is contained in:
Emil Ernerfeldt
2023-11-11 22:02:27 +01:00
parent 922c372df4
commit 51938ef9f4
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/eframe/src/lib.rs
View File

@@ -320,7 +320,7 @@ pub enum Error {
} }
/// Short for `Result<T, eframe::Error>`. /// Short for `Result<T, eframe::Error>`.
pub type Result<T> = std::result::Result<T, Error>; pub type Result<T, E = Error> = std::result::Result<T, E>;
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------

9
crates/eframe/src/native/run.rs
View File

@@ -1927,8 +1927,7 @@ mod wgpu_integration {
storage: Option<&dyn epi::Storage>, storage: Option<&dyn epi::Storage>,
title: &str, title: &str,
native_options: &mut NativeOptions, 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!(); crate::profile_function!();
let window_settings = epi_integration::load_window_settings(storage); 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 { if let Some(running) = &mut self.running {
crate::profile_function!(); crate::profile_function!();
let mut shared = running.shared.borrow_mut(); let mut shared = running.shared.borrow_mut();
@@ -2023,7 +2022,7 @@ mod wgpu_integration {
} }
#[cfg(target_os = "android")] #[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 { if let Some(running) = &mut self.running {
let mut shared = running.shared.borrow_mut(); let mut shared = running.shared.borrow_mut();
shared.viewports.remove(&ViewportId::ROOT); shared.viewports.remove(&ViewportId::ROOT);
@@ -2038,7 +2037,7 @@ mod wgpu_integration {
storage: Option<Box<dyn epi::Storage>>, storage: Option<Box<dyn epi::Storage>>,
window: winit::window::Window, window: winit::window::Window,
builder: ViewportBuilder, builder: ViewportBuilder,
) -> std::result::Result<(), egui_wgpu::WgpuError> { ) -> Result<(), egui_wgpu::WgpuError> {
crate::profile_function!(); crate::profile_function!();
#[allow(unsafe_code, unused_mut, unused_unsafe)] #[allow(unsafe_code, unused_mut, unused_unsafe)]