refactor: standardize project naming to aoc-<lang>-<year> and clean up imports

markkovari · markkovari · commit e0779a9e73d8 · 2026-04-27T23:37:20.000+02:00
diff --git a/golang/2017/go.mod b/golang/2017/go.mod
@@ -1,7 +1,7 @@
-module github.com/markkovari/advent_of_code/2017
+module github.com/markkovari/advent_of_code/golang/2017
 
 go 1.22
 
-require github.com/markkovari/advent_of_code/aoc-go-common v0.0.0-00010101000000-000000000000
+require github.com/markkovari/advent_of_code/golang/common v0.0.0-00010101000000-000000000000
 
-replace github.com/markkovari/advent_of_code/aoc-go-common => ../common
+replace github.com/markkovari/advent_of_code/golang/common => ../common
diff --git a/golang/2017/main.go b/golang/2017/main.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/markkovari/advent_of_code/aoc-go-common"
+	"github.com/markkovari/advent_of_code/common"
 )
 
 func main() {
diff --git a/golang/2019/go.mod b/golang/2019/go.mod
@@ -1,7 +1,7 @@
-module github.com/markkovari/advent_of_code/2019
+module github.com/markkovari/advent_of_code/golang/2019
 
 go 1.22
 
-replace github.com/markkovari/advent_of_code/aoc-go-common => ../common
+replace github.com/markkovari/advent_of_code/golang/common => ../common
 
-require github.com/markkovari/advent_of_code/aoc-go-common v0.0.0-00010101000000-000000000000
+require github.com/markkovari/advent_of_code/golang/common v0.0.0-00010101000000-000000000000
diff --git a/golang/2019/main.go b/golang/2019/main.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/markkovari/advent_of_code/aoc-go-common"
+	"github.com/markkovari/advent_of_code/common"
 )
 
 func main() {
diff --git a/golang/2020/go.mod b/golang/2020/go.mod
@@ -1,3 +1,3 @@
-module github.com/markkovari/advent_of_code/2020/02
+module github.com/markkovari/advent_of_code/golang/2020
 
 go 1.15
diff --git a/golang/2024/go.mod b/golang/2024/go.mod
@@ -1,7 +1,7 @@
-module github.com/markkovari/advent_of_code/2024
+module github.com/markkovari/advent_of_code/golang/2024
 
 go 1.22
 
-replace github.com/markkovari/advent_of_code/aoc-go-common => ../common
+replace github.com/markkovari/advent_of_code/golang/common => ../common
 
-require github.com/markkovari/advent_of_code/aoc-go-common v0.0.0-00010101000000-000000000000
+require github.com/markkovari/advent_of_code/golang/common v0.0.0-00010101000000-000000000000
diff --git a/golang/2024/main.go b/golang/2024/main.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/markkovari/advent_of_code/aoc-go-common"
+	"github.com/markkovari/advent_of_code/common"
 )
 
 func main() {
diff --git a/golang/common/go.mod b/golang/common/go.mod
@@ -1,3 +1,3 @@
-module github.com/markkovari/advent_of_code/aoc-go-common
+module github.com/markkovari/advent_of_code/golang/common
 
 go 1.22
diff --git a/rust/2015/Cargo.toml b/rust/2015/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "aoc_2015"
+name = "aoc-rust-2015"
 version = "0.1.0"
 edition = "2021"
 
@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 anyhow = "1.0"
 
-aoc-rust-common = { path = "../common" }
+aoc-common = { path = "../common" }
 iter_tools = "0.1.4"
 lazy_static = "1.4.0"
 md5 = "0.7.0"
diff --git a/rust/2018/Cargo.toml b/rust/2018/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
-name = "aoc"
+name = "aoc-rust-2018"
 version = "0.1.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-aoc-rust-common = { path = "../common" }
+aoc-common = { path = "../common" }
 anyhow = "1.0.75"
 chrono = "0.4.26"
 failure = "0.1.8"
diff --git a/rust/2018/src/day01/mod.rs b/rust/2018/src/day01/mod.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use aoc_rust_common::Solution;
+use aoc_common::Solution;
 use std::collections::HashSet;
 
 pub struct Day01;
@@ -34,4 +34,4 @@ impl Solution for Day01 {
     }
 }
 
-aoc_rust_common::aoc_test!(Day01);
+aoc_common::aoc_test!(Day01);
diff --git a/rust/2018/src/day02/mod.rs b/rust/2018/src/day02/mod.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use aoc_rust_common::Solution;
+use aoc_common::Solution;
 use std::collections::HashMap;
 
 pub struct Day02;
@@ -66,4 +66,4 @@ impl Solution for Day02 {
     }
 }
 
-aoc_rust_common::aoc_test!(Day02);
+aoc_common::aoc_test!(Day02);
diff --git a/rust/2018/src/day03/mod.rs b/rust/2018/src/day03/mod.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use aoc_rust_common::Solution;
+use aoc_common::Solution;
 use std::collections::HashMap;
 
 pub struct Day03;
@@ -109,4 +109,4 @@ impl Solution for Day03 {
     }
 }
 
-aoc_rust_common::aoc_test!(Day03);
+aoc_common::aoc_test!(Day03);
diff --git a/rust/2018/src/day04/mod.rs b/rust/2018/src/day04/mod.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use aoc_rust_common::Solution;
+use aoc_common::Solution;
 use chrono::{DateTime, NaiveDateTime, Timelike, Utc};
 use regex::Regex;
 use std::collections::HashMap;
@@ -106,4 +106,4 @@ impl Solution for Day04 {
     }
 }
 
-aoc_rust_common::aoc_test!(Day04);
+aoc_common::aoc_test!(Day04);
diff --git a/rust/2018/src/day05/mod.rs b/rust/2018/src/day05/mod.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use aoc_rust_common::Solution;
+use aoc_common::Solution;
 
 pub struct Day05;
 
@@ -45,4 +45,4 @@ impl Solution for Day05 {
     }
 }
 
-aoc_rust_common::aoc_test!(Day05);
+aoc_common::aoc_test!(Day05);
diff --git a/rust/2018/src/day06/mod.rs b/rust/2018/src/day06/mod.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use aoc_rust_common::Solution;
+use aoc_common::Solution;
 use serde_scan::scan;
 use std::collections::{HashMap, HashSet};
 
@@ -85,4 +85,4 @@ impl Solution for Day06 {
     }
 }
 
-aoc_rust_common::aoc_test!(Day06);
+aoc_common::aoc_test!(Day06);
diff --git a/rust/2018/src/day07/mod.rs b/rust/2018/src/day07/mod.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use aoc_rust_common::Solution;
+use aoc_common::Solution;
 use nom::{bytes::complete::tag, character::complete::anychar, IResult};
 use std::collections::{HashMap, HashSet};
 
@@ -117,4 +117,4 @@ impl Solution for Day07 {
     }
 }
 
-aoc_rust_common::aoc_test!(Day07);
+aoc_common::aoc_test!(Day07);
diff --git a/rust/2018/src/day08/mod.rs b/rust/2018/src/day08/mod.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use aoc_rust_common::Solution;
+use aoc_common::Solution;
 
 pub struct Day08;
 
@@ -75,4 +75,4 @@ impl Solution for Day08 {
     }
 }
 
-aoc_rust_common::aoc_test!(Day08);
+aoc_common::aoc_test!(Day08);
diff --git a/rust/2018/src/day09/mod.rs b/rust/2018/src/day09/mod.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use aoc_rust_common::Solution;
+use aoc_common::Solution;
 use regex::Regex;
 use std::collections::VecDeque;
 
@@ -51,4 +51,4 @@ impl Solution for Day09 {
     }
 }
 
-aoc_rust_common::aoc_test!(Day09);
+aoc_common::aoc_test!(Day09);
diff --git a/rust/2018/src/day10/mod.rs b/rust/2018/src/day10/mod.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use aoc_rust_common::Solution;
+use aoc_common::Solution;
 use lazy_static::lazy_static;
 use regex::Regex;
 
@@ -92,4 +92,4 @@ impl Solution for Day10 {
     }
 }
 
-aoc_rust_common::aoc_test!(Day10);
+aoc_common::aoc_test!(Day10);
diff --git a/rust/2018/src/day11/mod.rs b/rust/2018/src/day11/mod.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use aoc_rust_common::Solution;
+use aoc_common::Solution;
 
 pub struct Day11;
 
@@ -80,4 +80,4 @@ impl Solution for Day11 {
     }
 }
 
-aoc_rust_common::aoc_test!(Day11);
+aoc_common::aoc_test!(Day11);
diff --git a/rust/2018/src/day12/mod.rs b/rust/2018/src/day12/mod.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use aoc_rust_common::Solution;
+use aoc_common::Solution;
 use regex::Regex;
 
 pub struct Day12;
@@ -94,4 +94,4 @@ fn run_simulation(initial_state: Vec<bool>, rules: [bool; 32], generations: i64)
         .sum()
 }
 
-aoc_rust_common::aoc_test!(Day12);
+aoc_common::aoc_test!(Day12);
diff --git a/rust/2018/src/day13/mod.rs b/rust/2018/src/day13/mod.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use aoc_rust_common::Solution;
+use aoc_common::Solution;
 use std::collections::HashSet;
 
 pub struct Day13;
@@ -219,4 +219,4 @@ impl Solution for Day13 {
     }
 }
 
-aoc_rust_common::aoc_test!(Day13);
+aoc_common::aoc_test!(Day13);
diff --git a/rust/2018/src/day14/mod.rs b/rust/2018/src/day14/mod.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use aoc_rust_common::Solution;
+use aoc_common::Solution;
 
 pub struct Day14;
 
@@ -60,4 +60,4 @@ impl Solution for Day14 {
     }
 }
 
-aoc_rust_common::aoc_test!(Day14);
+aoc_common::aoc_test!(Day14);
diff --git a/rust/2018/src/day15/mod.rs b/rust/2018/src/day15/mod.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use aoc_rust_common::Solution;
+use aoc_common::Solution;
 use std::collections::{BTreeMap, HashSet, VecDeque};
 
 pub struct Day15;
@@ -226,4 +226,4 @@ impl Solution for Day15 {
     }
 }
 
-aoc_rust_common::aoc_test!(Day15, 239010, 62468);
+aoc_common::aoc_test!(Day15, 239010, 62468);
diff --git a/rust/2018/src/day16/mod.rs b/rust/2018/src/day16/mod.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use aoc_rust_common::Solution;
+use aoc_common::Solution;
 use std::collections::{HashMap, HashSet};
 use text_io::scan;
 
@@ -185,4 +185,4 @@ impl Solution for Day16 {
     }
 }
 
-aoc_rust_common::aoc_test!(Day16);
+aoc_common::aoc_test!(Day16);
diff --git a/rust/2018/src/day17/mod.rs b/rust/2018/src/day17/mod.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use aoc_rust_common::Solution;
+use aoc_common::Solution;
 use regex::Regex;
 use std::cmp::{max, min};
 
@@ -167,4 +167,4 @@ impl Solution for Day17 {
     }
 }
 
-aoc_rust_common::aoc_test!(Day17, 162, 144, slow);
+aoc_common::aoc_test!(Day17, 162, 144, slow);
diff --git a/rust/2018/src/day18/mod.rs b/rust/2018/src/day18/mod.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use aoc_rust_common::Solution;
+use aoc_common::Solution;
 use std::collections::HashMap;
 
 pub struct Day18;
@@ -106,4 +106,4 @@ impl Solution for Day18 {
     }
 }
 
-aoc_rust_common::aoc_test!(Day18);
+aoc_common::aoc_test!(Day18);
diff --git a/rust/2018/src/day19/mod.rs b/rust/2018/src/day19/mod.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use aoc_rust_common::Solution;
+use aoc_common::Solution;
 use std::str::FromStr;
 
 pub struct Day19;
@@ -127,4 +127,4 @@ impl Solution for Day19 {
     }
 }
 
-aoc_rust_common::aoc_test!(Day19);
+aoc_common::aoc_test!(Day19);
diff --git a/rust/2018/src/day20/mod.rs b/rust/2018/src/day20/mod.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use aoc_rust_common::Solution;
+use aoc_common::Solution;
 use std::collections::HashMap;
 
 pub struct Day20;
@@ -52,4 +52,4 @@ fn get_distances(input: &str) -> HashMap<(i32, i32), usize> {
     distances
 }
 
-aoc_rust_common::aoc_test!(Day20);
+aoc_common::aoc_test!(Day20);
diff --git a/rust/2018/src/day21/mod.rs b/rust/2018/src/day21/mod.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use aoc_rust_common::Solution;
+use aoc_common::Solution;
 use std::collections::HashSet;
 
 pub struct Day21;
@@ -71,4 +71,4 @@ impl Solution for Day21 {
     }
 }
 
-aoc_rust_common::aoc_test!(Day21);
+aoc_common::aoc_test!(Day21);
diff --git a/rust/2018/src/day22/mod.rs b/rust/2018/src/day22/mod.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use aoc_rust_common::Solution;
+use aoc_common::Solution;
 use std::cmp::Reverse;
 use std::collections::{BinaryHeap, HashMap};
 
@@ -155,4 +155,4 @@ fn is_valid_tool(tool: Tool, region: Region) -> bool {
     }
 }
 
-aoc_rust_common::aoc_test!(Day22);
+aoc_common::aoc_test!(Day22);
diff --git a/rust/2018/src/day23/mod.rs b/rust/2018/src/day23/mod.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use aoc_rust_common::Solution;
+use aoc_common::Solution;
 use regex::Regex;
 
 pub struct Day23;
@@ -54,4 +54,4 @@ impl Solution for Day23 {
     }
 }
 
-aoc_rust_common::aoc_test!(Day23);
+aoc_common::aoc_test!(Day23);
diff --git a/rust/2018/src/day24/mod.rs b/rust/2018/src/day24/mod.rs
diff --git a/rust/2018/src/day25/mod.rs b/rust/2018/src/day25/mod.rs
diff --git a/rust/2019/Cargo.toml b/rust/2019/Cargo.toml
diff --git a/rust/2020/Cargo.toml b/rust/2020/Cargo.toml
diff --git a/rust/2021/Cargo.toml b/rust/2021/Cargo.toml
diff --git a/rust/2022/Cargo.toml b/rust/2022/Cargo.toml
diff --git a/rust/2023/Cargo.toml b/rust/2023/Cargo.toml
diff --git a/rust/2025/Cargo.toml b/rust/2025/Cargo.toml
diff --git a/rust/common/Cargo.toml b/rust/common/Cargo.toml
diff --git a/rust/common/src/geometry.rs b/rust/common/src/geometry.rs
diff --git a/rust/runner/Cargo.toml b/rust/runner/Cargo.toml
diff --git a/rust/runner/src/main.rs b/rust/runner/src/main.rs

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"os"`
`6`	`6`	`"strconv"`
`7`	`7`
`8`		`- "github.com/markkovari/advent_of_code/aoc-go-common"`
	`8`	`+ "github.com/markkovari/advent_of_code/common"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`func main() {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-module github.com/markkovari/advent_of_code/2020/02`
	`1`	`+module github.com/markkovari/advent_of_code/golang/2020`
`2`	`2`
`3`	`3`	`go 1.15`