Rust 1.81.0

Cargo.toml

@@ -9,7 +9,7 @@ edition = "2021"
 homepage = "https://github.com/fornwall/advent-of-code"
 license = "MIT"
 repository = "https://github.com/fornwall/advent-of-code"
-rust-version = "1.80.1"
+rust-version = "1.81.0"
 version = "2022.0.66"
 
 [profile.release]

crates/core/src/common/int_to_ascii.rs

@@ -22,8 +22,8 @@ impl IntToAsciiContext {
 #[test]
 fn to_ascii() {
     let mut context = IntToAsciiContext::new();
-    assert_eq!(context.ascii_bytes(1), &[b'1']);
-    assert_eq!(context.ascii_bytes(0), &[b'0']);
+    assert_eq!(context.ascii_bytes(1), b"1");
+    assert_eq!(context.ascii_bytes(0), b"0");
     assert_eq!(context.ascii_bytes(134), b"134");
     assert_eq!(context.ascii_bytes(4_294_967_295), b"4294967295");
 }

crates/core/src/common/md5.rs

@@ -138,7 +138,8 @@ fn transform(state: &mut [u32; 4], input: &[u32; 16]) {
         ($a:expr, $b:expr) => ($a.wrapping_add($b));
     );
     macro_rules! rotate(
-        ($x:expr, $n:expr) => (($x << $n) | ($x >> (32 - $n)));
+        //($x:expr, $n:expr) => (($x << $n) | ($x >> (32 - $n)));
+        ($x:expr, $n:expr) => ($x.rotate_left($n));
     );
     {
         macro_rules! F(

crates/core/src/year2018/day07.rs

@@ -55,12 +55,11 @@ fn parse_input(input_string: &str) -> Result<ParsedInput, String> {
         let step_name = parts[7]
             .chars()
             .next()
-            .ok_or(format!("Invalid line: {line_number}"))?;
+            .ok_or_else(|| format!("Invalid line: {line_number}"))?;
         let depends_on = parts[1]
             .chars()
             .next()
-            .ok_or(format!("Invalid line: {line_number}"))?;
-
+            .ok_or_else(|| format!("Invalid line: {line_number}"))?;
         let step = step_map
             .entry(step_name)
             .or_insert_with(|| Step::new(step_name));

crates/core/src/year2018/day10.rs

@@ -17,7 +17,7 @@ pub fn solve(input: &Input) -> Result<String, String> {
         .map(|(line_index, line)| {
             let error = || format!("Invalid input at line {}", line_index + 1);
 
-            let parts: Vec<&str> = line.split(|c| c == '<' || c == '>' || c == ',').collect();
+            let parts: Vec<&str> = line.split(['<', '>', ',']).collect();
             if parts.len() < 6 || !line.starts_with("position=") {
                 return Err(error());
             }

crates/core/src/year2018/day16.rs

@@ -47,7 +47,7 @@ impl ProblemInput {
             let after = line.starts_with("After:");
             if before || after {
                 let parts: Vec<u16> = line[9..]
-                    .split(|c| c == '[' || c == ']' || c == ',')
+                    .split(['[', ']', ','])
                     .filter_map(|s| {
                         if s.is_empty() {
                             None

crates/core/src/year2018/day23.rs

@@ -101,9 +101,7 @@ impl Nanobot {
             .enumerate()
             .map(|(line_index, line)| {
                 let line_number = line_index + 1;
-                let parts: Vec<&str> = line
-                    .split(|c| c == '<' || c == '>' || c == ',' || c == '=')
-                    .collect();
+                let parts: Vec<&str> = line.split(['<', '>', ',', '=']).collect();
                 let error_message = || format!("Invalid input on line {line_number}");
                 if parts.len() != 8 {
                     return Err(error_message());

crates/core/src/year2018/day24.rs

@@ -58,7 +58,7 @@ impl ArmyGroup {
             } else {
                 // "17 units each with 5390 hit points (weak to radiation, bludgeoning) with
                 // an attack that does 4507 fire damage at initiative 2".
-                let main_parts: Vec<&str> = line.split(|c| c == '(' || c == ')').collect();
+                let main_parts: Vec<&str> = line.split(['(', ')']).collect();
 
                 let mut weaknesses = Vec::new();
                 let mut immunities = Vec::new();

crates/core/src/year2019/day12.rs

@@ -28,9 +28,7 @@ impl Moons {
         let mut positions = [[0; 3]; 4];
         for (i, line) in input.lines().enumerate() {
             let error_message = |_| format!("Invalid line: {}", i + 1);
-            let parts: Vec<&str> = line
-                .split(|c| c == '=' || c == ' ' || c == '>' || c == ',')
-                .collect();
+            let parts: Vec<&str> = line.split(['=', ' ', '>', ',']).collect();
 
             if parts.len() != 9 {
                 return Err(format!("Invalid line: {}", i + 1));

crates/core/src/year2019/day22.rs

@@ -44,7 +44,7 @@ pub fn solve(input: &Input) -> Result<i128, String> {
         deck.iter()
             .position(|&card| card == 2019)
             .map(|p| p as i128)
-            .ok_or(format!("No card {desired_card} found"))
+            .ok_or_else(|| format!("No card {desired_card} found"))
     } else {
         /// Explanation:
         /// <https://www.reddit.com/r/adventofcode/comments/ee0rqi/2019_day_22_solutions/fbnkaju?utm_source=share&utm_medium=web2x/>

crates/core/src/year2021/day20.rs

@@ -12,7 +12,7 @@ struct Image {
 }
 
 impl Image {
-    fn new(pixels: Vec<bool>) -> Self {
+    const fn new(pixels: Vec<bool>) -> Self {
         Self { pixels }
     }
 

crates/grpc-server/src/main.rs

@@ -7,6 +7,7 @@ use advent::{ProblemInput, ProblemOutput};
 
 mod advent {
     #![allow(warnings)]
+    #![allow(clippy::derive_partial_eq_without_eq)]
     #![allow(clippy::future_not_send)]
     #![allow(clippy::missing_const_for_fn)]
     #![allow(clippy::similar_names)]

crates/svgplot/src/lib.rs

@@ -131,7 +131,7 @@ impl SvgImage {
                 .unwrap();
         }
         self.common_attributes.write(&mut buffer);
-        buffer.write_all(&[b'>', b'\n']).unwrap();
+        buffer.write_all(b">\n").unwrap();
 
         let mut first = true;
         for (id, element) in &self.elements {

rust-toolchain

@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.80.1"
+channel = "1.81.0"
 components = ["rustfmt", "clippy"]
 targets = ["wasm32-unknown-unknown"]