Prepare for 2022

.cargo/config.toml

@@ -1,7 +1,9 @@
 [alias]
 xtask = "run --release --package xtask --"
 day = "run --release --package xtask -- day"
-2021 = "run --bin aoc-2021 --"
-2022 = "run --bin aoc-2022 --"
-r2021 = "run --release --bin aoc-2021 --"
-r2022 = "run --release --bin aoc-2022 --"
+2015 = "run --bin aoc_2015 --"
+2021 = "run --bin aoc_2021 --"
+2022 = "run --bin aoc_2022 --"
+r2015 = "run --release --bin aoc_2015 --"
+r2021 = "run --release --bin aoc_2021 --"
+r2022 = "run --release --bin aoc_2022 --"

.gitignore

@@ -1,3 +1,5 @@
-/*/inputs/
-/*/target/
-target
+/crates/*/inputs/
+/crates/*/target/
+/target/
+/crates/xtask/src/TOKEN
+/.idea/

Cargo.toml

@@ -1,6 +1,5 @@
 [workspace]
 members = [
-    "2021",
-    "2022",
-    "xtask",
+    "util/*",
+    "year/*"
 ]

benchmarks/2021.md

@@ -1,5 +1,5 @@
 ## Running the benchmarks
-`cargo bench -p aoc-2021`
+`cargo bench -p aoc_2021`
 
 ## Benches
 ```

util/common/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "aoc_common"
+version = "0.1.0"
+edition = "2021"
+build = false
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+anyhow = "1.0.62"
+num-bigint = "0.4.3"

2021/src/main.rs → util/common/main.rs

@@ -1,16 +1,24 @@
+#![feature(drain_filter, let_chains, iterator_try_collect, hash_set_entry)]
 use std::{collections::HashMap, time::Instant};
 
-use aoc_2021::days::*;
+mod days;
+use days::*;
 
 include!(concat!(env!("OUT_DIR"), "/loc.rs"));
 
 fn main() -> anyhow::Result<()> {
     let loc: HashMap<&str, u32> = HashMap::from(PAIRS);
 
+    let name = env!("CARGO_PKG_NAME");
+    let rep = "#".repeat(name.len() + 6);
+    println!("{rep}");
+    println!("## {name} ##");
+    println!("{rep}");
     for arg in std::env::args().skip(1) {
         let func = include!("_match_days.rs");
 
-        println!("\n=== Day {:0>2} ===", arg);
+        println!("\n=== Day {arg:0>2} ===");
+        println!("From {}/day/{arg}", env!("CARGO_PKG_HOMEPAGE"));
 
         let instant = Instant::now();
         let result = func();
@@ -20,7 +28,7 @@ fn main() -> anyhow::Result<()> {
             println!("Part 1: {}\nPart 2: {}", part_1, part_2);
             println!("Took {} μs", elapsed);
 
-            let lines = loc.get(format!("day{:0>2}.rs", arg).as_str()).unwrap();
+            let lines = loc.get(format!("day{}.rs", arg).as_str()).unwrap();
             println!("Lines of code: {}", lines);
         } else {
             eprintln!("Error: {}", result.unwrap_err());

2021/src/coords.rs → util/common/src/coords.rs

@@ -56,12 +56,6 @@ fn as_index(x: isize, y: isize, width: isize) -> isize {
     x + y * width
 }
 
-impl std::convert::Into<Point> for Direction {
-    fn into(self) -> Point {
-        self.to_tuple()
-    }
-}
-
 impl std::convert::TryFrom<Point> for Direction {
     type Error = &'static str;
 
@@ -80,5 +74,3 @@ impl std::convert::TryFrom<Point> for Direction {
         }
     }
 }
-
-// fn as_xy

util/common/src/lib.rs

@@ -0,0 +1,2 @@
+pub mod result;
+pub mod coords;

util/common/src/result.rs

@@ -0,0 +1,90 @@
+use std::fmt::Display;
+
+use num_bigint::{BigInt, BigUint};
+
+pub fn done<A: Into<AocD>, B: Into<AocD>>(a: A, b: B) -> AocResult {
+    Ok((a.into(), b.into()))
+}
+
+pub type AocResult = anyhow::Result<(AocD, AocD)>;
+
+#[derive(Default, Debug, Clone)]
+pub enum AocD {
+    #[default]
+    Nothing,
+    Number(usize),
+    ULong(BigUint),
+    Integer(isize),
+    Long(BigInt),
+    String(String),
+    List(Vec<AocD>),
+}
+
+impl Display for AocD {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        use AocD::*;
+        match self {
+            Nothing => write!(f, "TODO"),
+            Integer(n) => write!(f, "{n}"),
+            Long(n) => write!(f, "{n}"),
+            Number(n) => write!(f, "{n}"),
+            String(s) => write!(f, "{s}"),
+            ULong(n) => write!(f, "{n}"),
+            List(l) => {
+                write!(f, "[")?;
+                let mut second = false;
+                for x in l {
+                    if second {
+                        write!(f, ", ")?;
+                    } else {
+                        second = true;
+                    }
+                    write!(f, "{x}")?;
+                }
+                write!(f, "]")
+            }
+        }
+    }
+}
+
+impl From<()> for AocD {
+    fn from(_: ()) -> Self {
+        Self::Nothing
+    }
+}
+
+impl From<Vec<AocD>> for AocD {
+    fn from(v: Vec<AocD>) -> Self {
+        Self::List(v)
+    }
+}
+
+impl From<String> for AocD {
+    fn from(v: String) -> Self {
+        Self::String(v)
+    }
+}
+
+impl From<BigInt> for AocD {
+    fn from(v: BigInt) -> Self {
+        Self::Long(v)
+    }
+}
+
+impl From<isize> for AocD {
+    fn from(v: isize) -> Self {
+        Self::Integer(v)
+    }
+}
+
+impl From<BigUint> for AocD {
+    fn from(v: BigUint) -> Self {
+        Self::ULong(v)
+    }
+}
+
+impl From<usize> for AocD {
+    fn from(v: usize) -> Self {
+        Self::Number(v)
+    }
+}

util/xtask/src/TOKEN

@@ -0,0 +1 @@
+53616c7465645f5f4c9bdcd6d080dc8e543af5be4d06b6da11a3c411a7527125dba01f618c97eede9fc8a185711d44cd92df0c701db8a4e638467adf46fe2d3d