diff options
| author | HampusM <hampus@hampusmat.com> | 2026-07-06 22:02:37 +0200 |
|---|---|---|
| committer | HampusM <hampus@hampusmat.com> | 2026-07-06 22:02:37 +0200 |
| commit | ddba6a25923bfc8f3204d88c4b1ae3dfd26c05e6 (patch) | |
| tree | cbe17837ac41ea695b95f6ac536c2adae5eaa874 /src/main.rs | |
| parent | 5a07a635486c3a072e6578fbb725da1bab9a774c (diff) | |
refactor: make work with Error rewrite
Diffstat (limited to 'src/main.rs')
| -rw-r--r-- | src/main.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main.rs b/src/main.rs index c895a98..13ec797 100644 --- a/src/main.rs +++ b/src/main.rs @@ -13,7 +13,7 @@ use engine::camera::{Active as ActiveCamera, Camera}; use engine::color::Color; use engine::data_types::dimens::Dimens3; use engine::ecs::actions::Actions; -use engine::ecs::error::Error as EcsError; +use engine::ecs::error::Context as _; use engine::ecs::phase::START as START_PHASE; use engine::ecs::sole::Single; use engine::image::{Format as ImageFormat, Image}; @@ -37,7 +37,7 @@ use engine::windowing::window::{ CursorGrabMode as WindowCursorGrabMode, Icon as WindowIcon, }; -use engine::Engine; +use engine::{Engine, Error as EngineError}; use tracing::level_filters::LevelFilter; use tracing_subscriber::fmt::time::ChronoLocal; use tracing_subscriber::layer::SubscriberExt; @@ -99,7 +99,7 @@ impl engine::ecs::extension::Extension for Application } } -fn init(mut assets: Single<Assets>, mut actions: Actions) -> Result<(), EcsError> +fn init(mut assets: Single<Assets>, mut actions: Actions) -> Result<(), EngineError> { actions.spawn(( WindowCreationAttributes::default() @@ -109,7 +109,7 @@ fn init(mut assets: Single<Assets>, mut actions: Actions) -> Result<(), EcsError Cursor::new(include_bytes!("../res/icon.ico")), ImageFormat::Ico, ) - .map_err(|_| "Invalid icon image")?, + .with_context(|| "Invalid icon image")?, ))) .with_cursor_visible(false) .with_cursor_grab_mode(WindowCursorGrabMode::Locked), |
