Fast CI build with cache and rust fmt checker on CI

.github/workflows/rust.yml

@@ -11,19 +11,34 @@ env:
 
 jobs:
   build:
-
+    name: cargo build
     runs-on: ubuntu-latest
+    steps:
+      - name: Install Linux dependencies
+        shell: bash
+        if: ${{ runner.os == 'linux' }}
+        run: >
+          sudo apt-get update
+
+          sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
+      - uses: actions/checkout@v4
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          rustflags: ''
+      - name: Build
+        run: cargo build --verbose
+      - name: Run tests
+        run: cargo test --verbose --all-features
 
+  formatting:
+    name: cargo fmt
+    runs-on: ubuntu-latest
     steps:
-    - name: Install Linux dependencies
-      shell: bash
-      if: ${{ runner.os == 'linux' }}
-      run: >
-        sudo apt-get update
-
-        sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
-    - uses: actions/checkout@v4
-    - name: Build
-      run: cargo build --verbose
-    - name: Run tests
-      run: cargo test --verbose
+      - uses: actions/checkout@v4
+      # Ensure rustfmt is installed and setup problem matcher
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          components: rustfmt
+          rustflags: ''
+      - name: Rustfmt Check
+        uses: actions-rust-lang/rustfmt@v1

rustfmt.toml

@@ -0,0 +1 @@
+style_edition = "2024"

src/main.rs

@@ -12,13 +12,13 @@ use crate::object_spawner::ObjectSpawnerPlugin;
 use crate::scene_loader::SceneLoaderPlugin;
 use crate::title_screen::{GameState, TitleScreenPlugin};
 use crate::ui::interactive_button::InteractiveButtonPlugin;
+use bevy::DefaultPlugins;
 use bevy::app::{App, PluginGroup};
 use bevy::asset::AssetMetaCheck;
 use bevy::image::{ImageAddressMode, ImageFilterMode, ImageSamplerDescriptor};
 use bevy::prelude::*;
 use bevy::render::render_resource::{AddressMode, FilterMode};
 use bevy::window::{CursorGrabMode, CursorOptions};
-use bevy::DefaultPlugins;
 
 fn main() {
     let mut app = App::new();

src/object_spawner.rs

@@ -1,4 +1,4 @@
-use crate::mesh_loader::{load_gltf, GLTFLoadConfig, MeshLoader};
+use crate::mesh_loader::{GLTFLoadConfig, MeshLoader, load_gltf};
 use crate::scene_loader::SceneElement;
 use bevy::app::{App, Plugin, Update};
 use bevy::asset::AssetServer;

src/scene_loader.rs

@@ -1,7 +1,7 @@
-use crate::mesh_loader::{self, load_gltf, GLTFLoadConfig, MeshLoader};
+use crate::mesh_loader::{self, GLTFLoadConfig, MeshLoader, load_gltf};
+use bevy::core_pipeline::Skybox;
 use bevy::core_pipeline::bloom::Bloom;
 use bevy::core_pipeline::experimental::taa::{TemporalAntiAliasPlugin, TemporalAntiAliasing};
-use bevy::core_pipeline::Skybox;
 use bevy::image::CompressedImageFormats;
 use bevy::pbr::{
     CascadeShadowConfigBuilder, DirectionalLightShadowMap, ScreenSpaceAmbientOcclusion,
@@ -54,11 +54,9 @@ fn scene_switcher(
     input: Res<ButtonInput<KeyCode>>,
     mut scene_elements: Query<(Entity, &SceneElement)>,
     mut commands: Commands,
-    mut asset_server: ResMut<AssetServer>,
-    mut mesh_loader: ResMut<MeshLoader>,
-    mut meshes: ResMut<Assets<Mesh>>,
-    mut materials: ResMut<Assets<StandardMaterial>>,
-    mut water_level: ResMut<WaterSettings>,
+    asset_server: ResMut<AssetServer>,
+    mesh_loader: ResMut<MeshLoader>,
+    water_level: ResMut<WaterSettings>,
 ) {
     if !input.pressed(KeyCode::ControlLeft) && !input.pressed(KeyCode::ControlRight) {
         return;
@@ -68,27 +66,13 @@ fn scene_switcher(
         for (entity, _) in scene_elements.iter_mut() {
             commands.entity(entity).despawn();
         }
-        setup_basic(
-            commands,
-            asset_server,
-            mesh_loader,
-            meshes,
-            materials,
-            water_level,
-        );
+        setup_basic(commands, asset_server, mesh_loader, water_level);
         return;
     } else if input.just_pressed(KeyCode::Numpad2) || input.just_pressed(KeyCode::Digit2) {
         for (entity, _) in scene_elements.iter_mut() {
             commands.entity(entity).despawn();
         }
-        setup_kirby(
-            commands,
-            asset_server,
-            mesh_loader,
-            meshes,
-            materials,
-            water_level,
-        );
+        setup_kirby(commands, asset_server, mesh_loader, water_level);
         return;
     }
 }
@@ -98,8 +82,6 @@ fn setup_basic(
     mut commands: Commands,
     mut asset_server: ResMut<AssetServer>,
     mut mesh_loader: ResMut<MeshLoader>,
-    mut _meshes: ResMut<Assets<Mesh>>,
-    mut _materials: ResMut<Assets<StandardMaterial>>,
     mut water_level: ResMut<WaterSettings>,
 ) {
     water_level.height = -10.0;
@@ -203,8 +185,6 @@ fn setup_kirby(
     mut commands: Commands,
     mut asset_server: ResMut<AssetServer>,
     mut mesh_loader: ResMut<MeshLoader>,
-    mut _meshes: ResMut<Assets<Mesh>>,
-    mut _materials: ResMut<Assets<StandardMaterial>>,
     mut water_level: ResMut<WaterSettings>,
 ) {
     water_level.water_quality = WaterQuality::Basic;

src/ui/interactive_button.rs

@@ -3,8 +3,8 @@ use bevy::app::{App, Plugin, Update};
 use bevy::color::{Color, Luminance, Srgba};
 use bevy::math::{Vec2, Vec3};
 use bevy::prelude::{
-    default, BackgroundColor, BorderColor, Changed, Children, Component, ImageNode, Interaction,
-    Query, Text, TextColor, Without,
+    BackgroundColor, BorderColor, Changed, Children, Component, ImageNode, Interaction, Query,
+    Text, TextColor, Without, default,
 };
 
 #[derive(Component)]