Rustfmt the whole thing

Author: confusinguser

src/ai.rs

@@ -1,7 +1,7 @@
+use crate::{cell::*, movement};
 use crate::gamemanager::*;
 use crate::movement::*;
 use crate::units::*;
-use crate::{cell::*, movement};
 
 #[derive(Default)]
 pub(crate) struct AICache {

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

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 {

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, movement, units::*};
+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::*;
 
 #[derive(Resource, Debug)]
 pub(crate) struct Game {
@@ -182,7 +182,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;
     }
@@ -223,13 +225,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;

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 {},
     ));
 }

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,

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 {

src/scene.rs

@@ -1,12 +1,12 @@
-use bevy::prelude::*;
-use bevy::scene::SceneInstance;
-use bevy_mod_picking::prelude::*;
 use std::f32::consts::PI;
 
+use bevy::prelude::*;
 use bevy::prelude::Vec3;
+use bevy::scene::SceneInstance;
+use bevy_mod_picking::prelude::*;
 
 use crate::cell::{Cell, CellColor, CellCoordinates};
-use crate::gamemanager::{self, spawn_unit_entity, Game};
+use crate::gamemanager::{self, Game, spawn_unit_entity};
 use crate::materials;
 
 pub(crate) fn construct_cube(

src/units.rs

@@ -1,9 +1,10 @@
 use std::slice::{Iter, IterMut};
 
+use bevy::prelude::*;
+
 use crate::cell::CellCoordinates;
 use crate::gamemanager::Team;
 use crate::utils::RadialDirection;
-use bevy::prelude::*;
 
 #[derive(Clone, Debug)]
 pub(crate) struct Unit {
@@ -180,7 +181,7 @@ impl Units {
     }
 
     pub(crate) fn remove_unit(&mut self, coords: CellCoordinates) -> Option<Unit> {
-        let index = self.units.iter().position(|unit| unit.coords==coords)?;
+        let index = self.units.iter().position(|unit| unit.coords == coords)?;
 
         Some(self.units.swap_remove(index))
     }