From b917cb46037937bb340ab7e72edbd898d3a063a2 Mon Sep 17 00:00:00 2001 From: Joda Date: Sat, 18 Oct 2025 13:56:24 -0500 Subject: [PATCH] fix clippy and lint issues as well as wasm build issues --- Cargo.lock | 232 ------------------------------------------ Cargo.toml | 2 +- src/audio/mod.rs | 38 +++---- src/main.rs | 14 +-- src/screens/game.rs | 2 - src/screens/splash.rs | 3 - src/screens/title.rs | 4 +- src/sundry.rs | 2 +- 8 files changed, 30 insertions(+), 267 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 60d564f..79c8e81 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -79,15 +79,6 @@ dependencies = [ "winit", ] -[[package]] -name = "addr2line" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b" -dependencies = [ - "gimli", -] - [[package]] name = "adler2" version = "2.0.1" @@ -180,12 +171,6 @@ dependencies = [ "libc", ] -[[package]] -name = "anyhow" -version = "1.0.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" - [[package]] name = "approx" version = "0.5.1" @@ -282,24 +267,6 @@ dependencies = [ "futures-lite", ] -[[package]] -name = "async-io" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456b8a8feb6f42d237746d4b3e9a178494627745c3c56c6ea55d92ba50d026fc" -dependencies = [ - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-io", - "futures-lite", - "parking", - "polling", - "rustix 1.1.2", - "slab", - "windows-sys 0.61.1", -] - [[package]] name = "async-lock" version = "3.4.1" @@ -345,21 +312,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" -[[package]] -name = "backtrace" -version = "0.3.76" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6" -dependencies = [ - "addr2line", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", - "windows-link 0.2.0", -] - [[package]] name = "base64" version = "0.22.1" @@ -867,7 +819,6 @@ dependencies = [ "bevy_platform", "bevy_ptr", "bevy_reflect", - "bevy_remote", "bevy_render", "bevy_scene", "bevy_shader", @@ -1116,31 +1067,6 @@ dependencies = [ "uuid", ] -[[package]] -name = "bevy_remote" -version = "0.17.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5e053684d1735e62d8e491cb68f5d9f7219edcb6528d1ac5fe179f24e5fe497" -dependencies = [ - "anyhow", - "async-channel", - "async-io", - "bevy_app", - "bevy_asset", - "bevy_derive", - "bevy_ecs", - "bevy_log", - "bevy_platform", - "bevy_reflect", - "bevy_tasks", - "bevy_utils", - "http-body-util", - "hyper", - "serde", - "serde_json", - "smol-hyper", -] - [[package]] name = "bevy_render" version = "0.17.2" @@ -1332,7 +1258,6 @@ checksum = "18839182775f30d26f0f84d9de85d25361bb593c99517a80b64ede6cbaf41adc" dependencies = [ "async-channel", "async-executor", - "async-io", "async-task", "atomic-waker", "bevy_platform", @@ -2434,12 +2359,6 @@ dependencies = [ "windows 0.62.1", ] -[[package]] -name = "gimli" -version = "0.32.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7" - [[package]] name = "gl_generator" version = "0.14.0" @@ -2630,73 +2549,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" -[[package]] -name = "http" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" -dependencies = [ - "bytes", - "http", -] - -[[package]] -name = "http-body-util" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" -dependencies = [ - "bytes", - "futures-core", - "http", - "http-body", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] -name = "hyper" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e" -dependencies = [ - "atomic-waker", - "bytes", - "futures-channel", - "futures-core", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "pin-utils", - "smallvec", - "tokio", -] - [[package]] name = "image" version = "0.25.8" @@ -2761,17 +2613,6 @@ dependencies = [ "mach2", ] -[[package]] -name = "io-uring" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046fa2d4d00aea763528b4950358d0ead425372445dc8ff86312b3c69ff7727b" -dependencies = [ - "bitflags 2.9.4", - "cfg-if", - "libc", -] - [[package]] name = "itertools" version = "0.13.0" @@ -2790,12 +2631,6 @@ dependencies = [ "either", ] -[[package]] -name = "itoa" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" - [[package]] name = "jni" version = "0.21.1" @@ -3517,15 +3352,6 @@ dependencies = [ "objc2-foundation", ] -[[package]] -name = "object" -version = "0.37.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe" -dependencies = [ - "memchr", -] - [[package]] name = "oboe" version = "0.6.1" @@ -3668,12 +3494,6 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - [[package]] name = "piper" version = "0.2.4" @@ -3989,12 +3809,6 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" -[[package]] -name = "rustc-demangle" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace" - [[package]] name = "rustc-hash" version = "1.1.0" @@ -4065,12 +3879,6 @@ dependencies = [ "twox-hash", ] -[[package]] -name = "ryu" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" - [[package]] name = "same-file" version = "1.0.6" @@ -4157,19 +3965,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_json" -version = "1.0.145" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" -dependencies = [ - "itoa", - "memchr", - "ryu", - "serde", - "serde_core", -] - [[package]] name = "sharded-slab" version = "0.1.7" @@ -4250,19 +4045,6 @@ dependencies = [ "xkeysym", ] -[[package]] -name = "smol-hyper" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7428a49d323867702cd12b97b08a6b0104f39ec13b49117911f101271321bc1a" -dependencies = [ - "async-executor", - "async-io", - "futures-io", - "hyper", - "pin-project-lite", -] - [[package]] name = "smol_str" version = "0.2.2" @@ -4473,20 +4255,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" -[[package]] -name = "tokio" -version = "1.47.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038" -dependencies = [ - "backtrace", - "io-uring", - "libc", - "mio", - "pin-project-lite", - "slab", -] - [[package]] name = "toml_datetime" version = "0.7.2" diff --git a/Cargo.toml b/Cargo.toml index 0c3ed7a..6a6f6da 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,7 +49,7 @@ dev = [ "bevy/bevy_debug_stepping", "bevy/track_location", "bevy/trace", - "bevy/bevy_remote", + # "bevy/bevy_remote", "bevy/reflect_auto_register", ] dev_native = [ diff --git a/src/audio/mod.rs b/src/audio/mod.rs index ba6a940..fc04dd8 100644 --- a/src/audio/mod.rs +++ b/src/audio/mod.rs @@ -9,30 +9,30 @@ pub(super) fn plugin(app: &mut App) { app.add_systems(Update, fade_in); } -#[derive(Resource)] -pub struct Soundtracks { - pub main_theme: Handle, - pub battle_theme: Handle, -} +// #[derive(Resource)] +// pub struct Soundtracks { +// pub main_theme: Handle, +// pub battle_theme: Handle, +// } -pub enum Soundtrack { - MainTheme, - BattleTheme, -} +// pub enum Soundtrack { +// MainTheme, +// BattleTheme, +// } -#[derive(Event)] -pub struct PlaySoundtrackEvent { - soundtrack: Soundtrack, -} +// #[derive(Event)] +// pub struct PlaySoundtrackEvent { +// soundtrack: Soundtrack, +// } fn setup_audio(mut commands: Commands, asset_server: Res) { - let main_handle = asset_server.load("soundtrack/spacetheme.ogg"); - let soundtracks = Soundtracks { - main_theme: main_handle.clone(), - battle_theme: asset_server.load("audio/soundtrack/battle_theme.ogg"), - }; + let main_handle: Handle = asset_server.load("soundtrack/spacetheme.ogg"); + // let soundtracks = Soundtracks { + // main_theme: main_handle.clone(), + // battle_theme: asset_server.load("audio/soundtrack/battle_theme.ogg"), + // }; - commands.insert_resource(soundtracks); + // commands.insert_resource(soundtracks); commands.spawn(( AudioPlayer(main_handle.clone()), diff --git a/src/main.rs b/src/main.rs index 62d851a..a746f17 100644 --- a/src/main.rs +++ b/src/main.rs @@ -8,10 +8,10 @@ use bevy::{ window::{WindowMode, WindowResized, WindowResolution}, }; -#[cfg(feature = "dev")] -use bevy::remote::RemotePlugin; -#[cfg(feature = "dev")] -use bevy::remote::http::RemoteHttpPlugin; +// #[cfg(feature = "dev")] +// use bevy::remote::RemotePlugin; +// #[cfg(feature = "dev")] +// use bevy::remote::http::RemoteHttpPlugin; use bevy_embedded_assets::{EmbeddedAssetPlugin, PluginMode}; @@ -59,7 +59,7 @@ impl Plugin for AppPlugin { primary_window: Some(Window { title: "Star Journey".to_string(), fit_canvas_to_parent: true, - mode: WindowMode::Windowed, + mode: WindowMode::BorderlessFullscreen(MonitorSelection::Current), resolution: WindowResolution::new(1920, 1080), resizable: false, position: WindowPosition::Centered(MonitorSelection::Current), @@ -76,8 +76,8 @@ impl Plugin for AppPlugin { app.add_plugins(screens::plugin); - #[cfg(feature = "dev")] - app.add_plugins((RemotePlugin::default(), RemoteHttpPlugin::default())); + // #[cfg(feature = "dev")] + // app.add_plugins((RemotePlugin::default(), RemoteHttpPlugin::default())); app.init_state::(); app.configure_sets(Update, PausableSystems.run_if(in_state(Pause(false)))); diff --git a/src/screens/game.rs b/src/screens/game.rs index a473c2d..91ca916 100644 --- a/src/screens/game.rs +++ b/src/screens/game.rs @@ -114,7 +114,6 @@ fn spawn_default_stars(commands: &mut Commands, asset_server: &Res) commands.spawn(( Name::new("Star"), Star { - active: true, speed: random_range(0.5..=1.0), }, Sprite { @@ -168,7 +167,6 @@ struct Projectile; #[derive(Component)] pub struct Star { - pub active: bool, pub speed: f32, } diff --git a/src/screens/splash.rs b/src/screens/splash.rs index 2cacd4c..cdc4cf2 100644 --- a/src/screens/splash.rs +++ b/src/screens/splash.rs @@ -77,7 +77,6 @@ fn setup_splash( let mut star = commands.spawn(( Name::new("Star"), Star { - active: false, speed: random_range(0.3..=0.6), }, Sprite { @@ -144,7 +143,6 @@ fn spawn_stars( ..default() }, Star { - active: true, speed: random_range(0.3..=0.6), }, )); @@ -166,7 +164,6 @@ fn spawn_new_star( commands.spawn(( Name::new("Star"), Star { - active: true, speed: random_range(0.3..=0.6), }, Sprite { diff --git a/src/screens/title.rs b/src/screens/title.rs index c81f1b7..483b09b 100644 --- a/src/screens/title.rs +++ b/src/screens/title.rs @@ -1,9 +1,9 @@ -use bevy::{ecs::event, prelude::*}; +use bevy::prelude::*; use crate::{ HIGH_RES_LAYERS, PIXEL_PERFECT_LAYERS, screens::Screen, - sundry::{LIGHT_GRAY, TRANSPARENT_LIGHT_GRAY, TRANSPARENT_WHITE, WHITE}, + sundry::{LIGHT_GRAY, TRANSPARENT_LIGHT_GRAY, WHITE}, }; pub(super) fn plugin(app: &mut App) { diff --git a/src/sundry.rs b/src/sundry.rs index dd41c78..dd77c98 100644 --- a/src/sundry.rs +++ b/src/sundry.rs @@ -1,6 +1,6 @@ use bevy::prelude::Color; pub const WHITE: Color = Color::srgb_u8(235, 237, 233); -pub const TRANSPARENT_WHITE: Color = Color::srgba_u8(235, 237, 233, 0); +// pub const TRANSPARENT_WHITE: Color = Color::srgba_u8(235, 237, 233, 0); pub const LIGHT_GRAY: Color = Color::srgb_u8(199, 207, 204); pub const TRANSPARENT_LIGHT_GRAY: Color = Color::srgba_u8(199, 207, 204, 0);