Update dependencies and rust version

src/window/game.rs

@@ -7,17 +7,17 @@ use crate::{
     persistence::Persistence,
 };
 use egui::{
-    menu, Align2, Button, CentralPanel, Color32, Context, Direction, Frame, TopBottomPanel, Ui,
-    Vec2, ViewportBuilder, ViewportCommand, ViewportId, Window,
+    Align2, Button, CentralPanel, Color32, Context, Direction, Frame, TopBottomPanel, Ui, Vec2,
+    ViewportBuilder, ViewportCommand, ViewportId, Window, menu,
 };
 use egui_toast::{Toast, Toasts};
 use serde::{Deserialize, Serialize};
 use winit::event_loop::EventLoopProxy;
 
 use super::{
+    AppWindow,
     game_screen::{DisplayMode, GameScreen},
     utils::UiExt as _,
-    AppWindow,
 };
 
 const COLOR_PRESETS: [[Color32; 2]; 3] = [

src/window/game_screen.rs

@@ -2,7 +2,7 @@ use std::{collections::HashMap, sync::Arc};
 
 use egui::{Color32, Rgba, Vec2, Widget};
 use serde::{Deserialize, Serialize};
-use wgpu::{util::DeviceExt as _, BindGroup, BindGroupLayout, Buffer, RenderPipeline};
+use wgpu::{BindGroup, BindGroupLayout, Buffer, RenderPipeline, util::DeviceExt as _};
 
 use crate::graphics::TextureSink;
 

src/window/utils.rs

@@ -6,9 +6,9 @@ use std::{
 
 use atoi::FromRadix16;
 use egui::{
-    ecolor::HexColor, Align, Color32, CursorIcon, Event, Frame, Key, Layout, Margin, Rect,
-    Response, RichText, Rounding, Sense, Shape, Stroke, TextEdit, Ui, UiBuilder, Vec2, Widget,
-    WidgetText,
+    Align, Color32, CursorIcon, Event, Frame, Key, Layout, Margin, Rect, Response, RichText,
+    Rounding, Sense, Shape, Stroke, TextEdit, Ui, UiBuilder, Vec2, Widget, WidgetText,
+    ecolor::HexColor,
 };
 use num_traits::{CheckedAdd, CheckedSub, One};
 
@@ -119,20 +119,20 @@ pub trait Number:
 {
 }
 impl<
-        T: Copy
-            + One
-            + CheckedAdd
-            + CheckedSub
-            + Eq
-            + Ord
-            + Display
-            + FromStr
-            + FromRadix16
-            + UpperHex
-            + Send
-            + Sync
-            + 'static,
-    > Number for T
+    T: Copy
+        + One
+        + CheckedAdd
+        + CheckedSub
+        + Eq
+        + Ord
+        + Display
+        + FromStr
+        + FromRadix16
+        + UpperHex
+        + Send
+        + Sync
+        + 'static,
+> Number for T
 {
 }
 

src/window/vip/bgmap.rs

@@ -11,8 +11,8 @@ use crate::{
     images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
     memory::{MemoryClient, MemoryView},
     window::{
-        utils::{NumberEdit, UiExt},
         AppWindow,
+        utils::{NumberEdit, UiExt},
     },
 };
 

src/window/vip/chardata.rs

@@ -12,8 +12,8 @@ use crate::{
     images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
     memory::{MemoryClient, MemoryView},
     window::{
-        utils::{NumberEdit, UiExt as _},
         AppWindow,
+        utils::{NumberEdit, UiExt as _},
     },
 };
 

src/window/vip/framebuffer.rs

@@ -11,8 +11,8 @@ use crate::{
     images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
     memory::{MemoryClient, MemoryView},
     window::{
-        utils::{NumberEdit, UiExt as _},
         AppWindow,
+        utils::{NumberEdit, UiExt as _},
     },
 };
 

src/window/vip/object.rs

@@ -11,8 +11,8 @@ use crate::{
     images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
     memory::{MemoryClient, MemoryView},
     window::{
-        utils::{NumberEdit, UiExt as _},
         AppWindow,
+        utils::{NumberEdit, UiExt as _},
     },
 };
 

src/window/vip/registers.rs

@@ -10,8 +10,8 @@ use crate::{
     emulator::SimId,
     memory::{MemoryClient, MemoryRef, MemoryValue, MemoryView},
     window::{
-        utils::{NumberEdit, UiExt},
         AppWindow,
+        utils::{NumberEdit, UiExt},
     },
 };
 

src/window/vip/utils.rs

@@ -124,7 +124,7 @@ impl CellData {
     }
 
     pub fn update(&self, source: &mut u16) -> bool {
-        let new_value = (self.palette_index as u16) << 14
+        let new_value = ((self.palette_index as u16) << 14)
             | if self.hflip { 0x2000 } else { 0x0000 }
             | if self.vflip { 0x1000 } else { 0x0000 }
             | (self.char_index as u16 & 0x07ff)

src/window/vip/world.rs

@@ -6,8 +6,8 @@ use egui::{
 };
 use egui_extras::{Column, Size, StripBuilder, TableBuilder};
 use fixed::{
-    types::extra::{U3, U9},
     FixedI32,
+    types::extra::{U3, U9},
 };
 use num_derive::{FromPrimitive, ToPrimitive};
 use num_traits::{FromPrimitive, ToPrimitive};
@@ -17,12 +17,12 @@ use crate::{
     images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
     memory::{MemoryClient, MemoryRef, MemoryView},
     window::{
-        utils::{NumberEdit, UiExt as _},
         AppWindow,
+        utils::{NumberEdit, UiExt as _},
     },
 };
 
-use super::utils::{self, shade, CellData, Object};
+use super::utils::{self, CellData, Object, shade};
 
 pub struct WorldWindow {
     sim_id: SimId,
@@ -948,7 +948,7 @@ impl WorldHeader {
         let new_value = (*source & 0x0030)
             | if self.lon { 0x8000 } else { 0x0000 }
             | if self.ron { 0x4000 } else { 0x0000 }
-            | self.mode.to_u16().unwrap() << 12
+            | (self.mode.to_u16().unwrap() << 12)
             | ((self.scx as u16) << 10)
             | ((self.scy as u16) << 8)
             | if self.over { 0x0080 } else { 0x0000 }