style: fix clippy warnings

unrenamed · Nov 1, 2023 · 6e839f9 · 6e839f9
1 parent a984b82
commit 6e839f9
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 26 deletions.
diff --git a/src/maze/formatters/ascii.rs b/src/maze/formatters/ascii.rs
@@ -2,7 +2,6 @@ use crate::maze::grid::cell::Cell;
 use crate::maze::{formatters::Formatter, grid::Grid};
 use std::fmt::Write;
 
-
 use super::StringWrapper;
 
 /// A formatter to emit the maze as ASCII with narrow passages
@@ -129,8 +128,8 @@ mod tests {
         expected.push_str("|_______|\n");
 
         let formatter = AsciiNarrow;
-        let mut grid = generate_maze();
-        let actual = formatter.format(&mut grid).0;
+        let grid = generate_maze();
+        let actual = formatter.format(&grid).0;
 
         assert_eq!(actual, expected);
     }
@@ -149,8 +148,8 @@ mod tests {
         expected.push_str("+---+---+---+---+\n");
 
         let formatter = AsciiBroad;
-        let mut grid = generate_maze();
-        let actual = formatter.format(&mut grid).0;
+        let grid = generate_maze();
+        let actual = formatter.format(&grid).0;
 
         assert_eq!(actual, expected);
     }

diff --git a/src/maze/formatters/game_map.rs b/src/maze/formatters/game_map.rs
@@ -133,7 +133,7 @@ impl GameMap<WithStartGoal> {
         rows: usize,
     ) -> (usize, usize) {
         let mut positions: Vec<Coords> = self
-            .iter_possible_start_and_goal_positions(&map, cols, rows)
+            .iter_possible_start_and_goal_positions(map, cols, rows)
             .collect();
 
         // shuffle possible positions
@@ -344,10 +344,10 @@ fn bottom_right_neighbour_exists(cx: usize, cy: usize, grid: &Grid) -> bool {
     grid.is_carved((cx + 1, cy + 1), Cell::WEST) && grid.is_carved((cx + 1, cy + 1), Cell::NORTH)
 }
 
-fn write_map(map: &Vec<char>, cols: usize) -> String {
+fn write_map(map: &[char], cols: usize) -> String {
     let mut ascii_map: String = String::new();
-    for i in 0..map.len() {
-        write!(ascii_map, "{}", map[i]).unwrap();
+    for (i, ch) in map.iter().enumerate() {
+        write!(ascii_map, "{}", ch).unwrap();
         if (i + 1) % cols == 0 {
             writeln!(ascii_map).unwrap();
         }
@@ -472,8 +472,8 @@ mod tests {
         expected.push_str("#########\n");
 
         let formatter = GameMap::new().span(1);
-        let mut grid = generate_maze();
-        let actual = formatter.format(&mut grid).0;
+        let grid = generate_maze();
+        let actual = formatter.format(&grid).0;
 
         assert_eq!(actual, expected);
     }
@@ -492,8 +492,8 @@ mod tests {
         expected.push_str("#########\n");
 
         let formatter = GameMap::new().span(1).with_start_goal();
-        let mut grid = generate_maze();
-        let actual = formatter.format(&mut grid).0;
+        let grid = generate_maze();
+        let actual = formatter.format(&grid).0;
 
         assert_eq!(actual, expected);
     }

diff --git a/src/maze/formatters/image.rs b/src/maze/formatters/image.rs
@@ -263,9 +263,9 @@ mod tests {
     #[test]
     fn format() {
         let formatter = Image::new();
-        let mut grid = generate_maze();
+        let grid = generate_maze();
 
-        let actual = formatter.format(&mut grid).0;
+        let actual = formatter.format(&grid).0;
         let expected = image::open("tests/fixtures/maze.png").unwrap();
 
         assert_eq!(actual.as_bytes(), expected.as_bytes());

diff --git a/src/maze/maze.rs b/src/maze/maze.rs
@@ -77,14 +77,14 @@ mod tests {
     fn valid_maze() {
         let grid = generate_valid_maze();
         let maze = OrthogonalMaze { grid };
-        assert_eq!(maze.is_valid(), true);
+        assert!(maze.is_valid());
     }
 
     #[test]
     fn invalid_maze() {
         let grid = generate_invalid_maze();
         let maze = OrthogonalMaze { grid };
-        assert_eq!(maze.is_valid(), false);
+        assert!(!maze.is_valid());
     }
 
     fn generate_valid_maze() -> Grid {

diff --git a/src/utils/arena.rs b/src/utils/arena.rs
@@ -76,8 +76,8 @@ mod tests {
         let node2 = arena.new_node();
         let node3 = arena.new_node();
 
-        assert_eq!(arena.connected(node1, node2), false);
-        assert_eq!(arena.connected(node1, node3), false);
+        assert!(!arena.connected(node1, node2));
+        assert!(!arena.connected(node1, node3));
     }
 
     #[test]
@@ -89,8 +89,8 @@ mod tests {
         let node3 = arena.new_node();
 
         arena.connect(node1, node2);
-        assert_eq!(arena.connected(node1, node2), true);
-        assert_eq!(arena.connected(node1, node3), false);
+        assert!(arena.connected(node1, node2));
+        assert!(!arena.connected(node1, node3));
     }
 
     #[test]
@@ -104,9 +104,9 @@ mod tests {
         arena.connect(node1, node2);
         arena.connect(node3, node2);
 
-        assert_eq!(arena.connected(node1, node2), true);
-        assert_eq!(arena.connected(node1, node3), true);
-        assert_eq!(arena.connected(node3, node2), true);
+        assert!(arena.connected(node1, node2));
+        assert!(arena.connected(node1, node3));
+        assert!(arena.connected(node3, node2));
     }
 
     #[test]

diff --git a/src/utils/rand.rs b/src/utils/rand.rs
@@ -5,7 +5,7 @@ pub struct RandPositions;
 impl RandPositions {
     #[cfg(not(test))]
     #[cfg(not(tarpaulin_include))]
-    pub fn rand<'a>(positions: &'a mut Vec<Coords>) -> &'a mut Vec<Coords> {
+    pub fn rand(positions: &mut Vec<Coords>) -> &mut Vec<Coords> {
         use rand::seq::SliceRandom;
         let mut rng = rand::thread_rng();
         positions.shuffle(&mut rng);
@@ -14,7 +14,7 @@ impl RandPositions {
 
     #[cfg(test)]
     #[cfg(not(tarpaulin_include))]
-    pub fn rand<'a>(positions: &'a mut Vec<Coords>) -> &'a mut Vec<Coords> {
+    pub fn rand(positions: &mut Vec<Coords>) -> &mut Vec<Coords> {
         positions
     }
 }