clippy

4 files changed, 8 insertions, 30 deletions

diff --git a/src/2021/13/mod.rs b/src/2021/13/mod.rs
index b1a340f..6dd9b95 100644
--- a/src/2021/13/mod.rs
+++ b/src/2021/13/mod.rs
@@ -74,7 +74,7 @@ impl Paper {
     }
 
     fn total(&self) -> i64 {
-        self.grid.cells().map(|b| if *b { 1 } else { 0 }).sum()
+        self.grid.cells().map(|b| i64::from(*b)).sum()
     }
 }
 
diff --git a/src/2021/16/mod.rs b/src/2021/16/mod.rs
index 2d32034..797f50a 100644
--- a/src/2021/16/mod.rs
+++ b/src/2021/16/mod.rs
@@ -39,7 +39,7 @@ impl FromIterator<bool> for LiteralU8 {
     {
         let mut ret = 0;
         for b in iter {
-            ret = (ret << 1) | if b { 1 } else { 0 };
+            ret = (ret << 1) | u8::from(b);
         }
         Self(ret)
     }
@@ -54,7 +54,7 @@ impl FromIterator<bool> for LiteralU16 {
     {
         let mut ret = 0;
         for b in iter {
-            ret = (ret << 1) | if b { 1 } else { 0 };
+            ret = (ret << 1) | u16::from(b);
         }
         Self(ret)
     }
@@ -133,27 +133,9 @@ impl Packet {
                     packets.iter().map(|packet| packet.eval()).max().unwrap()
                 }
                 4 => unreachable!(),
-                5 => {
-                    if packets[0].eval() > packets[1].eval() {
-                        1
-                    } else {
-                        0
-                    }
-                }
-                6 => {
-                    if packets[0].eval() < packets[1].eval() {
-                        1
-                    } else {
-                        0
-                    }
-                }
-                7 => {
-                    if packets[0].eval() == packets[1].eval() {
-                        1
-                    } else {
-                        0
-                    }
-                }
+                5 => i64::from(packets[0].eval() > packets[1].eval()),
+                6 => i64::from(packets[0].eval() < packets[1].eval()),
+                7 => i64::from(packets[0].eval() == packets[1].eval()),
                 _ => unreachable!(),
             },
         }
diff --git a/src/2021/20/mod.rs b/src/2021/20/mod.rs
index e3c3287..292a2b2 100644
--- a/src/2021/20/mod.rs
+++ b/src/2021/20/mod.rs
@@ -43,7 +43,7 @@ impl Image {
                 });
                 let mut idx = 0;
                 for neighbor in neighbors {
-                    idx = idx * 2 + if neighbor { 1 } else { 0 };
+                    idx = idx * 2 + usize::from(neighbor);
                 }
                 new_map[Row(row)][Col(col)] = self.algorithm[idx]
             }
diff --git a/src/2021/24/mod.rs b/src/2021/24/mod.rs
index 69c7bc9..4114382 100644
--- a/src/2021/24/mod.rs
+++ b/src/2021/24/mod.rs
@@ -145,11 +145,7 @@ impl Alu {
     }
 
     fn eql(&mut self, a: Register, b: Value) {
-        *a.lvalue(self) = if a.rvalue(self) == b.rvalue(self) {
-            1
-        } else {
-            0
-        };
+        *a.lvalue(self) = i64::from(a.rvalue(self) == b.rvalue(self));
     }
 }