From 72456b48e5dfcc362ac3bba3fd6f224127da07fe Mon Sep 17 00:00:00 2001 From: Logan McNaughton <848146+loganmc10@users.noreply.github.com> Date: Wed, 2 Jul 2025 22:15:15 +0200 Subject: [PATCH] some code cleanup --- Cargo.lock | 45 +++++++++++++++++++++++++++++---------------- src/ui/config.rs | 4 ++-- src/ui/gui.rs | 2 +- src/ui/netplay.rs | 11 ++++++----- 4 files changed, 38 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a29c402..6e4308f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 4 [[package]] name = "ab_glyph" -version = "0.2.29" +version = "0.2.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3672c180e71eeaaac3a541fbbc5f5ad4def8b747c595ad30d674e43049f7b0" +checksum = "1e0f4f6fbdc5ee39f2ede9f5f3ec79477271a6d6a2baff22310d51736bda6cea" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -14,9 +14,9 @@ dependencies = [ [[package]] name = "ab_glyph_rasterizer" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" +checksum = "b2187590a23ab1e3df8681afdf0987c48504d80291f002fcdb651f0ef5e25169" [[package]] name = "addr2line" @@ -2044,9 +2044,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9421a676d1b147b16b82c9225157dc629087ef8ec4d5e2960f9437a90dac0a5" +checksum = "17da50a276f1e01e0ba6c029e47b7100754904ee8a278f886546e98575380785" dependencies = [ "atomic-waker", "bytes", @@ -2633,9 +2633,9 @@ checksum = "d0263a3d970d5c054ed9312c0057b4f3bde9c0b33836d3637361d4a9e6e7a408" [[package]] name = "indexmap" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" +checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661" dependencies = [ "equivalent", "hashbrown 0.15.4", @@ -2670,6 +2670,17 @@ dependencies = [ "syn", ] +[[package]] +name = "io-uring" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b86e202f00093dcba4275d4636b93ef9dd75d025ae560d2521b45ea28ab49013" +dependencies = [ + "bitflags 2.9.1", + "cfg-if", + "libc", +] + [[package]] name = "ipnet" version = "2.11.0" @@ -3076,9 +3087,9 @@ dependencies = [ [[package]] name = "lzma-rust2" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0889a24ddb2304e1b3cdc0b0cd74119143d3403c19100f064809d38789bae155" +checksum = "e004a649120b31c06728257815826e075f638502ba49a9677c3c112e324e044d" dependencies = [ "byteorder", ] @@ -4422,9 +4433,9 @@ checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" [[package]] name = "reqwest" -version = "0.12.20" +version = "0.12.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabf4c97d9130e2bf606614eb937e86edac8292eaa6f422f995d7e8de1eb1813" +checksum = "cbc931937e6ca3a06e3b6c0aa7841849b160a90351d6ab467a8b9b9959767531" dependencies = [ "base64", "bytes", @@ -4805,9 +4816,9 @@ dependencies = [ [[package]] name = "sevenz-rust2" -version = "0.15.1" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a05dfb2306780729ce5c5ba87991c57f28c6931ac501b2dbca57400aaa44d373" +checksum = "0613c8bcc0d74f26e4c90c94125703dc87bcb3a95abce3fa606c585cd9cbaa5f" dependencies = [ "bit-set", "byteorder", @@ -5451,16 +5462,18 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.45.1" +version = "1.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779" +checksum = "1140bb80481756a8cbe10541f37433b459c5aa1e727b4c020fbfebdc25bf3ec4" dependencies = [ "backtrace", "bytes", + "io-uring", "libc", "mio", "pin-project-lite", "signal-hook-registry", + "slab", "socket2", "tokio-macros", "tracing", diff --git a/src/ui/config.rs b/src/ui/config.rs index 576c1bd..ae34dcc 100644 --- a/src/ui/config.rs +++ b/src/ui/config.rs @@ -33,7 +33,7 @@ pub struct InputProfile { #[derive(serde::Serialize, serde::Deserialize)] pub struct Input { - pub input_profiles: std::collections::HashMap, + pub input_profiles: std::collections::BTreeMap, pub input_profile_binding: [String; 4], pub controller_assignment: [Option; 4], pub controller_enabled: [bool; 4], @@ -87,7 +87,7 @@ impl Config { return result; } } - let mut input_profiles = std::collections::HashMap::new(); + let mut input_profiles = std::collections::BTreeMap::new(); input_profiles.insert("default".to_string(), ui::input::get_default_profile()); Config { input: Input { diff --git a/src/ui/gui.rs b/src/ui/gui.rs index b7c4213..7a65139 100644 --- a/src/ui/gui.rs +++ b/src/ui/gui.rs @@ -25,7 +25,7 @@ pub struct VruChannel { pub vru_word_receiver: Option>, } -#[derive(Copy, Clone)] +#[derive(Clone)] pub struct GameSettings { pub fullscreen: bool, pub overclock: bool, diff --git a/src/ui/netplay.rs b/src/ui/netplay.rs index 22ee108..ba0d4c5 100644 --- a/src/ui/netplay.rs +++ b/src/ui/netplay.rs @@ -1,5 +1,3 @@ -#![allow(clippy::too_many_arguments)] - use crate::device; use crate::ui; use crate::ui::gui::{ @@ -277,7 +275,7 @@ pub fn setup_create_window( game_name.to_string(), game_hash.to_string(), password.to_string(), - game_settings, + game_settings.clone(), weak_app.clone(), weak.clone(), ); @@ -441,6 +439,7 @@ fn update_sessions( }); } +#[allow(clippy::too_many_arguments)] fn create_session( netplay_write_sender: tokio::sync::broadcast::Sender>, mut netplay_read_receiver: tokio::sync::broadcast::Receiver, @@ -546,6 +545,7 @@ fn create_session( }); } +#[allow(clippy::too_many_arguments)] fn join_session( netplay_write_sender: tokio::sync::broadcast::Sender>, mut netplay_read_receiver: tokio::sync::broadcast::Receiver, @@ -645,6 +645,7 @@ fn join_session( }); } +#[allow(clippy::too_many_arguments)] fn setup_wait_window( netplay_write_sender: tokio::sync::broadcast::Sender>, mut netplay_read_receiver: tokio::sync::broadcast::Receiver, @@ -949,7 +950,7 @@ pub fn netplay_window(app: &AppWindow, controller_paths: &[Option]) { .upgrade_in_event_loop(move |handle| { let create_window = NetplayCreate::new().unwrap(); save_settings(&handle, &controller_paths); - ui::netplay::setup_create_window( + setup_create_window( &create_window, GameSettings { fullscreen: handle.get_fullscreen(), @@ -972,7 +973,7 @@ pub fn netplay_window(app: &AppWindow, controller_paths: &[Option]) { .upgrade_in_event_loop(move |handle| { let join_window = NetplayJoin::new().unwrap(); save_settings(&handle, &controller_paths); - ui::netplay::setup_join_window(&join_window, handle.get_fullscreen(), weak_app); + setup_join_window(&join_window, handle.get_fullscreen(), weak_app); }) .unwrap(); });