Replace collecting then computing by reduce.

This is a bad idea; it's actually slower

.github/workflows/2022.yml

@@ -1,7 +1,7 @@
 on:
   - push
 
-name: Advent of Code 2021
+name: Advent of Code 2022
 
 jobs:
   ci:
@@ -20,7 +20,7 @@ jobs:
     continue-on-error: ${{ matrix.experimental }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Install toolchain
         uses: actions-rs/toolchain@v1
@@ -30,17 +30,23 @@ jobs:
           override: true
           components: rustfmt, clippy
 
+      - name: Set up caching
+        uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: >
+            2022 -> target
+
       - name: Build binaries
-        working-directory: 2021
+        working-directory: 2022
         run: >
           cargo build --all-targets
 
       - name: Run tests
-        working-directory: 2021
+        working-directory: 2022
         run: >
           cargo test
 
       - name: Run clippy
-        working-directory: 2021
+        working-directory: 2022
         run: >
           cargo clippy -- --deny warnings

2016/day-04/Cargo.toml

@@ -4,4 +4,4 @@ version = "0.1.0"
 authors = ["Bert Peters <bert.ljpeters@gmail.com>"]
 
 [dependencies]
-regex = "0.1"
+regex = "1"

2016/day-04/src/main.rs

@@ -73,10 +73,10 @@ fn main() {
         let door_label = line.unwrap();
         let caps = room_pattern.captures(&door_label).unwrap();
 
-        let name = caps.at(1).unwrap();
+        let name = caps.get(1).unwrap().as_str();
-        let checksum = caps.at(4).unwrap();
+        let checksum = caps.get(4).unwrap().as_str();
         if is_valid(name, checksum) {
-            let sector_id = caps.at(3).unwrap().parse().unwrap();
+            let sector_id = caps.get(3).unwrap().as_str().parse().unwrap();
             cur_sum += sector_id;
 
             let decoded: String = name.chars()

2016/day-09/Cargo.toml

@@ -4,5 +4,5 @@ version = "0.1.0"
 authors = ["Bert Peters <bert.ljpeters@gmail.com>"]
 
 [dependencies]
-regex = "^0.1"
+regex = "1"
-lazy_static = "^0.2"
+lazy_static = "1"

2016/day-10/Cargo.toml

@@ -4,4 +4,4 @@ version = "0.1.0"
 authors = ["Bert Peters <bert.ljpeters@gmail.com>"]
 
 [dependencies]
-regex="^0.1"
+regex="1"

2021/README.md

@@ -20,3 +20,15 @@ OPTIONS:
     -i, --input <INPUT>    Read input from the given file instead of stdin
     -t, --time             Print time taken
 ```
+
+## That goal was achieved
+
+Runtime benchmarked with [Criterion], reading input directly from memory to avoid disk IO
+inconsistencies.
+
+![Cumulative time](./cumulative-time.svg)
+
+![Time by day](./individual-time.svg)
+
+
+[Criterion]: https://github.com/bheisler/criterion.rs

2021/create_timing_plots.py

@@ -0,0 +1,97 @@
+#!/usr/bin/env python3
+import json
+from pathlib import Path
+from typing import Dict
+
+import numpy as np
+import matplotlib.pyplot as plt
+
+
+def read_timings() -> Dict[int, Dict]:
+    timings = {}
+
+    for day in Path('target/criterion/part1').iterdir():
+        with open(day / 'new' / 'estimates.json', mode='rb') as f:
+            timings[int(day.parts[-1])] = {
+                1: json.load(f)
+            }
+
+    for day in Path('target/criterion/part2').iterdir():
+        with open(day / 'new' / 'estimates.json', mode='rb') as f:
+            timings[int(day.parts[-1])][2] = json.load(f)
+
+    return timings
+
+
+def plot_cumulative_time(timings: Dict[int, Dict]):
+    plt.clf()
+
+    times = [0]
+
+    for day in range(min(timings.keys()), max(timings.keys()) + 1):
+        times.append(timings[day][1]['mean']['point_estimate'])
+        if day < 25:
+            times.append(timings[day][2]['mean']['point_estimate'])
+        else:
+            times.append(0)
+
+    cumulative = np.cumsum(times)
+    # Convert from nanoseconds to seconds
+    cumulative /= 1e9
+
+    x = np.arange(0.0, 25.5, 0.5)
+
+    plt.plot(x, cumulative, label="Cumulative time", drawstyle='steps-post')
+    plt.plot([0, 25], [0, 0.5], label="Target time")
+    plt.ylabel('Cumulative time (s)')
+    plt.xlabel('Days completed')
+
+    plt.legend()
+    plt.tight_layout()
+
+    plt.xlim(0, 25)
+    plt.ylim(0, 0.5)
+
+    plt.savefig('cumulative-time.svg')
+
+
+def plot_individual_times(timings: Dict[int, Dict]):
+    plt.clf()
+
+    def plot(parts, **kwargs):
+        x = np.arange(1, len(parts) + 1)
+
+        values = np.array(list(part['mean']['point_estimate'] for part in parts))
+        upper = np.array(list(part['mean']['confidence_interval']['upper_bound'] for part in parts))
+        lower = np.array(list(part['mean']['confidence_interval']['lower_bound'] for part in parts))
+
+        # Convert from ns to s
+        yerr = np.array([upper - values, lower - values]) / 1e9
+        values = values / 1e9
+
+        plt.bar(x, values, yerr=yerr, align='edge', log=True, **kwargs)
+        pass
+
+    plot(list(timings[day][1] for day in range(1, 26)), label="Part 1", width=-0.4)
+    plot(list(timings[day][2] for day in range(1, 25)), label="Part 2", width=0.4)
+
+    plt.ylabel('Runtime (s)')
+    plt.xlabel('Day')
+
+    plt.xlim(0, 26)
+    plt.xticks(np.arange(1, 26))
+
+    plt.legend()
+    plt.tight_layout()
+
+    plt.savefig('individual-time.svg')
+
+
+def main():
+    timings = read_timings()
+    plot_cumulative_time(timings)
+    plot_individual_times(timings)
+
+
+if __name__ == '__main__':
+    main()

2021/src/day13.rs

@@ -48,7 +48,7 @@ fn parse_fold(input: &[u8]) -> IResult<&[u8], Fold> {
     )(input)
 }
 
-fn apply_fold(dots: &mut Vec<Coords>, fold: Fold) {
+fn apply_fold(dots: &mut [Coords], fold: Fold) {
     match fold {
         Fold::X(coord) => dots.iter_mut().for_each(|(x, _)| {
             if *x >= coord {

2021/src/day19.rs

@@ -1,6 +1,8 @@
+use std::collections::HashMap;
 use std::collections::HashSet;
 use std::io::Read;
 use std::ops::Add;
+use std::ops::Deref;
 use std::ops::Sub;
 
 use nom::bytes::complete::tag;
@@ -23,6 +25,10 @@ impl Point3 {
     pub fn manhattan(&self) -> i32 {
         self.0.into_iter().map(i32::abs).sum()
     }
+
+    pub fn euler_square(&self) -> i32 {
+        self.0.into_iter().map(|c| c * c).sum()
+    }
 }
 
 impl Sub for Point3 {
@@ -49,6 +55,44 @@ impl Add for Point3 {
     }
 }
 
+struct Scanner {
+    visible: Vec<Point3>,
+    distances: HashMap<i32, (Point3, Point3)>,
+}
+
+impl Scanner {
+    pub fn new(visible: Vec<Point3>) -> Self {
+        let distances = visible
+            .iter()
+            .enumerate()
+            .flat_map(|(skip, &a)| {
+                visible[(skip + 1)..]
+                    .iter()
+                    .map(move |&b| ((a - b).euler_square(), (a, b)))
+            })
+            .collect();
+
+        Self { visible, distances }
+    }
+
+    pub fn can_overlap(&self, other: &Self) -> bool {
+        other
+            .distances
+            .keys()
+            .filter(|&k| self.distances.contains_key(k))
+            .count()
+            >= 11
+    }
+}
+
+impl Deref for Scanner {
+    type Target = [Point3];
+
+    fn deref(&self) -> &Self::Target {
+        &self.visible
+    }
+}
+
 struct Rotations<'a> {
     points: &'a [Point3],
     axes: [usize; 3],
@@ -119,32 +163,56 @@ fn parse_point(input: &[u8]) -> IResult<&[u8], Point3> {
     )(input)
 }
 
-fn parse_input(input: &[u8]) -> IResult<&[u8], Vec<Vec<Point3>>> {
+fn parse_input(input: &[u8]) -> IResult<&[u8], Vec<Scanner>> {
     use nom::character::complete::i32;
     let parse_header = delimited(tag("--- scanner "), i32, tag(" ---\n"));
 
-    let parse_scanner = preceded(parse_header, many1(terminated(parse_point, newline)));
+    let parse_scanner = map(
+        preceded(parse_header, many1(terminated(parse_point, newline))),
+        Scanner::new,
+    );
     separated_list1(newline, parse_scanner)(input)
 }
 
-fn try_overlap(
+fn find_pivot(group: &Scanner, related: &Scanner) -> Option<Point3> {
-    correct: &[(Point3, HashSet<Point3>)],
+    let mut counter = HashMap::new();
-    candidate: &[Point3],
+
-) -> Option<(Point3, Vec<Point3>)> {
+    for (distance, &(a, b)) in &group.distances {
-    let mut relative = HashSet::new();
+        if related.distances.contains_key(distance) {
+            *counter.entry(a).or_insert(0) += 1;
+            *counter.entry(b).or_insert(0) += 1;
+        }
+    }
+
+    counter
+        .into_iter()
+        .max_by_key(|(_, count)| *count)
+        .map(|t| t.0)
+}
+
+fn try_overlap(matched: &Scanner, candidate: &Scanner) -> Option<(Point3, Scanner)> {
+    if !matched.can_overlap(candidate) {
+        return None;
+    }
+
+    let matched_pivot = find_pivot(matched, candidate)?;
+
+    let correct: HashSet<_> = matched.iter().map(|&base| base - matched_pivot).collect();
+
     for rot in Rotations::new(candidate) {
         for &start in &rot {
-            relative.clear();
+            let translated_iter = rot.iter().map(|&other| other - start);
 
-            relative.extend(rot.iter().map(|&other| other - start));
+            if translated_iter
-
+                .clone()
-            if let Some((base, _)) = correct.iter().find(|(_, correct_relative)| {
+                .filter(|p| correct.contains(p))
-                correct_relative.intersection(&relative).count() >= 12
+                .count()
-            }) {
+                >= 12
+            {
                 // Found a solution, build the correct output
-                let translated = relative.drain().map(|point| point + *base).collect();
+                let translated = translated_iter.map(|point| point + matched_pivot).collect();
 
-                return Some((start - *base, translated));
+                return Some((start - matched_pivot, Scanner::new(translated)));
             }
         }
     }
@@ -157,33 +225,30 @@ fn parts_common(input: &mut dyn Read) -> (HashSet<Point3>, Vec<Point3>) {
 
     let mut points: HashSet<_> = scanners[0].iter().copied().collect();
 
-    let mut todo = vec![std::mem::take(&mut scanners[0])];
+    let mut todo = vec![scanners.remove(0)];
     let mut scanners_found = vec![Point3::default()];
 
     while let Some(matched) = todo.pop() {
-        if scanners.iter().all(Vec::is_empty) {
+        if scanners.is_empty() {
             break;
         }
 
-        let relative: Vec<(Point3, HashSet<Point3>)> = matched
+        let mut i = 0;
-            .iter()
-            .map(|&base| (base, matched.iter().map(|&other| (other - base)).collect()))
-            .collect();
 
-        for candidate in &mut scanners {
+        while i < scanners.len() {
-            if candidate.is_empty() {
+            if let Some((scanner, result)) = try_overlap(&matched, &scanners[i]) {
-                continue;
+                scanners.remove(i);
-            }
-
-            if let Some((scanner, result)) = try_overlap(&relative, candidate) {
                 scanners_found.push(scanner);
                 points.extend(result.iter().copied());
                 todo.push(result);
-                candidate.clear();
+            } else {
+                i += 1;
             }
         }
     }
 
+    assert!(scanners.is_empty());
+
     (points, scanners_found)
 }
 

2022/Cargo.toml

@@ -0,0 +1,26 @@
+[package]
+name = "aoc_2022"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+anyhow = "1.0.66"
+clap = { version = "4.0.19", features = ["derive"] }
+nom = "7.1.1"
+
+[dev-dependencies]
+criterion = "0.4.0"
+
+[profile.release]
+# Keep debug information in release for better flamegraphs
+debug = true
+
+[profile.bench]
+# And same for benchmarking
+debug = true
+
+[[bench]]
+name = "days"
+harness = false

2022/README.md

@@ -0,0 +1,20 @@
+# Advent of Code 2022
+
+Another year and another Advent of Code in Rust. Because last year went so well, this time we'll be
+aiming for a total time of under 250ms.
+
+```console
+$ target/release/aoc_2022 --help
+Advent of Code 2022 runner
+
+Usage: aoc_2022 [OPTIONS] <DAY>
+
+Arguments:
+  <DAY>  Which day to run
+
+Options:
+  -t, --time           Print time taken
+  -2, --part2          Run part 2 instead of part 1
+  -i, --input <INPUT>  Read input from the given file instead of stdin
+  -h, --help           Print help information
+```

2022/benches/days.rs

@@ -0,0 +1,46 @@
+use std::fs::File;
+use std::io::Read;
+
+use aoc_2022::get_implementation;
+use criterion::criterion_group;
+use criterion::criterion_main;
+use criterion::BenchmarkId;
+use criterion::Criterion;
+
+/// Number of days we have an implementation to benchmark
+const DAYS_IMPLEMENTED: u8 = 2;
+
+fn read_input(day: u8) -> Vec<u8> {
+    let input_path = format!("inputs/{:02}.txt", day);
+
+    let mut buffer = Vec::new();
+    File::open(input_path)
+        .expect("Failed to open input file")
+        .read_to_end(&mut buffer)
+        .expect("Failed to read input file");
+
+    buffer
+}
+
+pub fn benchmark_days(c: &mut Criterion) {
+    for day in 1..=DAYS_IMPLEMENTED {
+        let input = read_input(day);
+
+        let part1 = get_implementation(day, false).unwrap();
+
+        c.bench_with_input(BenchmarkId::new("part1", day), &input, |b, i| {
+            b.iter(|| part1(i));
+        });
+
+        if day < 25 {
+            let part2 = get_implementation(day, true).unwrap();
+
+            c.bench_with_input(BenchmarkId::new("part2", day), &input, |b, i| {
+                b.iter(|| part2(i));
+            });
+        }
+    }
+}
+
+criterion_group!(benches, benchmark_days);
+criterion_main!(benches);

2022/src/common.rs

@@ -0,0 +1,94 @@
+//! Common helper utilities to all days
+
+use anyhow::Result;
+use nom::error::ErrorKind;
+use nom::error::ParseError;
+use nom::Finish;
+use nom::IResult;
+use nom::InputLength;
+use nom::Parser;
+
+/// Parse input from some nom parser and return as an anyhow result
+///
+/// This method exists as a convenience because nom's errors cannot otherwise be easily converted to
+/// an anyhow error, and I don't want to keep track of custom error implementations here.
+pub fn parse_input<'a, O>(
+    input: &'a [u8],
+    mut parser: impl Parser<&'a [u8], O, nom::error::Error<&'a [u8]>>,
+) -> Result<O> {
+    let (unparsed, output) = parser.parse(input).finish().map_err(|e| {
+        anyhow::anyhow!(
+            "Parser error {:?} to parse at {}",
+            e.code,
+            String::from_utf8_lossy(e.input)
+        )
+    })?;
+
+    if !unparsed.is_empty() {
+        Err(anyhow::anyhow!(
+            "Not all input consumed: {}",
+            String::from_utf8_lossy(unparsed)
+        ))
+    } else {
+        Ok(output)
+    }
+}
+
+/// Applies a parser iteratively and reduces the results using the given function. Fails if the
+/// embedded parser doesn't return at least one result.
+///
+/// # Arguments
+/// - `f`: the function to apply
+/// - `g`: the function that combines the result o `f` with previous results
+///
+/// This implementation is based on [`nom::multi::fold_many1`] with minor differences. If
+/// successful, this should probably be upstreamed.
+pub fn reduce_many1<I, O, E, F>(
+    mut f: F,
+    mut g: impl FnMut(O, O) -> O,
+) -> impl FnMut(I) -> IResult<I, O, E>
+where
+    I: Clone + InputLength,
+    E: ParseError<I>,
+    F: Parser<I, O, E>,
+{
+    // Cannot delegate to fold_many0 because that would make the function FnOnce rather than FnMut,
+    // since it would transfer ownership of the embedded parser to fold_many0.
+    move |i: I| {
+        let _i = i.clone();
+        match f.parse(_i) {
+            Err(nom::Err::Error(_)) => {
+                Err(nom::Err::Error(E::from_error_kind(i, ErrorKind::Many1)))
+            }
+            Err(e) => Err(e),
+            Ok((i1, mut acc)) => {
+                let mut input = i1;
+
+                loop {
+                    let _input = input.clone();
+                    let len = input.input_len();
+                    match f.parse(_input) {
+                        Err(nom::Err::Error(_)) => {
+                            break;
+                        }
+                        Err(e) => return Err(e),
+                        Ok((i, o)) => {
+                            // infinite loop check: the parser must always consume
+                            if i.input_len() == len {
+                                return Err(nom::Err::Failure(E::from_error_kind(
+                                    i,
+                                    ErrorKind::Many1,
+                                )));
+                            }
+
+                            acc = g(acc, o);
+                            input = i;
+                        }
+                    }
+                }
+
+                Ok((input, acc))
+            }
+        }
+    }
+}

2022/src/day01.rs

@@ -0,0 +1,55 @@
+use std::ops::Add;
+
+use anyhow::Result;
+use nom::character::complete::newline;
+use nom::combinator::opt;
+use nom::multi::separated_list0;
+use nom::sequence::terminated;
+use nom::IResult;
+
+use crate::common::parse_input;
+use crate::common::reduce_many1;
+
+fn parse_elf(input: &[u8]) -> IResult<&[u8], i32> {
+    reduce_many1(terminated(nom::character::complete::i32, newline), Add::add)(input)
+}
+
+fn parse_max(input: &[u8]) -> IResult<&[u8], i32> {
+    reduce_many1(terminated(parse_elf, opt(newline)), Ord::max)(input)
+}
+
+pub fn part1(input: &[u8]) -> Result<String> {
+    let result = parse_input(input, parse_max)?.to_string();
+    Ok(result)
+}
+
+fn parse_elf_list(input: &[u8]) -> IResult<&[u8], Vec<i32>> {
+    separated_list0(newline, parse_elf)(input)
+}
+
+pub fn part2(input: &[u8]) -> Result<String> {
+    let mut elves = parse_input(input, parse_elf_list)?;
+
+    let (first, third, _) = elves.select_nth_unstable_by(2, |a, b| Ord::cmp(b, a));
+
+    let result = first[1] + first[0] + *third;
+
+    Ok(result.to_string())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    const SAMPLE: &[u8] = include_bytes!("samples/01.txt");
+
+    #[test]
+    fn sample_part1() {
+        assert_eq!(part1(SAMPLE).unwrap(), "24000");
+    }
+
+    #[test]
+    fn sample_part2() {
+        assert_eq!(part2(SAMPLE).unwrap(), "45000");
+    }
+}

2022/src/day02.rs

@@ -0,0 +1,129 @@
+use std::ops::Add;
+
+use anyhow::Result;
+use nom::character::complete::newline;
+use nom::combinator::map;
+use nom::combinator::map_res;
+use nom::sequence::separated_pair;
+use nom::sequence::terminated;
+use nom::IResult;
+
+use crate::common::parse_input;
+use crate::common::reduce_many1;
+
+#[derive(Copy, Clone, Eq, PartialEq)]
+enum Rps {
+    Rock,
+    Paper,
+    Scissors,
+}
+
+impl Rps {
+    /// Score we get by playing this move
+    fn score(self) -> u32 {
+        match self {
+            Rps::Rock => 1,
+            Rps::Paper => 2,
+            Rps::Scissors => 3,
+        }
+    }
+
+    /// Score we get from the result from playing given other
+    fn score_against(self, other: Self) -> u32 {
+        match (self, other) {
+            (a, b) if a == b => 3,
+            (Rps::Rock, Rps::Paper) | (Rps::Paper, Rps::Scissors) | (Rps::Scissors, Rps::Rock) => 0,
+            _ => 6,
+        }
+    }
+
+    /// Score if the result is according to the instruction
+    fn score_result(self) -> u32 {
+        match self {
+            Rps::Rock => 0,     // Rock is lose
+            Rps::Paper => 3,    // Paper is draw
+            Rps::Scissors => 6, // Scissors is win
+        }
+    }
+
+    /// Move we need to achieve the result indicated by self
+    fn needed(self, other: Self) -> Self {
+        match (self, other) {
+            (Rps::Paper, other) => other,
+            (Rps::Rock, Rps::Rock) => Rps::Scissors,
+            (Rps::Rock, Rps::Paper) => Rps::Rock,
+            (Rps::Rock, Rps::Scissors) => Rps::Paper,
+            (Rps::Scissors, Rps::Rock) => Rps::Paper,
+            (Rps::Scissors, Rps::Paper) => Rps::Scissors,
+            (Rps::Scissors, Rps::Scissors) => Rps::Rock,
+        }
+    }
+}
+
+impl TryFrom<u8> for Rps {
+    type Error = anyhow::Error;
+
+    fn try_from(value: u8) -> Result<Self, Self::Error> {
+        match value {
+            b'A' | b'X' => Ok(Rps::Rock),
+            b'B' | b'Y' => Ok(Rps::Paper),
+            b'C' | b'Z' => Ok(Rps::Scissors),
+            _ => Err(anyhow::anyhow!("Invalid RPS: {value}")),
+        }
+    }
+}
+
+fn parse_line(input: &[u8]) -> IResult<&[u8], (Rps, Rps)> {
+    fn parse_rps(input: &[u8]) -> IResult<&[u8], Rps> {
+        // Note: alpha1 also sort of works but is significantly slower
+        map_res(nom::bytes::complete::take(1usize), |v: &[u8]| {
+            Rps::try_from(v[0])
+        })(input)
+    }
+
+    terminated(
+        separated_pair(parse_rps, nom::character::complete::char(' '), parse_rps),
+        newline,
+    )(input)
+}
+
+pub fn part1(input: &[u8]) -> Result<String> {
+    parse_input(
+        input,
+        reduce_many1(
+            map(parse_line, |(them, us)| us.score() + us.score_against(them)),
+            Add::add,
+        ),
+    )
+    .map(|sum| sum.to_string())
+}
+
+pub fn part2(input: &[u8]) -> Result<String> {
+    parse_input(
+        input,
+        reduce_many1(
+            map(parse_line, |(them, us)| {
+                us.score_result() + us.needed(them).score()
+            }),
+            Add::add,
+        ),
+    )
+    .map(|sum| sum.to_string())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    const SAMPLE: &[u8] = include_bytes!("samples/02.txt");
+
+    #[test]
+    fn sample_part1() {
+        assert_eq!(part1(SAMPLE).unwrap(), "15")
+    }
+
+    #[test]
+    fn sample_part2() {
+        assert_eq!(part2(SAMPLE).unwrap(), "12")
+    }
+}

2022/src/day03.rs

@@ -0,0 +1,9 @@
+use anyhow::Result;
+
+pub fn part1(_input: &[u8]) -> Result<String> {
+    todo!()
+}
+
+pub fn part2(_input: &[u8]) -> Result<String> {
+    todo!()
+}

2022/src/day04.rs

@@ -0,0 +1,9 @@
+use anyhow::Result;
+
+pub fn part1(_input: &[u8]) -> Result<String> {
+    todo!()
+}
+
+pub fn part2(_input: &[u8]) -> Result<String> {
+    todo!()
+}

2022/src/day05.rs

@@ -0,0 +1,9 @@
+use anyhow::Result;
+
+pub fn part1(_input: &[u8]) -> Result<String> {
+    todo!()
+}
+
+pub fn part2(_input: &[u8]) -> Result<String> {
+    todo!()
+}

2022/src/day06.rs

@@ -0,0 +1,9 @@
+use anyhow::Result;
+
+pub fn part1(_input: &[u8]) -> Result<String> {
+    todo!()
+}
+
+pub fn part2(_input: &[u8]) -> Result<String> {
+    todo!()
+}

2022/src/day07.rs

@@ -0,0 +1,9 @@
+use anyhow::Result;
+
+pub fn part1(_input: &[u8]) -> Result<String> {
+    todo!()
+}
+
+pub fn part2(_input: &[u8]) -> Result<String> {
+    todo!()
+}

2022/src/day08.rs

@@ -0,0 +1,9 @@
+use anyhow::Result;
+
+pub fn part1(_input: &[u8]) -> Result<String> {
+    todo!()
+}
+
+pub fn part2(_input: &[u8]) -> Result<String> {
+    todo!()
+}

2022/src/day09.rs

@@ -0,0 +1,9 @@
+use anyhow::Result;
+
+pub fn part1(_input: &[u8]) -> Result<String> {
+    todo!()
+}
+
+pub fn part2(_input: &[u8]) -> Result<String> {
+    todo!()
+}

2022/src/day10.rs

@@ -0,0 +1,9 @@
+use anyhow::Result;
+
+pub fn part1(_input: &[u8]) -> Result<String> {
+    todo!()
+}
+
+pub fn part2(_input: &[u8]) -> Result<String> {
+    todo!()
+}

2022/src/day11.rs

@@ -0,0 +1,9 @@
+use anyhow::Result;
+
+pub fn part1(_input: &[u8]) -> Result<String> {
+    todo!()
+}
+
+pub fn part2(_input: &[u8]) -> Result<String> {
+    todo!()
+}

2022/src/day12.rs

@@ -0,0 +1,9 @@
+use anyhow::Result;
+
+pub fn part1(_input: &[u8]) -> Result<String> {
+    todo!()
+}
+
+pub fn part2(_input: &[u8]) -> Result<String> {
+    todo!()
+}

2022/src/day13.rs

@@ -0,0 +1,9 @@
+use anyhow::Result;
+
+pub fn part1(_input: &[u8]) -> Result<String> {
+    todo!()
+}
+
+pub fn part2(_input: &[u8]) -> Result<String> {
+    todo!()
+}

2022/src/day14.rs

@@ -0,0 +1,9 @@
+use anyhow::Result;
+
+pub fn part1(_input: &[u8]) -> Result<String> {
+    todo!()
+}
+
+pub fn part2(_input: &[u8]) -> Result<String> {
+    todo!()
+}

2022/src/day15.rs

@@ -0,0 +1,9 @@
+use anyhow::Result;
+
+pub fn part1(_input: &[u8]) -> Result<String> {
+    todo!()
+}
+
+pub fn part2(_input: &[u8]) -> Result<String> {
+    todo!()
+}

2022/src/day16.rs

@@ -0,0 +1,9 @@
+use anyhow::Result;
+
+pub fn part1(_input: &[u8]) -> Result<String> {
+    todo!()
+}
+
+pub fn part2(_input: &[u8]) -> Result<String> {
+    todo!()
+}

2022/src/day17.rs

@@ -0,0 +1,9 @@
+use anyhow::Result;
+
+pub fn part1(_input: &[u8]) -> Result<String> {
+    todo!()
+}
+
+pub fn part2(_input: &[u8]) -> Result<String> {
+    todo!()
+}

2022/src/day18.rs

@@ -0,0 +1,9 @@
+use anyhow::Result;
+
+pub fn part1(_input: &[u8]) -> Result<String> {
+    todo!()
+}
+
+pub fn part2(_input: &[u8]) -> Result<String> {
+    todo!()
+}

2022/src/day19.rs

@@ -0,0 +1,9 @@
+use anyhow::Result;
+
+pub fn part1(_input: &[u8]) -> Result<String> {
+    todo!()
+}
+
+pub fn part2(_input: &[u8]) -> Result<String> {
+    todo!()
+}

2022/src/day20.rs

@@ -0,0 +1,9 @@
+use anyhow::Result;
+
+pub fn part1(_input: &[u8]) -> Result<String> {
+    todo!()
+}
+
+pub fn part2(_input: &[u8]) -> Result<String> {
+    todo!()
+}

2022/src/day21.rs

@@ -0,0 +1,9 @@
+use anyhow::Result;
+
+pub fn part1(_input: &[u8]) -> Result<String> {
+    todo!()
+}
+
+pub fn part2(_input: &[u8]) -> Result<String> {
+    todo!()
+}

2022/src/day22.rs

@@ -0,0 +1,9 @@
+use anyhow::Result;
+
+pub fn part1(_input: &[u8]) -> Result<String> {
+    todo!()
+}
+
+pub fn part2(_input: &[u8]) -> Result<String> {
+    todo!()
+}

2022/src/day23.rs

@@ -0,0 +1,9 @@
+use anyhow::Result;
+
+pub fn part1(_input: &[u8]) -> Result<String> {
+    todo!()
+}
+
+pub fn part2(_input: &[u8]) -> Result<String> {
+    todo!()
+}

2022/src/day24.rs

@@ -0,0 +1,9 @@
+use anyhow::Result;
+
+pub fn part1(_input: &[u8]) -> Result<String> {
+    todo!()
+}
+
+pub fn part2(_input: &[u8]) -> Result<String> {
+    todo!()
+}

2022/src/day25.rs

@@ -0,0 +1,5 @@
+use anyhow::Result;
+
+pub fn part1(_input: &[u8]) -> Result<String> {
+    todo!()
+}

2022/src/lib.rs

@@ -0,0 +1,91 @@
+use anyhow::Result;
+
+mod common;
+mod day01;
+mod day02;
+mod day03;
+mod day04;
+mod day05;
+mod day06;
+mod day07;
+mod day08;
+mod day09;
+mod day10;
+mod day11;
+mod day12;
+mod day13;
+mod day14;
+mod day15;
+mod day16;
+mod day17;
+mod day18;
+mod day19;
+mod day20;
+mod day21;
+mod day22;
+mod day23;
+mod day24;
+mod day25;
+
+type Solution = fn(&[u8]) -> Result<String>;
+
+pub fn get_implementation(day: u8, part2: bool) -> Result<Solution> {
+    if !part2 {
+        match day {
+            1 => Ok(day01::part1),
+            2 => Ok(day02::part1),
+            3 => Ok(day03::part1),
+            4 => Ok(day04::part1),
+            5 => Ok(day05::part1),
+            6 => Ok(day06::part1),
+            7 => Ok(day07::part1),
+            8 => Ok(day08::part1),
+            9 => Ok(day09::part1),
+            10 => Ok(day10::part1),
+            11 => Ok(day11::part1),
+            12 => Ok(day12::part1),
+            13 => Ok(day13::part1),
+            14 => Ok(day14::part1),
+            15 => Ok(day15::part1),
+            16 => Ok(day16::part1),
+            17 => Ok(day17::part1),
+            18 => Ok(day18::part1),
+            19 => Ok(day19::part1),
+            20 => Ok(day20::part1),
+            21 => Ok(day21::part1),
+            22 => Ok(day22::part1),
+            23 => Ok(day23::part1),
+            24 => Ok(day24::part1),
+            25 => Ok(day25::part1),
+            _ => anyhow::bail!("Invalid day for part 1: {day}"),
+        }
+    } else {
+        match day {
+            1 => Ok(day01::part2),
+            2 => Ok(day02::part2),
+            3 => Ok(day03::part2),
+            4 => Ok(day04::part2),
+            5 => Ok(day05::part2),
+            6 => Ok(day06::part2),
+            7 => Ok(day07::part2),
+            8 => Ok(day08::part2),
+            9 => Ok(day09::part2),
+            10 => Ok(day10::part2),
+            11 => Ok(day11::part2),
+            12 => Ok(day12::part2),
+            13 => Ok(day13::part2),
+            14 => Ok(day14::part2),
+            15 => Ok(day15::part2),
+            16 => Ok(day16::part2),
+            17 => Ok(day17::part2),
+            18 => Ok(day18::part2),
+            19 => Ok(day19::part2),
+            20 => Ok(day20::part2),
+            21 => Ok(day21::part2),
+            22 => Ok(day22::part2),
+            23 => Ok(day23::part2),
+            24 => Ok(day24::part2),
+            _ => anyhow::bail!("Invalid day for part 2: {day}"),
+        }
+    }
+}

2022/src/main.rs

@@ -0,0 +1,61 @@
+use std::fs::File;
+use std::io::Read;
+use std::num::NonZeroU8;
+use std::path::PathBuf;
+use std::time::Instant;
+
+use anyhow::Result;
+use clap::Parser;
+
+use aoc_2022::get_implementation;
+
+/// Advent of Code 2022 runner
+#[derive(Parser)]
+struct Opts {
+    /// Which day to run
+    day: NonZeroU8,
+
+    /// Print time taken
+    #[clap(short, long)]
+    time: bool,
+
+    /// Run part 2 instead of part 1
+    #[clap(short = '2', long)]
+    part2: bool,
+
+    /// Read input from the given file instead of stdin
+    #[clap(short, long)]
+    input: Option<PathBuf>,
+}
+
+impl Opts {
+    fn input_data(&self) -> Result<Vec<u8>> {
+        let mut buffer = Vec::new();
+
+        if let Some(input) = &self.input {
+            File::open(input)?.read_to_end(&mut buffer)?;
+        } else {
+            std::io::stdin().read_to_end(&mut buffer)?;
+        }
+
+        Ok(buffer)
+    }
+}
+
+fn main() -> Result<()> {
+    let opts: Opts = Opts::parse();
+
+    let input = opts.input_data()?;
+
+    let implementation = get_implementation(opts.day.get(), opts.part2)?;
+
+    let begin = Instant::now();
+    let result = implementation(&input)?;
+
+    if opts.time {
+        eprintln!("Execution time: {:?}", Instant::now().duration_since(begin));
+    }
+
+    println!("{}", result);
+    Ok(())
+}

2022/src/samples/01.txt

@@ -0,0 +1,14 @@
+1000
+2000
+3000
+
+4000
+
+5000
+6000
+
+7000
+8000
+9000
+
+10000

2022/src/samples/02.txt

@@ -0,0 +1,3 @@
+A Y
+B X
+C Z

README.md

@@ -1,6 +1,6 @@
 # Advent of Code
 
-[![Advent of Code 2021](https://github.com/bertptrs/adventofcode/actions/workflows/2021.yml/badge.svg)](https://github.com/bertptrs/adventofcode/actions/workflows/2021.yml)
+[![Advent of Code 2021](https://github.com/bertptrs/adventofcode/actions/workflows/2022.yml/badge.svg)](https://github.com/bertptrs/adventofcode/actions/workflows/2022.yml)
 
 This repository contains my solutions for Advent of Code. See:
 
@@ -11,3 +11,4 @@ This repository contains my solutions for Advent of Code. See:
 - [2019 edition](./2019)
 - [2020 edition](./2020)
 - [2021 edition](./2021)
+- [2022 edition](./2022)