From 68a50dab6e88741b4685578163dd0ee26fab00f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=A9=20Cassiop=C3=A9e=20Gauthier?= Date: Wed, 15 Dec 2021 23:26:32 -0500 Subject: [PATCH] Pedantic clippy --- src/day10.rs | 2 +- src/day11.rs | 12 ++++++------ src/day13.rs | 4 ++-- src/day14.rs | 2 +- src/day15.rs | 8 ++++---- src/day4.rs | 8 ++++---- src/day6.rs | 4 ++-- src/day8.rs | 2 +- src/day9.rs | 8 ++++---- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/day10.rs b/src/day10.rs index ea2acc1..91cc631 100644 --- a/src/day10.rs +++ b/src/day10.rs @@ -53,7 +53,7 @@ impl Tokenizer { fn score(self) -> Option { self.stack.map(|stack| { - stack.iter().rev().fold(0u64, |acc, c| { + stack.iter().rev().fold(0_u64, |acc, c| { acc * 5 + match c { '(' => 1, diff --git a/src/day11.rs b/src/day11.rs index 53c9939..f58d2d7 100644 --- a/src/day11.rs +++ b/src/day11.rs @@ -4,26 +4,26 @@ fn square(x: usize, y: usize) -> Vec<(usize, usize)> { let mut sq = Vec::new(); if y > 0 { if x > 0 { - sq.push((x - 1, y - 1)) + sq.push((x - 1, y - 1)); } sq.push((x, y - 1)); if x < 9 { - sq.push((x + 1, y - 1)) + sq.push((x + 1, y - 1)); } } if x > 0 { - sq.push((x - 1, y)) + sq.push((x - 1, y)); } if x < 9 { - sq.push((x + 1, y)) + sq.push((x + 1, y)); } if y < 9 { if x > 0 { - sq.push((x - 1, y + 1)) + sq.push((x - 1, y + 1)); } sq.push((x, y + 1)); if x < 9 { - sq.push((x + 1, y + 1)) + sq.push((x + 1, y + 1)); } } sq diff --git a/src/day13.rs b/src/day13.rs index ebdb40b..564df18 100644 --- a/src/day13.rs +++ b/src/day13.rs @@ -54,14 +54,14 @@ fn main() { .collect::>(); let mut all_dots: HashSet<(usize, usize)> = HashSet::new(); - for dot in dots.iter() { + for dot in &dots { all_dots.insert(instructions[0].wrap(*dot)); } println!("solution {}", all_dots.len()); all_dots.drain(); for instr in instructions { - for dot in dots.iter() { + for dot in &dots { all_dots.insert(instr.wrap(*dot)); } dots = all_dots.drain().collect(); diff --git a/src/day14.rs b/src/day14.rs index cb5fda8..a615ac4 100644 --- a/src/day14.rs +++ b/src/day14.rs @@ -15,7 +15,7 @@ fn polymerize(depth: usize, template: &str, rules: &[(char, char, char)]) -> (us for _ in 0..depth { let mut p = pairs.clone(); - for (pair, n) in pairs.iter() { + for (pair, n) in &pairs { if let Some(rule) = rules .iter() .find(|rule| rule.0 == pair.0 && rule.1 == pair.1) diff --git a/src/day15.rs b/src/day15.rs index 450c304..5221548 100644 --- a/src/day15.rs +++ b/src/day15.rs @@ -96,10 +96,10 @@ impl RiskMap { } } -fn expand_map(risk_map: Vec>) -> Vec> { +fn expand_map(risk_map: &[Vec]) -> Vec> { let mut result = Vec::new(); for i in 0..5 { - for row in risk_map.iter() { + for row in risk_map { let rows = [ row.iter() .map(|x| (x + i - 1) % 9 + 1) @@ -128,7 +128,7 @@ fn main() { .lines() .map(|line| line.chars().map(|c| c.to_digit(10).unwrap()).collect()) .collect::>>(); - let mut risk_map = RiskMap::new(expand_map(risk_level)); + let mut risk_map = RiskMap::new(expand_map(&risk_level)); println!("solution {}", risk_map.shortest_path().unwrap()); } @@ -168,6 +168,6 @@ fn test_expand_map() { .lines() .map(|line| line.chars().map(|c| c.to_digit(10).unwrap()).collect()) .collect::>>(); - let mut risk_map = RiskMap::new(expand_map(risk_level)); + let mut risk_map = RiskMap::new(expand_map(&risk_level)); assert_eq!(risk_map.shortest_path().unwrap(), 315); } diff --git a/src/day4.rs b/src/day4.rs index 82b55f1..46ad897 100644 --- a/src/day4.rs +++ b/src/day4.rs @@ -12,7 +12,7 @@ struct Board { impl Board { fn mark(&mut self, number: u8) { - for row in self.grid.iter_mut() { + for row in &mut self.grid { if let Some(square) = row.iter_mut().find(|square| square.number == number) { square.marked = true; } @@ -20,7 +20,7 @@ impl Board { } fn is_winning(&self) -> bool { - for row in self.grid.iter() { + for row in &self.grid { if row.iter().all(|s| s.marked) { return true; } @@ -34,7 +34,7 @@ impl Board { } fn score(&self) -> u32 { - self.grid.iter().fold(0u32, |acc, row| { + self.grid.iter().fold(0_u32, |acc, row| { acc + row .iter() .map(|s| if s.marked { 0 } else { s.number as u32 }) @@ -78,7 +78,7 @@ fn solve_part1(input: &str) { let mut boards: Vec = blocks.map(|b| b.parse().unwrap()).collect(); for number in drawn_numbers { - for board in boards.iter_mut() { + for board in &mut boards { board.mark(number); if board.is_winning() { println!( diff --git a/src/day6.rs b/src/day6.rs index 11de04e..db5dba7 100644 --- a/src/day6.rs +++ b/src/day6.rs @@ -14,8 +14,8 @@ const BIRTH_RATE: usize = 7; const MATURITY: usize = 9; fn solve(fishes: Vec, days: usize) -> u64 { - let mut timers = [0u64; BIRTH_RATE]; - let mut new_timers = [0u64; MATURITY]; + let mut timers = [0_u64; BIRTH_RATE]; + let mut new_timers = [0_u64; MATURITY]; for fish in fishes { timers[fish] += 1; diff --git a/src/day8.rs b/src/day8.rs index 2db650c..e2f5cc3 100644 --- a/src/day8.rs +++ b/src/day8.rs @@ -56,7 +56,7 @@ fn decode(patterns: Vec<&str>, outputs: Vec<&str>) -> u32 { }) .collect::>(); - let mut iter = outputs.iter(); + let mut iter = outputs.into_iter(); decode_digit(&patterns, digit_positions.iter(), iter.next().unwrap()) * 1000 + decode_digit(&patterns, digit_positions.iter(), iter.next().unwrap()) * 100 + decode_digit(&patterns, digit_positions.iter(), iter.next().unwrap()) * 10 diff --git a/src/day9.rs b/src/day9.rs index 0b257df..f79d4ac 100644 --- a/src/day9.rs +++ b/src/day9.rs @@ -17,16 +17,16 @@ fn main() { fn neighbors(x: usize, y: usize, row: &[u32], map: &[Vec]) -> Vec { let mut neighbors = Vec::new(); if x > 0 { - neighbors.push(row[x - 1]) + neighbors.push(row[x - 1]); } if x < row.len() - 1 { - neighbors.push(row[x + 1]) + neighbors.push(row[x + 1]); } if y > 0 { - neighbors.push(map[y - 1][x]) + neighbors.push(map[y - 1][x]); } if y < map.len() - 1 { - neighbors.push(map[y + 1][x]) + neighbors.push(map[y + 1][x]); } neighbors }