Update dependencies to fix cargo audit

lpenz · Dec 14, 2024 · 5990647 · 5990647
1 parent 0fd8990
commit 5990647
Show file tree

Hide file tree

Showing 39 changed files with 140 additions and 152 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/aoc/Cargo.toml b/aoc/Cargo.toml
@@ -4,6 +4,6 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-color-eyre = "0.6.2"
+color-eyre = "0.6.3"
 humantime = "2.1.0"
 nom = "7.1.3"
diff --git a/day00-template/Cargo.toml b/day00-template/Cargo.toml
@@ -5,5 +5,5 @@ edition = "2021"
 
 [dependencies]
 aoc = { path = "../aoc" }
-color-eyre = "0.6.2"
+color-eyre = "0.6.3"
 nom = "7.1.3"
diff --git a/day01/Cargo.toml b/day01/Cargo.toml
@@ -5,6 +5,6 @@ edition = "2021"
 
 [dependencies]
 aoc = { path = "../aoc" }
-color-eyre = "0.6.2"
+color-eyre = "0.6.3"
 nom = "7.1.3"
-regex = "1.10.2"
+regex = "1.11.1"
diff --git a/day02/Cargo.toml b/day02/Cargo.toml
@@ -5,6 +5,6 @@ edition = "2021"
 
 [dependencies]
 aoc = { path = "../aoc" }
-color-eyre = "0.6.2"
+color-eyre = "0.6.3"
 nom = "7.1.3"
-rayon = "1.8.0"
+rayon = "1.10.0"
diff --git a/day03/Cargo.toml b/day03/Cargo.toml
@@ -5,6 +5,6 @@ edition = "2021"
 
 [dependencies]
 aoc = { path = "../aoc" }
-color-eyre = "0.6.2"
+color-eyre = "0.6.3"
 nom = "7.1.3"
-sqrid = "0.0.24"
+sqrid = "0.0.27"
diff --git a/day03/src/bin/day03a.rs b/day03/src/bin/day03a.rs
@@ -4,6 +4,8 @@
 
 use day03::*;
 
+use sqrid::postrait::PosT;
+
 fn process(bufin: impl BufRead) -> Result<u32> {
     let input = parser::parse(bufin)?;
     let mut grid = Grid::default();

diff --git a/day03/src/bin/day03b.rs b/day03/src/bin/day03b.rs
@@ -4,6 +4,8 @@
 
 use day03::*;
 
+use sqrid::postrait::PosT;
+
 fn process(bufin: impl BufRead) -> Result<u32> {
     let input = parser::parse(bufin)?;
     let mut grid = Grid::default();

diff --git a/day03/src/lib.rs b/day03/src/lib.rs
@@ -46,6 +46,7 @@ impl fmt::Display for Cell {
     }
 }
 
+use sqrid::postrait::PosT;
 pub use sqrid::Dir;
 pub type Sqrid = sqrid::sqrid_create!(140, 140, true);
 pub type Pos = sqrid::pos_create!(Sqrid);

diff --git a/day04/Cargo.toml b/day04/Cargo.toml
@@ -5,5 +5,5 @@ edition = "2021"
 
 [dependencies]
 aoc = { path = "../aoc" }
-color-eyre = "0.6.2"
+color-eyre = "0.6.3"
 nom = "7.1.3"
diff --git a/day05/Cargo.toml b/day05/Cargo.toml
@@ -5,6 +5,6 @@ edition = "2021"
 
 [dependencies]
 aoc = { path = "../aoc" }
-color-eyre = "0.6.2"
+color-eyre = "0.6.3"
 nom = "7.1.3"
-rayon = "1.8.0"
+rayon = "1.10.0"
diff --git a/day06/Cargo.toml b/day06/Cargo.toml
@@ -5,5 +5,5 @@ edition = "2021"
 
 [dependencies]
 aoc = { path = "../aoc" }
-color-eyre = "0.6.2"
+color-eyre = "0.6.3"
 nom = "7.1.3"
diff --git a/day07/Cargo.toml b/day07/Cargo.toml
@@ -5,6 +5,6 @@ edition = "2021"
 
 [dependencies]
 aoc = { path = "../aoc" }
-color-eyre = "0.6.2"
-itertools = "0.12.0"
+color-eyre = "0.6.3"
+itertools = "0.13.0"
 nom = "7.1.3"
diff --git a/day08/Cargo.toml b/day08/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 aoc = { path = "../aoc" }
-color-eyre = "0.6.2"
+color-eyre = "0.6.3"
 nom = "7.1.3"
-num = "0.4.1"
-rayon = "1.8.0"
+num = "0.4.3"
+rayon = "1.10.0"
diff --git a/day09/Cargo.toml b/day09/Cargo.toml
@@ -5,6 +5,6 @@ edition = "2021"
 
 [dependencies]
 aoc = { path = "../aoc" }
-color-eyre = "0.6.2"
+color-eyre = "0.6.3"
 nom = "7.1.3"
-rayon = "1.8.0"
+rayon = "1.10.0"
diff --git a/day09/src/bin/day09a.rs b/day09/src/bin/day09a.rs
@@ -6,7 +6,7 @@ use day09::*;
 
 use rayon::prelude::*;
 
-fn calc_next(nums: &Vec<i64>) -> i64 {
+fn calc_next(nums: &[i64]) -> i64 {
     let mut lastsum = nums[nums.len() - 1];
     let mut currdiff = diffs(nums);
     while !currdiff.par_iter().all(|n| n == &0) {
@@ -18,7 +18,7 @@ fn calc_next(nums: &Vec<i64>) -> i64 {
 
 fn process(bufin: impl BufRead) -> Result<i64> {
     let input = parser::parse(bufin)?;
-    Ok(input.par_iter().map(calc_next).sum())
+    Ok(input.par_iter().map(|v| calc_next(v)).sum())
 }
 
 #[test]

diff --git a/day10/Cargo.toml b/day10/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 aoc = { path = "../aoc" }
-color-eyre = "0.6.2"
-itertools = "0.12.0"
+color-eyre = "0.6.3"
+itertools = "0.13.0"
 nom = "7.1.3"
-sqrid = "0.0.24"
+sqrid = "0.0.27"
diff --git a/day10/src/bin/day10b.rs b/day10/src/bin/day10b.rs
@@ -4,6 +4,8 @@
 
 use day10::*;
 
+use sqrid::postrait::PosT;
+
 use itertools::Itertools;
 
 #[derive(Debug, Default, Clone, Copy)]

diff --git a/day11/Cargo.toml b/day11/Cargo.toml
@@ -5,5 +5,5 @@ edition = "2021"
 
 [dependencies]
 aoc = { path = "../aoc" }
-color-eyre = "0.6.2"
+color-eyre = "0.6.3"
 nom = "7.1.3"
diff --git a/day12/Cargo.toml b/day12/Cargo.toml
@@ -5,5 +5,5 @@ edition = "2021"
 
 [dependencies]
 aoc = { path = "../aoc" }
-color-eyre = "0.6.2"
+color-eyre = "0.6.3"
 nom = "7.1.3"
diff --git a/day13/Cargo.toml b/day13/Cargo.toml
@@ -5,5 +5,5 @@ edition = "2021"
 
 [dependencies]
 aoc = { path = "../aoc" }
-color-eyre = "0.6.2"
+color-eyre = "0.6.3"
 nom = "7.1.3"
diff --git a/day14/Cargo.toml b/day14/Cargo.toml
@@ -5,6 +5,6 @@ edition = "2021"
 
 [dependencies]
 aoc = { path = "../aoc" }
-color-eyre = "0.6.2"
+color-eyre = "0.6.3"
 nom = "7.1.3"
-sqrid = "0.0.24"
+sqrid = "0.0.27"
diff --git a/day14/src/lib.rs b/day14/src/lib.rs
@@ -4,6 +4,8 @@
 
 pub use aoc::*;
 
+use sqrid::postrait::PosT;
+
 use std::fmt;
 
 pub const EXAMPLE: &str = "O....#....

diff --git a/day15/Cargo.toml b/day15/Cargo.toml
@@ -5,5 +5,5 @@ edition = "2021"
 
 [dependencies]
 aoc = { path = "../aoc" }
-color-eyre = "0.6.2"
+color-eyre = "0.6.3"
 nom = "7.1.3"
diff --git a/day16/Cargo.toml b/day16/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 aoc = { path = "../aoc" }
-autofolder = "0.5.0"
-color-eyre = "0.6.2"
+autofolder = "0.5.1"
+color-eyre = "0.6.3"
 nom = "7.1.3"
-sqrid = "0.0.24"
+sqrid = "0.0.27"
diff --git a/day17/Cargo.toml b/day17/Cargo.toml
@@ -5,6 +5,6 @@ edition = "2021"
 
 [dependencies]
 aoc = { path = "../aoc" }
-color-eyre = "0.6.2"
+color-eyre = "0.6.3"
 nom = "7.1.3"
-sqrid = "0.0.24"
+sqrid = "0.0.27"
diff --git a/day17/src/lib.rs b/day17/src/lib.rs
@@ -9,6 +9,8 @@ use std::collections::BinaryHeap;
 use std::collections::HashMap;
 use std::collections::HashSet;
 
+use sqrid::postrait::PosT;
+
 pub const EXAMPLE: &str = "2413432311323
 3215453535623
 3255245654254
@@ -70,7 +72,7 @@ pub fn path_debug(_size: u16, gheat: &Grid, path: &[Dir]) {
     let mut gdir = Griddir::default();
     for dir in path {
         gdir[pos] = dir.name_utf8().to_string();
-        pos = (pos + dir).unwrap();
+        pos = (pos + *dir).unwrap();
         heat += gheat[pos];
         gheatacum[pos] = heat;
     }

diff --git a/day18/Cargo.toml b/day18/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 aoc = { path = "../aoc" }
-autofolder = "0.5.0"
-color-eyre = "0.6.2"
+autofolder = "0.5.1"
+color-eyre = "0.6.3"
 nom = "7.1.3"
-sqrid = "0.0.24"
+sqrid = "0.0.27"
diff --git a/day19/Cargo.toml b/day19/Cargo.toml
@@ -5,6 +5,6 @@ edition = "2021"
 
 [dependencies]
 aoc = { path = "../aoc" }
-color-eyre = "0.6.2"
+color-eyre = "0.6.3"
 copstr = "0.1.2"
 nom = "7.1.3"
diff --git a/day20/Cargo.toml b/day20/Cargo.toml
@@ -5,6 +5,6 @@ edition = "2021"
 
 [dependencies]
 aoc = { path = "../aoc" }
-color-eyre = "0.6.2"
+color-eyre = "0.6.3"
 copstr = "0.1.2"
 nom = "7.1.3"
diff --git a/day20/src/lib.rs b/day20/src/lib.rs
@@ -164,7 +164,7 @@ pub fn sts_init(modules: &BTreeMap<Mname, Module>) -> BTreeMap<Mname, ModState>
     for src_mname in modules.keys() {
         let src_module = &modules[src_mname];
         for dst_mname in &src_module.dsts {
-            let dst_module = &modules[&dst_mname];
+            let dst_module = &modules[dst_mname];
             if dst_module.mtype == Mtype::Conjunct {
                 let conj = sts.get_mut(dst_mname).unwrap();
                 conj.memory.insert(*src_mname, false);

diff --git a/day21/Cargo.toml b/day21/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 aoc = { path = "../aoc" }
-color-eyre = "0.6.2"
+color-eyre = "0.6.3"
 nom = "7.1.3"
-rayon = "1.8.0"
-sqrid = "0.0.24"
+rayon = "1.10.0"
+sqrid = "0.0.27"
diff --git a/day21/src/bin/day21a.rs b/day21/src/bin/day21a.rs
@@ -6,6 +6,8 @@ use day21::*;
 
 use std::collections::HashSet;
 
+use sqrid::postrait::PosT;
+
 pub use sqrid::Dir;
 pub type Sqrid = sqrid::sqrid_create!(131, 131, false);
 // pub type Sqrid = sqrid::sqrid_create!(11, 11, false);

diff --git a/day22/Cargo.toml b/day22/Cargo.toml
@@ -5,6 +5,6 @@ edition = "2021"
 
 [dependencies]
 aoc = { path = "../aoc" }
-color-eyre = "0.6.2"
+color-eyre = "0.6.3"
 nom = "7.1.3"
-rayon = "1.8.0"
+rayon = "1.10.0"
diff --git a/day23/Cargo.toml b/day23/Cargo.toml
@@ -5,6 +5,6 @@ edition = "2021"
 
 [dependencies]
 aoc = { path = "../aoc" }
-color-eyre = "0.6.2"
+color-eyre = "0.6.3"
 nom = "7.1.3"
-sqrid = "0.0.24"
+sqrid = "0.0.27"
diff --git a/day23/src/lib.rs b/day23/src/lib.rs
@@ -8,6 +8,8 @@ use std::collections::HashMap;
 use std::collections::HashSet;
 use std::fmt;
 
+use sqrid::postrait::PosT;
+
 pub const EXAMPLE: &str = "#.#####################
 #.......#########...###
 #######.#########.#.###

diff --git a/day24/Cargo.toml b/day24/Cargo.toml
@@ -5,6 +5,6 @@ edition = "2021"
 
 [dependencies]
 aoc = { path = "../aoc" }
-color-eyre = "0.6.2"
+color-eyre = "0.6.3"
 nom = "7.1.3"
 z3 = "0.12.1"
diff --git a/day24/src/bin/day24b.rs b/day24/src/bin/day24b.rs
@@ -6,7 +6,6 @@ use day24::*;
 
 use std::ops::Add;
 use std::ops::Mul;
-use z3;
 use z3::ast::Ast;
 use z3::{ast, Config, Context, Solver};
 

diff --git a/day25/Cargo.toml b/day25/Cargo.toml
@@ -5,6 +5,6 @@ edition = "2021"
 
 [dependencies]
 aoc = { path = "../aoc" }
-color-eyre = "0.6.2"
+color-eyre = "0.6.3"
 copstr = "0.1.2"
 nom = "7.1.3"