Merge pull request #313 from Limit-Theory-Redux/haron/rust-1.80-fixes

Fix warning in the new Rust 1.80

Author: HaronK

engine/lib/phx/src/engine/engine.rs

@@ -10,13 +10,13 @@ use winit::event_loop::*;
 use internal::ConvertIntoString;
 
 use crate::common::*;
+use crate::event_bus::*;
 use crate::input::*;
 use crate::logging::init_log;
 use crate::rf::*;
 use crate::system::*;
 use crate::ui::hmgui::HmGui;
 use crate::window::*;
-use crate::event_bus::*;
 
 use super::MainLoop;
 

engine/lib/phx/src/event_bus/event_data.rs

@@ -20,4 +20,4 @@ impl EventData {
     pub fn get_tunnel_id(&self) -> u32 {
         self.tunnel_id
     }
-}
+}

engine/lib/phx/src/event_bus/frame_stage.rs

@@ -22,4 +22,4 @@ pub enum FrameStage {
     Input,
     // After input handling
     PostInput,
-}
+}

engine/lib/phx/src/event_bus/frame_timer.rs

@@ -2,8 +2,8 @@ use std::collections::HashMap;
 
 use strum::IntoEnumIterator;
 
-use crate::system::TimeStamp;
 use super::FrameStage;
+use crate::system::TimeStamp;
 
 pub struct FrameTimer {
     pub(crate) last_update: HashMap<FrameStage, TimeStamp>,
@@ -26,4 +26,4 @@ impl FrameTimer {
         self.last_update.insert(stage, now);
         delta
     }
-}
+}

engine/lib/phx/src/event_bus/message_request.rs

@@ -41,4 +41,4 @@ impl PartialOrd for MessageRequest {
     fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
         Some(self.cmp(other))
     }
-}
+}

engine/lib/phx/src/event_bus/mod.rs

@@ -1,18 +1,18 @@
 use std::collections::{hash_map::Entry, BinaryHeap, HashMap, VecDeque};
 use std::sync::atomic::{AtomicU32, Ordering};
 
-use strum::IntoEnumIterator;
 use internal::ConvertIntoString;
+use strum::IntoEnumIterator;
 use tracing::{info, warn};
 
-use event_data::*;
 use event::*;
+use event_data::*;
 use frame_stage::*;
 use frame_timer::*;
 use message_request::*;
 
-mod event_data;
 mod event;
+mod event_data;
 mod frame_stage;
 mod frame_timer;
 mod message_request;

engine/lib/phx/src/lib.rs

@@ -8,8 +8,8 @@
 pub mod audio;
 pub mod common;
 pub mod engine;
-pub mod event_bus;
 pub mod error;
+pub mod event_bus;
 pub mod input;
 pub mod logging;
 pub mod math;

engine/lib/phx/src/window/winit_window.rs

@@ -177,9 +177,7 @@ impl WinitWindow {
 
         window_attributes = window_attributes.with_title(window.title.as_str());
 
-        let template = ConfigTemplateBuilder::new()
-            .with_alpha_size(8)
-            .with_transparency(cfg!(cgl_backend));
+        let template = ConfigTemplateBuilder::new().with_alpha_size(8);
         let display_builder = DisplayBuilder::new().with_window_attributes(Some(window_attributes));
         let (winit_window, gl_config) = display_builder
             .build(event_loop, template, |configs| {