Rustfmt the whole thing

confusinguser · confusinguser · commit 83069a5ef78d · 2024-06-19T18:52:54.000+02:00
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -1,84 +1,84 @@
 name: CI
 
 on:
-    push:
-        branches: [main]
-    pull_request:
-        branches: [main]
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
 
 env:
-    CARGO_TERM_COLOR: always
+  CARGO_TERM_COLOR: always
 
 jobs:
-    # Run cargo test
-    test:
-        name: Test Suite
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout sources
-              uses: actions/checkout@v3
-            - name: Cache
-              uses: actions/cache@v3
-              with:
-                  path: |
-                      ~/.cargo/bin/
-                      ~/.cargo/registry/index/
-                      ~/.cargo/registry/cache/
-                      ~/.cargo/git/db/
-                      target/
-                  key:
-                      ${{ runner.os }}-cargo-test-${{ hashFiles('**/Cargo.toml')
-                      }}
-            - name: Install stable toolchain
-              uses: dtolnay/rust-toolchain@stable
-            - name: Install Dependencies
-              run:
-                  sudo apt-get update; sudo apt-get install pkg-config
-                  libx11-dev libasound2-dev libudev-dev libxcb-render0-dev
-                  libxcb-shape0-dev libxcb-xfixes0-dev
-            - name: Run cargo test
-              run: cargo test
-
-    # Run cargo clippy -- -D warnings
-    clippy_check:
-        name: Clippy
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout sources
-              uses: actions/checkout@v3
-            - name: Cache
-              uses: actions/cache@v3
-              with:
-                  path: |
-                      ~/.cargo/bin/
-                      ~/.cargo/registry/index/
-                      ~/.cargo/registry/cache/
-                      ~/.cargo/git/db/
-                      target/
-                  key:
-                      ${{ runner.os }}-cargo-clippy-${{
-                      hashFiles('**/Cargo.toml') }}
-            - name: Install stable toolchain
-              uses: dtolnay/rust-toolchain@stable
-              with:
-                  components: clippy
-            - name: Install Dependencies
-              run:
-                  sudo apt-get update; sudo apt-get install pkg-config
-                  libx11-dev libasound2-dev libudev-dev
-            - name: Run clippy
-              run: cargo clippy -- -D warnings
-
-    # Run cargo fmt --all -- --check
-    format:
-        name: Format
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout sources
-              uses: actions/checkout@v3
-            - name: Install stable toolchain
-              uses: dtolnay/rust-toolchain@stable
-              with:
-                  components: rustfmt
-            - name: Run cargo fmt
-              run: cargo fmt --all -- --check
+  # Run cargo test
+  test:
+    name: Test Suite
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v3
+      - name: Cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key:
+            ${{ runner.os }}-cargo-test-${{ hashFiles('**/Cargo.toml')
+            }}
+      - name: Install stable toolchain
+        uses: dtolnay/rust-toolchain@stable
+      - name: Install Dependencies
+        run:
+          sudo apt-get update; sudo apt-get install pkg-config
+          libx11-dev libasound2-dev libudev-dev libxcb-render0-dev
+          libxcb-shape0-dev libxcb-xfixes0-dev
+      - name: Run cargo test
+        run: cargo test
+  
+  # Run cargo clippy -- -D warnings
+  clippy_check:
+    name: Clippy
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v3
+      - name: Cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key:
+            ${{ runner.os }}-cargo-clippy-${{
+            hashFiles('**/Cargo.toml') }}
+      - name: Install stable toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          components: clippy
+      - name: Install Dependencies
+        run:
+          sudo apt-get update; sudo apt-get install pkg-config
+          libx11-dev libasound2-dev libudev-dev
+      - name: Run clippy
+        run: cargo clippy -- -D warnings
+  
+  # Run cargo fmt --all -- --check
+  format:
+    name: Format
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v3
+      - name: Install stable toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          components: rustfmt
+      - name: Run cargo fmt
+        run: cargo fmt --all -- --check
diff --git a/src/cell.rs b/src/cell.rs
@@ -145,7 +145,10 @@ impl CellCoordinates {
         radial_direction: RadialDirection,
         cube_side_length: u32,
     ) -> Option<(CellCoordinates, bool)> {
-        if radial_direction.rotation_axis().is_parallel_to(self.normal_direction()) {
+        if radial_direction
+            .rotation_axis()
+            .is_parallel_to(self.normal_direction())
+        {
             // The direction is not possible to go in on this side
             return None;
         }
@@ -164,7 +167,9 @@ impl CellCoordinates {
         cube_side_length: u32,
     ) -> Option<(CellCoordinates, bool)> {
         let cell1 = self.get_cell_in_direction(diagonal.0, cube_side_length)?;
-        let cell2 = cell1.0.get_cell_in_direction(diagonal.1, cube_side_length)?;
+        let cell2 = cell1
+            .0
+            .get_cell_in_direction(diagonal.1, cube_side_length)?;
         if cell1.1 && cell2.1 {
             // The second element tells us if the transformation went over a cube edge, in this
             // case we are in a corner, which means we have a true neighbor in cell2
diff --git a/src/cube_rotation.rs b/src/cube_rotation.rs
@@ -4,8 +4,8 @@ use std::time::{Duration, Instant};
 use bevy::prelude::*;
 use derivative::Derivative;
 
-use crate::MainCamera;
 use crate::utils::{CartesianDirection, SeeDirection};
+use crate::MainCamera;
 
 #[derive(Debug, Default, Clone)]
 pub(crate) struct RotationData {
diff --git a/src/gamemanager.rs b/src/gamemanager.rs
@@ -1,11 +1,11 @@
-use crate::ai::AICache;
-use crate::movement::GameMove;
-use crate::{ai, movement, units::*};
+use bevy::prelude::*;
+use bevy_mod_picking::prelude::*;
 
+use crate::ai::AICache;
 use crate::cell::*;
+use crate::movement::GameMove;
 use crate::scene::{self, MainCube, SceneChild};
-use bevy::prelude::*;
-use bevy_mod_picking::prelude::*;
+use crate::{ai, movement, units::*};
 
 #[derive(Resource, Debug)]
 pub(crate) struct Game {
@@ -19,6 +19,7 @@ pub(crate) struct Game {
     pub(crate) palette: Palette,
     pub(crate) ai_playing: Option<Team>,
 }
+
 impl Game {
     pub(crate) fn new(cube_side_length: u32) -> Self {
         Game {
@@ -68,6 +69,7 @@ pub(crate) enum Team {
     Black,
     White,
 }
+
 impl Team {
     pub(crate) fn color(&self) -> Color {
         match self {
@@ -182,7 +184,9 @@ fn on_cell_clicked_play_phase(
 
     // Mark cells
     reset_cells_new_selection(game);
-    let Some(unit) = game.units.get_unit(clicked_coords) else { return;};
+    let Some(unit) = game.units.get_unit(clicked_coords) else {
+        return;
+    };
     if unit.team != game.turn {
         return;
     }
@@ -200,7 +204,7 @@ fn on_cell_clicked_play_phase(
                 if (unit.unit_type.can_capture_over_edge()
                     || unit_at_destination.is_none()
                     || unit.coords.normal_direction() == unit_move.normal_direction())
-                // Prevent taking units on same team
+                    // Prevent taking units on same team
                     && unit_at_destination.map_or(true, |unit_at_d| unit.team != unit_at_d.team)
                 {
                     cell.selected_unit_can_move_to = true;
@@ -223,13 +227,18 @@ pub(crate) fn make_move(game_move: GameMove, game: &mut Game, commands: &mut Com
         game.units.remove_dead_units();
     }
 
-    let Some(unit) = game.units.get_unit_mut(game_move.from) else {return false};
+    let Some(unit) = game.units.get_unit_mut(game_move.from) else {
+        return false;
+    };
     if unit.team != game.turn {
         return false;
     }
 
     unit.move_unit_to(game_move.to);
-    let Some(entity) = unit.entity else {warn!("Unit entity was None");return false;};
+    let Some(entity) = unit.entity else {
+        warn!("Unit entity was None");
+        return false;
+    };
     game.entities_to_move.push((entity, game_move.to));
     if let UnitType::Pawn(_, ref mut has_moved) = unit.unit_type {
         *has_moved = true;
diff --git a/src/main.rs b/src/main.rs
@@ -1,3 +1,7 @@
+use bevy::log::*;
+use bevy::prelude::*;
+use bevy_mod_picking::prelude::*;
+
 mod ai;
 mod cell;
 mod cube_rotation;
@@ -8,10 +12,6 @@ mod scene;
 mod units;
 mod utils;
 
-use bevy::log::*;
-use bevy::prelude::*;
-use bevy_mod_picking::prelude::*;
-
 fn main() {
     App::new()
         .add_plugins(
@@ -39,8 +39,7 @@ fn main() {
 }
 
 #[derive(Component)]
-struct MainCamera {
-}
+struct MainCamera {}
 
 fn setup(
     mut commands: Commands,
@@ -73,8 +72,7 @@ fn setup(
             transform: Transform::from_xyz(8., 8., 8.),
             ..default()
         },
-        MainCamera {
-        },
+        MainCamera {},
     ));
 
     commands.spawn((
@@ -83,7 +81,6 @@ fn setup(
             ..default()
         },
         RaycastPickCamera::default(), // Enable picking with this camera
-        MainCamera {
-        },
+        MainCamera {},
     ));
 }
diff --git a/src/materials.rs b/src/materials.rs
@@ -1,6 +1,7 @@
+use bevy::prelude::*;
+
 use crate::cell::CellColor;
 use crate::gamemanager::Palette;
-use bevy::prelude::*;
 
 pub(crate) fn select_cell_material(
     material: &mut StandardMaterial,
diff --git a/src/movement.rs b/src/movement.rs
@@ -1,7 +1,6 @@
 use bevy::prelude::error;
 
 use crate::cell::{Board, CellCoordinates};
-
 use crate::units::*;
 use crate::utils::{CartesianDirection, RadialDirection};
 
@@ -134,7 +133,8 @@ fn pawn_movement(
         .iter()
         .filter(|diag| diag.0 == forward || diag.1 == forward)
     {
-        let Some(diagonal_coords) = unit_coords.get_diagonal(diagonal, board.cube_side_length) else {
+        let Some(diagonal_coords) = unit_coords.get_diagonal(diagonal, board.cube_side_length)
+        else {
             continue;
         };
 
@@ -236,7 +236,9 @@ mod parts {
             let mut dist = 0;
             let mut edge_crossings = 0;
             loop {
-                let Some(next_cell) = latest_cell.get_diagonal(diagonal, cube_side_length) else {break;};
+                let Some(next_cell) = latest_cell.get_diagonal(diagonal, cube_side_length) else {
+                    break;
+                };
 
                 if output.iter().any(|cell| *cell == next_cell.0) {
                     break;
@@ -270,7 +272,11 @@ mod parts {
     ) -> Vec<CellCoordinates> {
         let mut output = Vec::new();
         for radial_direction in RadialDirection::directions() {
-            let Some(mut forward_two) = coords.get_cell_in_radial_direction(radial_direction, cube_side_length) else {continue;};
+            let Some(mut forward_two) =
+                coords.get_cell_in_radial_direction(radial_direction, cube_side_length)
+            else {
+                continue;
+            };
             let mut edge_crossings = 0;
 
             if forward_two.1 {
diff --git a/src/scene.rs b/src/scene.rs
@@ -1,9 +1,9 @@
-use bevy::prelude::*;
-use bevy::scene::SceneInstance;
-use bevy_mod_picking::prelude::*;
 use std::f32::consts::PI;
 
 use bevy::prelude::Vec3;
+use bevy::prelude::*;
+use bevy::scene::SceneInstance;
+use bevy_mod_picking::prelude::*;
 
 use crate::cell::{Cell, CellColor, CellCoordinates};
 use crate::gamemanager::{self, spawn_unit_entity, Game};
diff --git a/src/units.rs b/src/units.rs
