Reimplement day 4 2022 with ranges instead of ints

2022/benches/days.rs

@@ -8,7 +8,7 @@ use criterion::BenchmarkId;
 use criterion::Criterion;
 
 /// Number of days we have an implementation to benchmark
-const DAYS_IMPLEMENTED: u8 = 6;
+const DAYS_IMPLEMENTED: u8 = 4;
 
 fn read_input(day: u8) -> Vec<u8> {
     let input_path = format!("inputs/{:02}.txt", day);

2022/inputs/05.txt

@@ -1,514 +0,0 @@
-        [G]         [D]     [Q]    
-[P]     [T]         [L] [M] [Z]    
-[Z] [Z] [C]         [Z] [G] [W]    
-[M] [B] [F]         [P] [C] [H] [N]
-[T] [S] [R]     [H] [W] [R] [L] [W]
-[R] [T] [Q] [Z] [R] [S] [Z] [F] [P]
-[C] [N] [H] [R] [N] [H] [D] [J] [Q]
-[N] [D] [M] [G] [Z] [F] [W] [S] [S]
- 1   2   3   4   5   6   7   8   9 
-
-move 7 from 6 to 8
-move 5 from 2 to 6
-move 2 from 4 to 1
-move 1 from 4 to 5
-move 5 from 7 to 6
-move 7 from 6 to 3
-move 5 from 9 to 2
-move 6 from 2 to 3
-move 2 from 7 to 9
-move 20 from 3 to 1
-move 11 from 1 to 6
-move 1 from 9 to 8
-move 3 from 8 to 2
-move 8 from 1 to 5
-move 10 from 8 to 4
-move 7 from 6 to 4
-move 1 from 8 to 3
-move 8 from 1 to 7
-move 16 from 4 to 8
-move 1 from 9 to 8
-move 1 from 5 to 2
-move 4 from 7 to 4
-move 5 from 6 to 7
-move 1 from 6 to 1
-move 8 from 7 to 4
-move 1 from 6 to 9
-move 12 from 4 to 5
-move 3 from 2 to 5
-move 1 from 6 to 2
-move 1 from 3 to 7
-move 1 from 3 to 2
-move 1 from 9 to 3
-move 1 from 7 to 8
-move 1 from 7 to 5
-move 1 from 3 to 2
-move 4 from 5 to 7
-move 5 from 5 to 7
-move 1 from 4 to 3
-move 1 from 3 to 9
-move 3 from 1 to 8
-move 1 from 9 to 1
-move 2 from 2 to 1
-move 2 from 2 to 7
-move 8 from 8 to 1
-move 3 from 5 to 2
-move 8 from 7 to 5
-move 7 from 1 to 3
-move 3 from 1 to 7
-move 1 from 1 to 5
-move 1 from 3 to 7
-move 7 from 5 to 8
-move 2 from 2 to 8
-move 1 from 3 to 2
-move 1 from 2 to 4
-move 1 from 4 to 8
-move 13 from 8 to 1
-move 13 from 5 to 9
-move 2 from 5 to 2
-move 7 from 9 to 3
-move 12 from 8 to 3
-move 4 from 9 to 3
-move 1 from 3 to 4
-move 2 from 2 to 3
-move 1 from 1 to 6
-move 1 from 2 to 3
-move 1 from 5 to 9
-move 7 from 7 to 4
-move 10 from 1 to 8
-move 1 from 1 to 4
-move 1 from 9 to 5
-move 2 from 5 to 1
-move 1 from 6 to 5
-move 3 from 8 to 9
-move 5 from 4 to 3
-move 4 from 4 to 1
-move 7 from 1 to 6
-move 2 from 5 to 7
-move 35 from 3 to 4
-move 4 from 9 to 1
-move 19 from 4 to 8
-move 1 from 7 to 6
-move 1 from 9 to 2
-move 10 from 4 to 5
-move 2 from 4 to 7
-move 3 from 4 to 3
-move 1 from 2 to 8
-move 1 from 1 to 9
-move 3 from 3 to 6
-move 4 from 8 to 6
-move 4 from 5 to 2
-move 2 from 8 to 3
-move 3 from 5 to 9
-move 12 from 6 to 1
-move 8 from 8 to 6
-move 2 from 9 to 1
-move 1 from 4 to 1
-move 1 from 3 to 8
-move 3 from 7 to 8
-move 2 from 9 to 7
-move 1 from 6 to 7
-move 10 from 6 to 8
-move 4 from 2 to 5
-move 1 from 3 to 7
-move 7 from 5 to 7
-move 13 from 8 to 1
-move 29 from 1 to 4
-move 8 from 7 to 8
-move 1 from 1 to 3
-move 3 from 7 to 6
-move 1 from 1 to 9
-move 15 from 4 to 1
-move 1 from 3 to 6
-move 10 from 1 to 6
-move 10 from 6 to 7
-move 1 from 4 to 9
-move 1 from 9 to 1
-move 1 from 9 to 7
-move 6 from 7 to 8
-move 1 from 1 to 6
-move 5 from 6 to 5
-move 21 from 8 to 9
-move 5 from 1 to 9
-move 2 from 9 to 5
-move 3 from 5 to 6
-move 3 from 7 to 9
-move 4 from 4 to 6
-move 6 from 8 to 7
-move 6 from 6 to 3
-move 2 from 7 to 9
-move 1 from 7 to 2
-move 6 from 3 to 2
-move 1 from 6 to 4
-move 4 from 5 to 9
-move 1 from 4 to 5
-move 9 from 4 to 6
-move 7 from 6 to 4
-move 10 from 9 to 2
-move 5 from 7 to 5
-move 10 from 2 to 7
-move 2 from 5 to 4
-move 2 from 5 to 9
-move 4 from 9 to 4
-move 1 from 8 to 6
-move 7 from 7 to 2
-move 1 from 5 to 4
-move 2 from 7 to 1
-move 1 from 5 to 7
-move 3 from 6 to 2
-move 4 from 4 to 5
-move 1 from 2 to 7
-move 10 from 4 to 7
-move 3 from 7 to 3
-move 17 from 9 to 4
-move 1 from 1 to 4
-move 1 from 1 to 5
-move 5 from 2 to 7
-move 1 from 9 to 2
-move 5 from 4 to 8
-move 2 from 9 to 7
-move 4 from 8 to 1
-move 3 from 4 to 8
-move 1 from 2 to 5
-move 1 from 9 to 2
-move 6 from 4 to 8
-move 3 from 7 to 5
-move 1 from 4 to 9
-move 1 from 9 to 1
-move 3 from 1 to 9
-move 4 from 8 to 5
-move 2 from 9 to 8
-move 4 from 2 to 5
-move 8 from 7 to 2
-move 5 from 8 to 5
-move 2 from 7 to 8
-move 1 from 3 to 5
-move 1 from 1 to 2
-move 1 from 1 to 6
-move 2 from 3 to 6
-move 5 from 2 to 8
-move 4 from 7 to 1
-move 7 from 8 to 5
-move 1 from 1 to 5
-move 3 from 8 to 3
-move 1 from 9 to 3
-move 7 from 2 to 3
-move 2 from 2 to 8
-move 2 from 4 to 8
-move 1 from 8 to 5
-move 1 from 1 to 4
-move 2 from 4 to 7
-move 2 from 7 to 1
-move 3 from 2 to 3
-move 3 from 5 to 2
-move 1 from 8 to 3
-move 3 from 3 to 2
-move 5 from 2 to 1
-move 17 from 5 to 8
-move 9 from 8 to 1
-move 11 from 3 to 5
-move 8 from 8 to 5
-move 2 from 8 to 5
-move 16 from 1 to 4
-move 13 from 4 to 7
-move 6 from 5 to 2
-move 2 from 4 to 8
-move 5 from 7 to 9
-move 2 from 1 to 2
-move 7 from 7 to 1
-move 1 from 1 to 4
-move 1 from 9 to 8
-move 7 from 2 to 8
-move 1 from 4 to 7
-move 2 from 9 to 4
-move 1 from 4 to 1
-move 1 from 3 to 5
-move 2 from 9 to 8
-move 11 from 8 to 7
-move 2 from 6 to 5
-move 1 from 6 to 9
-move 1 from 1 to 9
-move 1 from 9 to 1
-move 4 from 1 to 4
-move 2 from 1 to 8
-move 1 from 1 to 2
-move 1 from 9 to 5
-move 2 from 4 to 3
-move 2 from 2 to 7
-move 2 from 3 to 9
-move 1 from 9 to 1
-move 1 from 9 to 1
-move 5 from 5 to 1
-move 19 from 5 to 6
-move 5 from 1 to 4
-move 1 from 2 to 9
-move 1 from 1 to 3
-move 7 from 5 to 8
-move 1 from 3 to 6
-move 8 from 7 to 3
-move 7 from 4 to 8
-move 3 from 8 to 5
-move 1 from 4 to 1
-move 1 from 9 to 4
-move 1 from 4 to 9
-move 1 from 5 to 2
-move 2 from 5 to 6
-move 2 from 8 to 2
-move 7 from 8 to 1
-move 1 from 1 to 7
-move 3 from 6 to 9
-move 2 from 3 to 2
-move 1 from 2 to 1
-move 1 from 8 to 7
-move 2 from 9 to 6
-move 2 from 9 to 5
-move 1 from 5 to 6
-move 1 from 2 to 8
-move 2 from 1 to 7
-move 1 from 4 to 3
-move 3 from 2 to 5
-move 7 from 1 to 3
-move 10 from 3 to 4
-move 3 from 5 to 4
-move 1 from 3 to 8
-move 3 from 3 to 2
-move 1 from 8 to 1
-move 1 from 1 to 3
-move 3 from 8 to 3
-move 5 from 4 to 6
-move 1 from 2 to 3
-move 4 from 6 to 4
-move 1 from 5 to 7
-move 4 from 3 to 4
-move 1 from 2 to 8
-move 12 from 7 to 6
-move 1 from 8 to 2
-move 2 from 2 to 7
-move 1 from 8 to 4
-move 23 from 6 to 3
-move 14 from 3 to 6
-move 15 from 4 to 6
-move 1 from 8 to 6
-move 10 from 3 to 7
-move 2 from 4 to 2
-move 11 from 7 to 8
-move 2 from 2 to 6
-move 44 from 6 to 9
-move 21 from 9 to 3
-move 12 from 3 to 6
-move 1 from 7 to 4
-move 1 from 4 to 7
-move 9 from 3 to 2
-move 2 from 8 to 6
-move 3 from 2 to 4
-move 17 from 9 to 1
-move 3 from 4 to 6
-move 2 from 2 to 9
-move 4 from 9 to 2
-move 10 from 6 to 9
-move 1 from 7 to 6
-move 4 from 9 to 5
-move 4 from 2 to 4
-move 14 from 1 to 5
-move 4 from 4 to 3
-move 3 from 2 to 9
-move 9 from 9 to 7
-move 1 from 2 to 5
-move 9 from 8 to 5
-move 8 from 7 to 2
-move 4 from 3 to 8
-move 5 from 6 to 2
-move 3 from 1 to 6
-move 1 from 7 to 1
-move 4 from 2 to 4
-move 3 from 6 to 4
-move 3 from 8 to 3
-move 13 from 5 to 2
-move 2 from 3 to 5
-move 12 from 5 to 9
-move 1 from 3 to 5
-move 1 from 5 to 9
-move 1 from 8 to 3
-move 4 from 9 to 5
-move 6 from 4 to 5
-move 12 from 9 to 7
-move 1 from 9 to 3
-move 1 from 3 to 2
-move 12 from 5 to 6
-move 12 from 7 to 2
-move 1 from 3 to 7
-move 1 from 4 to 8
-move 33 from 2 to 8
-move 1 from 7 to 5
-move 1 from 1 to 2
-move 4 from 5 to 4
-move 3 from 2 to 5
-move 34 from 8 to 6
-move 1 from 4 to 3
-move 1 from 5 to 7
-move 1 from 7 to 5
-move 3 from 4 to 9
-move 2 from 9 to 7
-move 1 from 9 to 4
-move 1 from 3 to 7
-move 1 from 5 to 8
-move 1 from 5 to 1
-move 1 from 5 to 7
-move 1 from 4 to 8
-move 1 from 1 to 4
-move 1 from 4 to 2
-move 3 from 7 to 5
-move 2 from 8 to 5
-move 1 from 2 to 8
-move 4 from 6 to 2
-move 1 from 8 to 6
-move 1 from 7 to 9
-move 29 from 6 to 7
-move 4 from 2 to 3
-move 2 from 5 to 8
-move 1 from 9 to 5
-move 2 from 8 to 1
-move 23 from 7 to 5
-move 2 from 6 to 1
-move 23 from 5 to 6
-move 1 from 3 to 6
-move 4 from 5 to 9
-move 2 from 1 to 3
-move 5 from 3 to 8
-move 2 from 6 to 5
-move 2 from 1 to 4
-move 1 from 9 to 8
-move 1 from 9 to 1
-move 1 from 4 to 6
-move 2 from 5 to 6
-move 6 from 7 to 8
-move 2 from 9 to 2
-move 18 from 6 to 5
-move 21 from 6 to 4
-move 1 from 1 to 6
-move 2 from 6 to 7
-move 2 from 7 to 9
-move 2 from 2 to 8
-move 7 from 4 to 3
-move 12 from 5 to 3
-move 1 from 9 to 5
-move 1 from 9 to 4
-move 6 from 5 to 2
-move 17 from 3 to 4
-move 3 from 4 to 3
-move 1 from 2 to 4
-move 5 from 2 to 8
-move 1 from 5 to 8
-move 19 from 8 to 7
-move 1 from 3 to 6
-move 1 from 8 to 4
-move 1 from 6 to 1
-move 15 from 4 to 6
-move 1 from 1 to 4
-move 3 from 3 to 5
-move 4 from 6 to 7
-move 1 from 4 to 7
-move 10 from 6 to 7
-move 16 from 4 to 5
-move 24 from 7 to 2
-move 8 from 7 to 8
-move 1 from 4 to 2
-move 6 from 8 to 7
-move 1 from 8 to 7
-move 1 from 6 to 9
-move 14 from 5 to 4
-move 9 from 7 to 8
-move 4 from 5 to 1
-move 2 from 1 to 5
-move 3 from 8 to 6
-move 2 from 6 to 9
-move 2 from 2 to 8
-move 6 from 2 to 7
-move 3 from 4 to 6
-move 1 from 3 to 4
-move 3 from 5 to 7
-move 1 from 6 to 9
-move 5 from 7 to 2
-move 4 from 9 to 1
-move 1 from 7 to 9
-move 9 from 8 to 4
-move 5 from 1 to 2
-move 2 from 6 to 1
-move 6 from 4 to 7
-move 1 from 7 to 3
-move 1 from 3 to 9
-move 1 from 9 to 7
-move 1 from 6 to 7
-move 9 from 4 to 5
-move 7 from 7 to 9
-move 3 from 7 to 5
-move 1 from 9 to 2
-move 6 from 9 to 8
-move 4 from 4 to 5
-move 1 from 4 to 2
-move 1 from 4 to 2
-move 2 from 1 to 2
-move 1 from 9 to 8
-move 10 from 2 to 4
-move 8 from 2 to 7
-move 12 from 2 to 9
-move 6 from 7 to 4
-move 1 from 1 to 2
-move 8 from 9 to 8
-move 7 from 5 to 1
-move 9 from 4 to 3
-move 14 from 8 to 4
-move 1 from 8 to 4
-move 1 from 1 to 5
-move 1 from 5 to 2
-move 3 from 2 to 4
-move 1 from 7 to 1
-move 1 from 7 to 3
-move 2 from 1 to 7
-move 3 from 5 to 7
-move 2 from 7 to 6
-move 1 from 6 to 5
-move 3 from 7 to 1
-move 1 from 6 to 8
-move 1 from 8 to 7
-move 1 from 3 to 6
-move 1 from 7 to 1
-move 4 from 1 to 4
-move 6 from 3 to 2
-move 3 from 1 to 2
-move 3 from 3 to 6
-move 3 from 2 to 6
-move 6 from 6 to 5
-move 1 from 1 to 4
-move 1 from 9 to 6
-move 5 from 2 to 1
-move 3 from 1 to 2
-move 2 from 9 to 8
-move 3 from 1 to 5
-move 1 from 9 to 7
-move 25 from 4 to 1
-move 1 from 1 to 7
-move 2 from 8 to 3
-move 13 from 1 to 9
-move 2 from 3 to 5
-move 8 from 5 to 9
-move 4 from 2 to 1
-move 2 from 6 to 7
-move 10 from 5 to 9
-move 4 from 7 to 2
-move 2 from 2 to 3
-move 9 from 9 to 2
-move 4 from 4 to 5
-move 4 from 5 to 4
-move 5 from 1 to 4
-move 10 from 4 to 5
-move 22 from 9 to 1
-move 2 from 2 to 7
-move 3 from 2 to 1
-move 6 from 2 to 6
-move 1 from 7 to 1
-move 10 from 5 to 7
-move 15 from 1 to 4
-move 13 from 1 to 5
-move 3 from 6 to 8
-move 1 from 8 to 9

2022/inputs/06.txt

@@ -1 +0,0 @@
-grvrnvrnnjljbjqjpqjjvhhzwwrbwwbblrltrrpbbbbqnnqbbbbsvbvmbvmbbrsrqrzrllwbbbqzqrqnqrnrjnnjccdggwqqhrrjcjmjmllgrlglhlclmlvlvsshwwsggmfmdfddgdfftrrczrcczhzppgdgrdggghmmdwwqgggslglfgfcgccmjcjwjrwjrjcrjjsgjjvddpwpgpbbgwbgwwhnhfftbffhpfphhfqfrqfrfnfpprvrsrhrfrllfhhrsrhssvfsvsnvsnsswtwtlthllrjjwddtggzczgcchwcwppfbbdvdrdzrdrvrwwsbsfbssqfsfjsjcscttlztllgjjlbbdsdtssvvvwlvlqqnhqqtdqtddjcdcjjpbphhgtgtqtzqqzhqqtgtvtmvtvrvqrvvfmfmppzzbwwnddzttfpfrrlddbppfqppnwnswwdhwdwjjqljqqthtnhnddgmgcmgcmgcmmfmfttrzzfdzztllmjlllgcgbbcqcvccpnndbdjbjmmzbztzptzpprpddptpprhhvlvmlmpmmljjnnjsjfjjvgjjvzzfgfzfbftbftttgstgstgtpggflfcfqqtctltgltldlzdlzzmmlddnvddzfddppmnpptzptpvttwstwswvwrvvbfbjjjbmjjdvdvrvdddrwrhrzrqqhghhrwhwhrrmppsgpsgszzdfdfwwmtwtvwvgvffmqqqtqntqnnjcncbnbwnnzggrdrqqjbqjjwjqqqwlqwlwzlljhhfsfsqsrqqhwqqwbbqbvvlflrrlglbbjhhjmhjjcmcjcgczcfcgcqqczcnnvjnnlddmpmcppgvgjgddvrrnsnmnqmqgmmnppwgwcgwgssbddgtdgdgmdgmgvvmjmvmjmvvsfssdgdghdggbfbqbdbjbsbmmrpmrprggbllwrwpwtppzvppzsssdnsdnnvnhvvvzvfzfqqnnmlnltldtdvdbdblddsmmlccmlmvlmvmmcsctctrtsrstsbsrshsddlmddmppgsscttnrtrqqcvcwwlnlznnnvcnvvtnvnbnmbmvmppjgjdjtddmpdmdvvmgvvdqdlqlhhzccsggjdjsdsttctjctjtfjttppdzpzzbjbwwmwbblslzslzszlzrrcbrrfggvcczjjtbbdnnggbwblwlbwlwqqfvfqfddrrfccvlllhmhhhrthrthrrnbnzbbpzplphprrrnbbghhnshnhbblqqqvwwffnmnmhhtccpqpvqvbvnvvfnfsnffdjdllwffcddgcgrgjrggchcpcddtbbdtdmtdmmhhtphtpppclcpcvcjvcjjfqfzqqphpnhnrnhhpdhhtfhhbbmqmfmsmvssgqqfssqgglnnqmnmbnmbbllrdrgdrdvrdvdsvvnddgtgddcdqdsqdqbqqlhhwdhdgdcgcdchchrchhpvvpgvgrrfggwfwgmpddbhfngtrwswfszgsggnpsntjpslrpjqsffzrlnbnzdtqpqtjzwlhhgrsrbvnccnsjmzcbqgcbtbqlzhnpnhhrrvqwjwzzvrlcrmjhcscrqhpqmfzbnvcwwqhcjjlnggmpbwztzfswmsbjshnsgfmdlzvzczhrdwgwbghszpnbfpctrshbfhspsczcqcrrqcpwwpfzhjqtpqgjbztrpzrlgfdjbmlwdvlvnfmdzbwsbbhlbszvwcpztlchjrqbmsftltmqpfgdpmdgjvwqqtjsqlfqrwmsnlqgsbqfwsdnfvzthmbplvszfcmlptlcjpnfpjsphsmmjplwjqphgvzbtbjtpttqhlwtgnrjvmvsfsztmsqszzlhqqhfslsvhzgtsssfctzgsqbgdzlpwbsmpcnjqshhhcwqdsdzdhnjfqzqnqdlrpddcgrgldgqbjmdtwgppdczzrjvmcfqjbpjzbtjmgdphlbwnsnpfdqlhwvvmpwzsrztnwvtlbphljmjwsgbphgmwhdmfhpvsmvsjccjhfvqtvfmmlnggncltvtrgmbtfqsvfnlvcmjnjwzcrpjnsgntvhjbtdlptshbhhchqmsprhqzdnfpjqccdfvnzjtlbsmmwvzlwlvmsbrnhqctvtvbfhntdctjnrbcrrlmsnwbbjbcbbgrrhfqwzwwfgvsvgbwnttghtgpspzwzfhffsqjvwwttntnvlwftsfvtttgnprzrzsghvjrdtsfdvzswhmrfcdqsgvrlhzbnvbmjlqrftnnbtwqtvlvwznfbslhdqjbntdgpprfqchjvgvzjssdztjlzwfljjmfvzrbbtczggzqwrnqqgzzcbqjcpfqfrbwtdjrrvbszsjdjcpdfjscsvnltcgwvqsgnhbfgnfnddnpmbzbptrmvqzpvbdpfdvtlmgnnjwflgdbfnmvsdnmlvgcpwflwvdbtbfwtfpsmqsplnzwlwgvbjrhghwrnrswsggbqpdjcjrgbgnsqdvwzzwftvjqgjzzcdvpbbjzpphmbcqmrjvgqwfgrsnqvhwflmhgrlvbpwdcsrlqwfrwppqbrdhwqtvczpclpsbsjcptgblbbsqmbhjjgzwvlcnhnzcttmpjsgchmppgphqlzlcsqcgbbjgtjjvmttdztfdptzgvmpnqrcmpmcdlpnbztllvqbggqbqhlqvdwsrwzsjwfrqvcbvsgfdptmrzpvdfblmhlzrvpmsljlqqzrhlnmwncpfhvqlsbtrjbfcrnfvjvddrhdbbczjdsrdvzlbqrccssdzcpmdsqbprjppfzdwfdswptgzcmjqfhcwsqfqhvrslffqfbcvhdzljzrmtwmfdwzdhhjcmbjtvjhzzwfqhrcslztdbnlwmmhbbbgdscjcdzftnchqfnflnsdqjscfrqpnfbftpzvtmrwncqfqqflschpfnjsjlqcjdjgtwpqhgcnjdmnnvmmpwdspmnrgqrptqwcvbtdwpqlbtwpqgwgfrzlrhtvrvzhmhmwhfdsrhpcczqfltsgtgrfwcvlcvtlhqqwnrqgzpnzbfmzbdwqwbsfvbshrgzqdbgvrhzhzlbqsfzttmsnmrqmwgtzbvdqdrbgcpclzjrhdbjtpcdbbznjgtbwbqrnpvffdmwtrbhhstcmnjcwbbnmpbvmjprtzgcptmtrffwhvfgdljnrbbrblbfbgdwtjrtgqgrpvpgjqrjzczvvlspgdbzftqgqvgdqlglbgvgjdcztznszcwfqhmwbrbjcfstzdcmdsssqfhtzpdgmzjscvbdzgbhhgdqgvfwrzmhdrhlsvlzjjzbzdljcbhncppwrtptjgszlqsrqpzqcsgvdvzmgvwgsncnbffttslphcstqvfwbwzbflmshcbnhpljgqwmmwwzlgpbcqnrtqlwcjcrclfdrnnmvtbfdztdfvtqrsgdptfcfpzpsldhzmrngggfvdqggtlfqqwsldprcffsstnnpmsbbvghdbpprqbssnprdbqclzqtgsrczwcvqwrrfmmfwsndvtvqljwwglrgbphdvvwgctbbmtrbpzqtspgrlhmnhjcdwhwvssgspzjbcfjttjqbdpdmptfzzjcfqljpqddfssmffqprvbptfvdshsdmfmdtmlbnmbmjjjsgmlmwmgcwhbrbgchrstptvdlqgddfzddlzhwjmsvvcjwvqtzjtsctfmzchlbrvlgdzbvdlbfpvhptpltrdmcgjghcpwvwqqnrzdtnmgdncplhdpsgpnbprbgshffwwsdhpgqsbmwdtpnhhltlcqfrjtswcchzvlhdgrmjwhgwppdjqlgmdhwbllqvzrchgclmqdlghjsvmwlflmhhmdzbfjhjnvwphnjbclmdpgflqgtfsmsjslntfcmtbphnrgpdcqtjzjttdtgjmvhzsrfnrjqssvwpcslpfstbpfsrsntmftmdgsqrrsnddqfmchrhtlhmqndvvllnvltdzfphjqnvmcdsgfpcmjftgdpntjzplqljhtthvnbzbzwvfnqsjvnfwhmtbsspjslgfjvdgfjpwrsgqwntntjcqtdgnhnsfwhhqfwbwhdrftj

2022/src/day04.rs

@@ -1,3 +1,5 @@
+use std::ops::RangeInclusive;
+
 use anyhow::Result;
 use nom::bytes::complete::tag;
 use nom::character::complete::newline;
@@ -7,40 +9,18 @@ use nom::sequence::separated_pair;
 use nom::sequence::terminated;
 use nom::IResult;
 
-use crate::common::minmax;
 use crate::common::parse_input;
 
-#[derive(Copy, Clone, PartialOrd, PartialEq)]
+type Assignment = RangeInclusive<u32>;
-struct Assignment(u32, u32);
 
-impl Assignment {
+fn parse_assignments(
-    fn one_contains(self, other: Self) -> bool {
+    input: &[u8],
-        let (first, second) = minmax(self, other);
+) -> IResult<&[u8], Vec<(RangeInclusive<u32>, RangeInclusive<u32>)>> {
-
-        if second.0 == first.0 {
-            first.1 <= second.1
-        } else {
-            second.0 <= first.1 && second.1 <= first.1
-        }
-    }
-
-    fn one_overlaps(self, other: Self) -> bool {
-        let (first, second) = minmax(self, other);
-
-        if second.0 == first.0 {
-            first.1 <= second.1
-        } else {
-            second.0 <= first.1
-        }
-    }
-}
-
-fn parse_assignments(input: &[u8]) -> IResult<&[u8], Vec<(Assignment, Assignment)>> {
     use nom::character::complete::u32;
 
     fn parse_single(input: &[u8]) -> IResult<&[u8], Assignment> {
         map(separated_pair(u32, tag("-"), u32), |(start, end)| {
-            Assignment(start, end)
+            start..=end
         })(input)
     }
 
@@ -49,23 +29,32 @@ fn parse_assignments(input: &[u8]) -> IResult<&[u8], Vec<(Assignment, Assignment
     many0(terminated(parse_line, newline))(input)
 }
 
-fn parts_common(input: &[u8], filter: impl Fn(Assignment, Assignment) -> bool) -> Result<String> {
+fn is_contained(a: &Assignment, b: &Assignment) -> bool {
+    if a.size_hint().0 > b.size_hint().0 {
+        a.contains(b.start()) && a.contains(b.end())
+    } else {
+        b.contains(a.start()) && b.contains(a.end())
+    }
+}
+
+fn is_overlapping(a: &Assignment, b: &Assignment) -> bool {
+    b.end() >= a.start() && b.start() <= a.end() || a.end() >= b.start() && a.start() <= b.end()
+}
+
+fn parts_common(input: &[u8], filter: impl Fn(&Assignment, &Assignment) -> bool) -> Result<String> {
     let assigments = parse_input(input, parse_assignments)?;
 
-    let overlapping = assigments
+    let overlapping = assigments.into_iter().filter(|(a, b)| filter(a, b)).count();
-        .into_iter()
-        .filter(|&(a, b)| filter(a, b))
-        .count();
 
     Ok(overlapping.to_string())
 }
 
 pub fn part1(input: &[u8]) -> Result<String> {
-    parts_common(input, Assignment::one_contains)
+    parts_common(input, is_contained)
 }
 
 pub fn part2(input: &[u8]) -> Result<String> {
-    parts_common(input, Assignment::one_overlaps)
+    parts_common(input, is_overlapping)
 }
 
 #[cfg(test)]

2022/src/day05.rs

@@ -1,169 +1,9 @@
-use std::cmp::Ordering;
-
 use anyhow::Result;
-use nom::branch::alt;
-use nom::bytes::complete::tag;
-use nom::bytes::complete::take;
-use nom::bytes::complete::take_until;
-use nom::character::complete::newline;
-use nom::combinator::map;
-use nom::combinator::opt;
-use nom::multi::fold_many1;
-use nom::multi::many1;
-use nom::sequence::delimited;
-use nom::sequence::preceded;
-use nom::sequence::terminated;
-use nom::sequence::tuple;
-use nom::IResult;
 
-use crate::common::parse_input;
+pub fn part1(_input: &[u8]) -> Result<String> {
-
+    todo!()
-type Move = (usize, usize, usize);
-type OwnedStacks = Vec<Vec<u8>>;
-
-fn parse_row<'a>(input: &'a [u8], stacks: &mut OwnedStacks) -> IResult<&'a [u8], ()> {
-    let mut index = 0usize;
-
-    // Forgive me for this crime
-    fold_many1(
-        terminated(
-            alt((
-                // Parse a delimited value into a Some(content)
-                map(delimited(tag("["), take(1usize), tag("]")), |v: &[u8]| {
-                    Some(v[0])
-                }),
-                // Or an empty stack into a None
-                map(tag("   "), |_| None),
-            )),
-            opt(tag(" ")),
-        ),
-        || (),
-        move |_, c| {
-            if let Some(b) = c {
-                if stacks.len() <= index {
-                    stacks.resize_with(index + 1, Vec::new);
-                }
-
-                stacks[index].push(b)
-            }
-
-            index += 1;
-        },
-    )(input)
 }
 
-fn parse_stacks(input: &[u8]) -> IResult<&[u8], OwnedStacks> {
+pub fn part2(_input: &[u8]) -> Result<String> {
-    let mut stacks = Vec::new();
+    todo!()
-
-    let (input, _) = terminated(
-        fold_many1(
-            terminated(|input| parse_row(input, &mut stacks), newline),
-            || (),
-            |_, _| (),
-        ),
-        // Skip the line with the numbers
-        take_until("\n\n"),
-    )(input)?;
-
-    // Reverse the stacks since we parsed them top-down
-    for stack in &mut stacks {
-        stack.reverse();
-    }
-
-    Ok((input, stacks))
-}
-
-fn parse_task(input: &[u8]) -> IResult<&[u8], (OwnedStacks, Vec<Move>)> {
-    fn parse_usize(input: &[u8]) -> IResult<&[u8], usize> {
-        map(nom::character::complete::u32, |v| v as usize)(input)
-    }
-    let (input, stacks) = parse_stacks(input)?;
-
-    // Consume the double newline
-    let (input, _) = tag("\n\n")(input)?;
-
-    let (input, moves) = many1(terminated(
-        tuple((
-            preceded(tag("move "), parse_usize),
-            preceded(tag(" from "), parse_usize),
-            preceded(tag(" to "), parse_usize),
-        )),
-        newline,
-    ))(input)?;
-
-    Ok((input, (stacks, moves)))
-}
-
-/// Some magic to get two mutable references into the same slice
-fn get_both(stacks: &mut [Vec<u8>], from: usize, to: usize) -> (&mut Vec<u8>, &mut Vec<u8>) {
-    match from.cmp(&to) {
-        Ordering::Greater => {
-            let (begin, end) = stacks.split_at_mut(from);
-            (&mut end[0], &mut begin[to])
-        }
-        Ordering::Less => {
-            let (begin, end) = stacks.split_at_mut(to);
-            (&mut begin[from], &mut end[0])
-        }
-        Ordering::Equal => panic!("Tried to stack from and to {from}"),
-    }
-}
-
-fn compute_answer(stacks: &mut [Vec<u8>]) -> Result<String> {
-    let mut result = String::with_capacity(stacks.len());
-
-    for stack in stacks {
-        result.push(
-            *stack
-                .last()
-                .ok_or_else(|| anyhow::anyhow!("Encountered empty stack"))? as char,
-        );
-    }
-
-    Ok(result)
-}
-
-pub fn part1(input: &[u8]) -> Result<String> {
-    let (mut stacks, moves) = parse_input(input, parse_task)?;
-
-    for (count, from, to) in moves {
-        let (from, to) = get_both(&mut stacks, from - 1, to - 1);
-
-        let drain_start = from.len() - count;
-
-        to.extend(from.drain(drain_start..).rev());
-    }
-
-    compute_answer(&mut stacks)
-}
-
-pub fn part2(input: &[u8]) -> Result<String> {
-    let (mut stacks, moves) = parse_input(input, parse_task)?;
-
-    for (count, from, to) in moves {
-        let (from, to) = get_both(&mut stacks, from - 1, to - 1);
-
-        let drain_start = from.len() - count;
-
-        to.extend(from.drain(drain_start..));
-    }
-
-    compute_answer(&mut stacks)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    const SAMPLE: &[u8] = include_bytes!("samples/05.txt");
-
-    #[test]
-    fn sample_part1() {
-        assert_eq!(part1(SAMPLE).unwrap(), "CMZ");
-    }
-
-    #[test]
-    fn sample_part2() {
-        assert_eq!(part2(SAMPLE).unwrap(), "MCD");
-    }
 }

2022/src/day06.rs

@@ -1,70 +1,9 @@
 use anyhow::Result;
 
-fn find_first(input: &[u8], unique: usize) -> Result<usize> {
+pub fn part1(_input: &[u8]) -> Result<String> {
-    #[inline]
+    todo!()
-    const fn index(c: u8) -> usize {
-        (c - b'a') as usize
-    }
-    let mut seen = [false; 26];
-
-    let mut first = 0;
-
-    // Loop invariant: input[first..last] contains only unique characters
-    for (last, &c) in input.iter().enumerate() {
-        if seen[index(c)] {
-            while input[first] != c {
-                seen[index(input[first])] = false;
-                first += 1;
-            }
-            first += 1;
-        } else {
-            // New unique character found: input[first..=last] contains unique characters
-            if last - first + 1 == unique {
-                return Ok(first + unique);
-            }
-
-            seen[index(c)] = true;
-        }
-    }
-
-    anyhow::bail!("Did not find unique sequence of length {unique}");
 }
 
-pub fn part1(input: &[u8]) -> Result<String> {
+pub fn part2(_input: &[u8]) -> Result<String> {
-    Ok(find_first(input, 4)?.to_string())
+    todo!()
-}
-
-pub fn part2(input: &[u8]) -> Result<String> {
-    Ok(find_first(input, 14)?.to_string())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    const SAMPLES: &[&[u8]] = &[
-        b"mjqjpqmgbljsphdztnvjfqwrcgsmlb",
-        b"bvwbjplbgvbhsrlpgdmjqwftvncz",
-        b"nppdvjthqldpwncqszvftbrmjlhg",
-        b"nznrnfrfntjfmvfwmzdfjlvtqnbhcprsg",
-        b"zcfzfwzzqfrljwzlrfnpqdbhtmscgvjw",
-    ];
-
-    #[test]
-    fn sample_part1() {
-        const CORRECT: &[usize] = &[7, 5, 6, 10, 11];
-
-        for (&sample, &correct) in SAMPLES.iter().zip(CORRECT) {
-            assert_eq!(find_first(sample, 4).unwrap(), correct);
-        }
-    }
-
-    #[test]
-    fn sample_part2() {
-        const CORRECT: &[usize] = &[19, 23, 23, 29, 26];
-
-        for (&sample, &correct) in SAMPLES.iter().zip(CORRECT) {
-            assert_eq!(find_first(sample, 14).unwrap(), correct);
-        }
-    }
 }

2022/src/samples/05.txt

@@ -1,9 +0,0 @@
-    [D]    
-[N] [C]    
-[Z] [M] [P]
- 1   2   3 
-
-move 1 from 2 to 1
-move 3 from 1 to 3
-move 2 from 2 to 1
-move 1 from 1 to 2