Large refactor

Splits different years into different subfolders, and adds a shared crate.  This is because I want to start working on AoC 2019 while I wait for 2020 problems to release

Author: Quantumplation

Cargo.lock

@@ -1,11 +1,8 @@
-[package]
-name = "advent-2020"
-version = "0.1.0"
-authors = ["Pi Lanningham <[email protected]>"]
-edition = "2018"
+[workspace]
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-anyhow = "1.0.34"
-matches = "0.1.8"
+members = [
+  "advent-shared",
+  "advent-2019",
+  "advent-2020"
+]
+default-members = ["advent-2020"]

Cargo.toml

@@ -0,0 +1 @@
+/target

advent-2019/.gitignore

@@ -0,0 +1,11 @@
+[package]
+name = "advent-2019"
+version = "0.1.0"
+authors = ["Pi Lanningham <[email protected]>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+advent-shared = { path = "../advent-shared" }
+anyhow = "1.0.34"

advent-2019/Cargo.lock

@@ -0,0 +1,100 @@
+122281
+124795
+58593
+133744
+67625
+109032
+50156
+80746
+130872
+79490
+126283
+146564
+73075
+130170
+139853
+92599
+96965
+58149
+94254
+89074
+52977
+148092
+92073
+136765
+144755
+142487
+54827
+135588
+91411
+51597
+70040
+68880
+117120
+137115
+72829
+100048
+65187
+131464
+95813
+146891
+128799
+94568
+67178
+94903
+67193
+127613
+115782
+85360
+129820
+50989
+63471
+106724
+145768
+55169
+77555
+82978
+87728
+69141
+95518
+82985
+83387
+83089
+64372
+127931
+99277
+58930
+99098
+95621
+147797
+64102
+118857
+71014
+84881
+147294
+72166
+71348
+149240
+117963
+89181
+144770
+102444
+99103
+72341
+56076
+128515
+51319
+147595
+98431
+141102
+148617
+84685
+111427
+82351
+57021
+63834
+113059
+119970
+87078
+120631
+124942

advent-2019/Cargo.toml

@@ -0,0 +1,16 @@
+use anyhow::*;
+use advent_shared::parsers::*;
+use std::path::PathBuf;
+mod parsers;
+mod solutions;
+
+fn solve<P, I, S, R>(file: &str, p: P, s: S) -> Result<R>
+    where
+        P : Fn(PathBuf) -> Result<I>,
+        S : Fn(I) -> Result<R> {
+    s(p([r"advent-2019", "input", file].iter().collect())?)
+}
+
+fn main() {
+    println!("1.1) {:?}", solve("day1.txt", vec_of, |a: Vec<u64>| {Ok(a)}));
+}

advent-2019/input/day1.txt

@@ -0,0 +1 @@
+pub mod day1;

advent-2019/src/main.rs

@@ -0,0 +1 @@
+/target

advent-2019/src/parsers/mod.rs

@@ -0,0 +1,12 @@
+[package]
+name = "advent-2020"
+version = "0.1.0"
+authors = ["Pi Lanningham <[email protected]>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+advent-shared = { path = "../advent-shared" }
+anyhow = "1.0.34"
+matches = "0.1.8"

advent-2019/src/solutions/day1.rs

@@ -0,0 +1,25 @@
+mod parsers;
+mod solutions;
+use std::path::PathBuf;
+
+use advent_shared::parsers::*;
+use solutions::*;
+use anyhow::*;
+
+fn solve<P, I, S, R>(file: &str, p: P, s: S) -> Result<R>
+    where
+        P : Fn(PathBuf) -> Result<I>,
+        S : Fn(I) -> Result<R> {
+    s(p([r"advent-2020", "input", file].iter().collect())?)
+}
+
+fn main() -> Result<()> {
+    println!("1.1) {:?}", solve("day1.txt", vec_of, day1::sum_2020)?);
+    println!("1.2) {:?}", solve("day1.txt", vec_of, day1::sum_3_2020)?);
+    println!("2.1) {:?}", solve("day2.txt", vec_of, day2::part1::solve)?);
+    println!("2.2) {:?}", solve("day2.txt", vec_of, day2::part2::solve)?);
+    println!("3.1) {:?}", solve("day3.txt", vec_of, day3::part1)?);
+    println!("3.2) {:?}", solve("day3.txt", vec_of, day3::part2)?);
+
+    Ok(())
+}

advent-2019/src/solutions/mod.rs

@@ -0,0 +1 @@
+/target

advent-2020/.gitignore

@@ -0,0 +1,10 @@
+[package]
+name = "advent-shared"
+version = "0.1.0"
+authors = ["Pi Lanningham <[email protected]>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+anyhow = "1.0.34"

advent-2020/Cargo.lock

@@ -0,0 +1,5 @@
+pub mod parsers;
+
+#[cfg(test)]
+mod tests {
+}

advent-2020/Cargo.toml

@@ -0,0 +1,2 @@
+mod vec_of;
+pub use vec_of::*;

input/day1.txt renamed to advent-2020/input/day1.txt

@@ -1,7 +1,7 @@
 use anyhow::*;
-use std::{fmt::Debug, fs, str::FromStr};
+use std::{fmt::Debug, path::PathBuf, fs, str::FromStr};
 
-pub fn parse<T>(file: &str) -> Result<Vec<T>>
+pub fn vec_of<T>(file: PathBuf) -> Result<Vec<T>>
 where
     T: FromStr,
     <T as FromStr>::Err: Debug,