reorg cont'd

Author: rene-d

.gitignore

@@ -16,6 +16,7 @@ __pycache__/
 *.log
 
 input.txt
+answer.txt
 
 /build/
 build/

2015/day1/day1.rs

@@ -1,7 +1,8 @@
 //! [Day 1: Not Quite Lisp](https://adventofcode.com/2015/day/1)
 
 /// Solve the puzzle.
-fn solve(data: &str) -> (i32, i32) {
+#[must_use]
+pub fn solve(data: &str) -> (i32, i32) {
     let mut floor = 0;
     let mut position = 0;
     let mut enter = 0;
@@ -22,8 +23,8 @@ fn solve(data: &str) -> (i32, i32) {
 }
 
 /// Main function.
-fn main() {
-    let mut args = aoc::parse_args();
+pub fn main() {
+    let args = aoc::parse_args();
 
     args.run(solve);
 }

2015/day10/day10.rs

@@ -1,12 +1,15 @@
 //! [Day 10: Elves Look, Elves Say](https://adventofcode.com/2015/day/10)
 
 /// main function
-fn main() {
-    let mut args = aoc::parse_args();
+pub fn main() {
+    let args = aoc::parse_args();
     args.run(solve);
 }
 
-fn solve(data: &str) -> (usize, usize) {
+/// # Panics
+/// over malformed input
+#[must_use]
+pub fn solve(data: &str) -> (usize, usize) {
     let data = data.trim_ascii();
 
     (calc(data, 40), calc(data, 50))

2015/day11/day11.rs

@@ -3,7 +3,7 @@
 use std::fmt;
 
 #[derive(Clone)]
-struct Password {
+pub struct Password {
     pwd: Vec<char>,
     loops: usize,
 }
@@ -90,15 +90,18 @@ impl fmt::Display for Password {
     }
 }
 
-fn solve(data: &str) -> (Password, Password) {
+/// # Panics
+/// over malformed input
+#[must_use]
+pub fn solve(data: &str) -> (Password, Password) {
     let mut pwd: Password = Password::new(data.trim_ascii());
 
     (pwd.next_valid(), pwd.next_valid())
 }
 
 /// main function
-fn main() {
-    let mut args = aoc::parse_args();
+pub fn main() {
+    let args = aoc::parse_args();
     args.run(solve);
 }
 

2015/day12/day12.rs

@@ -4,12 +4,15 @@ use regex::Regex;
 use serde_json::Value;
 
 /// main function
-fn main() {
-    let mut args = aoc::parse_args();
+pub fn main() {
+    let args = aoc::parse_args();
     args.run(solve);
 }
 
-fn solve(data: &str) -> (i32, i32) {
+/// # Panics
+/// over malformed input
+#[must_use]
+pub fn solve(data: &str) -> (i32, i32) {
     (part1(data), part2(data))
 }
 

2015/day13/day13.rs

@@ -24,9 +24,12 @@ fn calc<'a>(names: &FxHashSet<&'a str>, happiness: &FxHashMap<(&'a str, &'a str)
         .unwrap()
 }
 
-fn solve<'a>(data: &'a str) -> (i32, i32) {
-    let mut names: FxHashSet<&'a str> = FxHashSet::default();
-    let mut happiness: FxHashMap<(&'a str, &'a str), i32> = FxHashMap::default();
+/// # Panics
+/// over malformed input
+#[must_use]
+pub fn solve(data: &str) -> (i32, i32) {
+    let mut names: FxHashSet<&str> = FxHashSet::default();
+    let mut happiness: FxHashMap<(&str, &str), i32> = FxHashMap::default();
 
     let re =
         Regex::new(r"^(.+) would (gain|lose) (\d+) happiness units by sitting next to (.+)\.$")
@@ -64,8 +67,8 @@ fn solve<'a>(data: &'a str) -> (i32, i32) {
 }
 
 /// main function
-fn main() {
-    let mut args = aoc::parse_args();
+pub fn main() {
+    let args = aoc::parse_args();
     args.run(solve);
 }
 

2015/day14/day14.rs

@@ -80,13 +80,16 @@ fn solve_duration(data: &str, max_duration: u32) -> (u32, u32) {
     (max_distance, *scores.iter().max().unwrap())
 }
 
-fn solve(data: &str) -> (u32, u32) {
+/// # Panics
+/// over malformed input
+#[must_use]
+pub fn solve(data: &str) -> (u32, u32) {
     solve_duration(data, 2503)
 }
 
 /// Main function.
-fn main() {
-    let mut args = aoc::parse_args();
+pub fn main() {
+    let args = aoc::parse_args();
     args.run(solve);
 }
 

2015/day15/day15.rs

@@ -11,7 +11,11 @@ struct Ingredient {
     texture: i64,
     calories: i64,
 }
-fn solve(data: &str) -> (i64, i64) {
+
+/// # Panics
+/// over malformed input
+#[must_use]
+pub fn solve(data: &str) -> (i64, i64) {
     // load data
     let mut ingredients = Vec::new();
     let re = Regex::new(r"(\w+): capacity (-?\d+), durability (-?\d+), flavor (-?\d+), texture (-?\d+), calories (-?\d+)").unwrap();
@@ -105,8 +109,8 @@ fn solve(data: &str) -> (i64, i64) {
 }
 
 /// main function
-fn main() {
-    let mut args = aoc::parse_args();
+pub fn main() {
+    let args = aoc::parse_args();
     args.run(solve);
 }
 

2015/day16/day16.rs

@@ -67,12 +67,13 @@ impl<'a> Puzzle<'a> {
 }
 
 /// main function
-fn solve(data: &str) -> (u32, u32) {
+#[must_use]
+pub fn solve(data: &str) -> (u32, u32) {
     let puzzle = Puzzle::new(data);
     (puzzle.part1(), puzzle.part2())
 }
 
-fn main() {
-    let mut args = aoc::parse_args();
+pub fn main() {
+    let args = aoc::parse_args();
     args.run(solve);
 }

2015/day17/day17.rs

@@ -4,12 +4,15 @@ use itertools::Itertools;
 use rustc_hash::FxHashMap;
 
 /// main function
-fn main() {
-    let mut args = aoc::parse_args();
+pub fn main() {
+    let args = aoc::parse_args();
     args.run(solve);
 }
 
-fn solve(data: &str) -> (i32, usize) {
+/// # Panics
+/// over malformed input
+#[must_use]
+pub fn solve(data: &str) -> (i32, usize) {
     solve_eggnot(data, 150)
 }