Fix clippy warning

Author: OrangeBacon

src/days/day20.rs

@@ -34,16 +34,16 @@ impl Tile {
             adj.swap(0, 2);
         }
         adj.rotate_right(self.rotation);
-        adj[side].get(0).and_then(|x| Some(x.id))
+        adj[side].get(0).map(|x|x.id)
     }
 
     /// applies flips and rotation until side side == id
     fn set_transform(&mut self, side: usize, id: usize, side2: usize, id2: usize) {
         let mut adj = self.adjacency.to_vec();
         for i in 0..4 {
-            if ((id == 0 && adj[side].len() == 0) || (adj[side].len() > 0 && adj[side][0].id == id))
-                && ((id2 == 0 && adj[side2].len() == 0)
-                    || (adj[side2].len() > 0 && adj[side2][0].id == id2))
+            if ((id == 0 && adj[side].is_empty()) || (!adj[side].is_empty() && adj[side][0].id == id))
+                && ((id2 == 0 && adj[side2].is_empty())
+                    || (!adj[side2].is_empty() && adj[side2][0].id == id2))
             {
                 self.rotation = i;
                 return;
@@ -53,9 +53,9 @@ impl Tile {
         adj.swap(0, 2);
         self.flip = true;
         for i in 0..4 {
-            if ((id == 0 && adj[side].len() == 0) || (adj[side].len() > 0 && adj[side][0].id == id))
-                && ((id2 == 0 && adj[side2].len() == 0)
-                    || (adj[side2].len() > 0 && adj[side2][0].id == id2))
+            if ((id == 0 && adj[side].is_empty()) || (!adj[side].is_empty() && adj[side][0].id == id))
+                && ((id2 == 0 && adj[side2].is_empty())
+                    || (!adj[side2].is_empty() && adj[side2][0].id == id2))
             {
                 self.rotation = i;
                 return;
@@ -201,8 +201,7 @@ pub fn solve(timer: &mut Timer, input: &str) -> Result<AocResult> {
     // first cell
     image[0][0] = adjacency_sums
         .iter()
-        .filter(|(_, v)| *v == 2)
-        .next()
+        .find(|(_, v)| *v == 2)
         .unwrap()
         .0;
     input[&image[0][0]].borrow_mut().set_transform(0, 0, 3, 0);
@@ -242,9 +241,9 @@ pub fn solve(timer: &mut Timer, input: &str) -> Result<AocResult> {
 
         for _ in 0..tile.rotation {
             let mut new = vec![vec![]; 8];
-            for col in 0..8 {
+            for (col, n) in new.iter_mut().enumerate() {
                 for row in (0..8).rev() {
-                    new[col].push(tile.data[row][col]);
+                    n.push(tile.data[row][col]);
                 }
             }
             tile.data = new;
@@ -306,16 +305,16 @@ pub fn solve(timer: &mut Timer, input: &str) -> Result<AocResult> {
         count
     }
 
-    'out: loop {
+    'out: {
         for _ in 0..4 {
             if check_monster(&i, true, &mut HashSet::new()) > 0 {
                 break 'out;
             }
 
             let mut new = vec![vec![]; i.len()];
-            for col in 0..i.len() {
+            for (col, n) in new.iter_mut().enumerate() {
                 for row in (0..i.len()).rev() {
-                    new[col].push(i[row][col]);
+                    n.push(i[row][col]);
                 }
             }
             i = new;
@@ -327,9 +326,9 @@ pub fn solve(timer: &mut Timer, input: &str) -> Result<AocResult> {
             }
 
             let mut new = vec![vec![]; i.len()];
-            for col in 0..i.len() {
+            for (col, n) in new.iter_mut().enumerate() {
                 for row in (0..i.len()).rev() {
-                    new[col].push(i[row][col]);
+                    n.push(i[row][col]);
                 }
             }
             i = new;

src/days/day21.rs

@@ -2,7 +2,6 @@ use anyhow::Result;
 use hashbrown::{HashMap, HashSet};
 use libaoc::{aoc, AocResult, Timer};
 use std::collections::BTreeMap;
-use std::iter::FromIterator;
 
 #[derive(Debug)]
 struct Line<'a> {
@@ -29,15 +28,15 @@ pub fn solve(timer: &mut Timer, input: &str) -> Result<AocResult> {
     for line in input.iter() {
         for allergen in &line.allergens {
             if let Some(current) = ingredients.get(allergen) {
-                let int = HashSet::from_iter(line.ingredients.iter().copied())
+                let int = line.ingredients.iter().copied().collect::<HashSet<_>>()
                     .intersection(current)
                     .copied()
                     .collect();
                 ingredients.insert(allergen, int);
             } else {
                 ingredients.insert(
                     allergen,
-                    HashSet::from_iter(line.ingredients.iter().copied()),
+                    line.ingredients.iter().copied().collect(),
                 );
             }
         }
@@ -66,12 +65,11 @@ pub fn solve(timer: &mut Timer, input: &str) -> Result<AocResult> {
     for _ in 0..ingredients.len() {
         let (name, ones) = ingredients
             .iter()
-            .filter(|&(_, x)| x.len() == 1)
-            .next()
+            .find(|&(_, x)| x.len() == 1)
             .unwrap();
         let value = *ones.iter().next().unwrap();
 
-        mappings.insert(name.clone(), value);
+        mappings.insert(*name, value);
 
         for (_, list) in ingredients.iter_mut() {
             list.retain(|x| *x != value);
@@ -80,7 +78,7 @@ pub fn solve(timer: &mut Timer, input: &str) -> Result<AocResult> {
 
     let part2: Vec<_> = mappings.values().collect();
     let part2 = part2.iter().fold(String::new(), |s, c| {
-        if s.len() > 0 {
+        if !s.is_empty() {
             s + "," + c
         } else {
             c.to_string()

src/days/day22.rs

@@ -31,9 +31,9 @@ fn recurse_combat(players: &[VecDeque<usize>], recurse: bool) -> (usize, VecDequ
             players[1].push_back(play1);
         }
 
-        if players[0].len() == 0 {
+        if players[0].is_empty() {
             break (1, players[1].clone());
-        } else if players[1].len() == 0 {
+        } else if players[1].is_empty() {
             break (0, players[0].clone());
         }
 

src/main.rs

@@ -1,6 +1,7 @@
 #![feature(or_patterns)]
 #![feature(deque_range)]
 #![feature(str_split_once)]
+#![feature(label_break_value)]
 #![feature(min_const_generics)]
 #![feature(destructuring_assignment)]