Fixed a bunch of clippy suggestions

[kaka/rust-sdl-test.git] / src / core / level / lvlgen.rs

diff --git a/src/core/level/lvlgen.rs b/src/core/level/lvlgen.rs
index daf27e8..8cdf6df 100644 (file)
--- a/src/core/level/lvlgen.rs
+++ b/src/core/level/lvlgen.rs
@@ -118,7 +118,7 @@ impl LevelGenerator {
        println!("  {} iterations needed", count);
     }
 
-    fn neighbours(&self, grid: &Vec<Vec<bool>>, px: usize, py: usize, distance: usize) -> u8 {
+    fn neighbours(&self, grid: &[Vec<bool>], px: usize, py: usize, distance: usize) -> u8 {
        let mut count = 0;
        for x in (px - distance)..=(px + distance) {
            for y in (py - distance)..=(py + distance) {
@@ -292,7 +292,7 @@ impl Region {
     }
 
     #[allow(dead_code)]
-    fn print_grid(&self, grid: &Vec<Vec<bool>>) {
+    fn print_grid(&self, grid: &[Vec<bool>]) {
        let w = grid.len();
        let h = grid[0].len();
        let mut g = vec!(vec!(false; w); h);
@@ -325,7 +325,7 @@ impl Region {
        grid
     }
 
-    fn find_first_point_of_outline(&self, rect: &(usize, usize, usize, usize), grid: &Vec<Vec<bool>>) -> Point<isize> {
+    fn find_first_point_of_outline(&self, rect: &(usize, usize, usize, usize), grid: &[Vec<bool>]) -> Point<isize> {
        let (ox, oy, w, h) = rect;
        let is_outer_wall = (ox, oy) == (&0, &0); // we know this is always the outer wall of the level
        for x in 0..*w {
@@ -341,7 +341,7 @@ impl Region {
        panic!("no wall found!");
     }
 
-    fn find_next_point_of_outline(&self, grid: &Vec<Vec<bool>>, p: &mut Point<isize>, directions: &mut Vec<(isize, isize)>) {
+    fn find_next_point_of_outline(&self, grid: &[Vec<bool>], p: &mut Point<isize>, directions: &mut Vec<(isize, isize)>) {
        directions.rotate_left(2);
        loop {
            let d = directions[0];
@@ -353,7 +353,7 @@ impl Region {
        }
     }
 
-    fn check(&self, p: Point<isize>, grid: &Vec<Vec<bool>>) -> bool {
+    fn check(&self, p: Point<isize>, grid: &[Vec<bool>]) -> bool {
        if p.x < 0 || p.x >= grid.len() as isize || p.y < 0 || p.y >= grid[0].len() as isize {
            false
        } else {