rust - fixes and updates

Author: pareronia

Makefile

@@ -38,7 +38,7 @@ JAVA_CMD := $(JAVA_EXE) -ea
 JAVAC_CMD := $(JAVAC_EXE) -encoding utf-8 -proc:full
 JAVA_UNITTEST_CMD := org.junit.platform.console.ConsoleLauncher
 JULIA_CMD := julia --optimize
-CARGO_CMD := cargo
+CARGO_CMD := RUSTFLAGS='-C target-cpu=native' cargo
 RUSTFMT := rustfmt
 BAZEL := bazel
 WSLPATH := wslpath

rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.74.0"
+channel = "1.77.2"

src/main/rust/AoC2022_08/src/main.rs

@@ -56,7 +56,7 @@ impl aoc::Puzzle for AoC2022_08 {
     aoc::puzzle_year_day!(2022, 8);
 
     fn parse_input(&self, lines: Vec<String>) -> IntGrid {
-        IntGrid::from(&lines.iter().map(AsRef::as_ref).collect())
+        IntGrid::from(&lines.iter().map(AsRef::as_ref).collect::<Vec<_>>())
     }
 
     fn part_1(&self, grid: &IntGrid) -> usize {

src/main/rust/AoC2022_12/src/main.rs

@@ -49,7 +49,9 @@ impl aoc::Puzzle for AoC2022_12 {
     aoc::puzzle_year_day!(2022, 12);
 
     fn parse_input(&self, lines: Vec<String>) -> HeightMap {
-        let grid = CharGrid::from(&lines.iter().map(AsRef::as_ref).collect());
+        let grid = CharGrid::from(
+            &lines.iter().map(AsRef::as_ref).collect::<Vec<_>>(),
+        );
         let start = grid.find_first_matching(|val| val == END).unwrap();
         HeightMap { grid, start }
     }

src/main/rust/AoC2023_03/src/main.rs

@@ -54,7 +54,9 @@ impl aoc::Puzzle for AoC2023_03 {
                 .next()
         }
 
-        let grid = CharGrid::from(&lines.iter().map(|s| s.as_str()).collect());
+        let grid = CharGrid::from(
+            &lines.iter().map(|s| s.as_str()).collect::<Vec<_>>(),
+        );
         grid.get_rows_as_string()
             .iter()
             .enumerate()

src/main/rust/AoC2023_16/src/main.rs

@@ -108,7 +108,9 @@ impl aoc::Puzzle for AoC2023_16 {
     aoc::puzzle_year_day!(2023, 16);
 
     fn parse_input(&self, lines: Vec<String>) -> Contraption {
-        let grid = CharGrid::from(&lines.iter().map(AsRef::as_ref).collect());
+        let grid = CharGrid::from(
+            &lines.iter().map(AsRef::as_ref).collect::<Vec<_>>(),
+        );
         Contraption { grid }
     }
 

src/main/rust/AoC2023_17/src/main.rs

@@ -68,7 +68,7 @@ impl aoc::Puzzle for AoC2023_17 {
     aoc::puzzle_year_day!(2023, 17);
 
     fn parse_input(&self, lines: Vec<String>) -> IntGrid {
-        IntGrid::from(&lines.iter().map(AsRef::as_ref).collect())
+        IntGrid::from(&lines.iter().map(AsRef::as_ref).collect::<Vec<_>>())
     }
 
     fn part_1(&self, grid: &IntGrid) -> u32 {

src/main/rust/AoC2023_21/src/main.rs

@@ -51,7 +51,7 @@ impl aoc::Puzzle for AoC2023_21 {
     aoc::puzzle_year_day!(2023, 21);
 
     fn parse_input(&self, lines: Vec<String>) -> CharGrid {
-        CharGrid::from(&lines.iter().map(AsRef::as_ref).collect())
+        CharGrid::from(&lines.iter().map(AsRef::as_ref).collect::<Vec<_>>())
     }
 
     fn part_1(&self, grid: &CharGrid) -> u64 {

src/main/rust/AoC2023_23/src/main.rs

@@ -198,7 +198,7 @@ impl aoc::Puzzle for AoC2023_23 {
     aoc::puzzle_year_day!(2023, 23);
 
     fn parse_input(&self, lines: Vec<String>) -> CharGrid {
-        CharGrid::from(&lines.iter().map(AsRef::as_ref).collect())
+        CharGrid::from(&lines.iter().map(AsRef::as_ref).collect::<Vec<_>>())
     }
 
     fn part_1(&self, grid: &CharGrid) -> u32 {

src/main/rust/aoc/src/geometry.rs

@@ -1,7 +1,7 @@
-use std::collections::HashSet;
-use std::str::FromStr;
 use core::fmt;
 use core::fmt::Display;
+use std::collections::HashSet;
+use std::str::FromStr;
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
 pub struct XY {

src/main/rust/aoc/src/graph.rs

@@ -186,7 +186,7 @@ where
             paths,
         }
     }
-    
+
     pub fn distance(
         start: T,
         is_end: impl Fn(T) -> bool,

src/main/rust/aoc/src/grid.rs

@@ -352,7 +352,7 @@ pub struct IntGrid {
 }
 
 impl IntGrid {
-    pub fn from(input: &Vec<&str>) -> IntGrid {
+    pub fn from(input: &[&str]) -> IntGrid {
         let width = match input.len() {
             0 => panic!("Empty input to Grid"),
             _ => input[0].chars().count(),
@@ -404,7 +404,7 @@ pub struct CharGrid {
 }
 
 impl CharGrid {
-    pub fn from(input: &Vec<&str>) -> CharGrid {
+    pub fn from(input: &[&str]) -> CharGrid {
         let width = match input.len() {
             0 => panic!("Empty input to Grid"),
             _ => input[0].chars().count(),