Small tidy

Author: maneatingape

src/util/hash.rs

@@ -6,7 +6,6 @@
 //! resistant but slower hashing algorithm. [`FxHasher`] is much faster (between 2x to 5x from my testing).
 use std::collections::{HashMap, HashSet};
 use std::hash::{BuildHasher, Hash, Hasher};
-use std::ops::BitXor as _;
 
 /// Type alias for [`HashSet`] using [`FxHasher`].
 pub type FastSet<T> = HashSet<T, BuildFxHasher>;
@@ -92,7 +91,7 @@ pub struct FxHasher {
 impl FxHasher {
     #[inline]
     fn add(&mut self, i: u64) {
-        self.hash = self.hash.rotate_left(5).bitxor(i).wrapping_mul(K);
+        self.hash = (self.hash.rotate_left(5) ^ i).wrapping_mul(K);
     }
 }
 

src/util/md5.rs

@@ -297,8 +297,7 @@ pub mod simd {
         m: Simd<u32, N>,
         s: u32,
         k: u32,
-    ) -> Simd<u32, N>
-where {
+    ) -> Simd<u32, N> {
         let f = b ^ c ^ d;
         common(f, a, b, m, s, k)
     }
@@ -312,8 +311,7 @@ where {
         m: Simd<u32, N>,
         s: u32,
         k: u32,
-    ) -> Simd<u32, N>
-where {
+    ) -> Simd<u32, N> {
         let f = c ^ (b | !d);
         common(f, a, b, m, s, k)
     }
@@ -326,8 +324,7 @@ where {
         m: Simd<u32, N>,
         s: u32,
         k: u32,
-    ) -> Simd<u32, N>
-where {
+    ) -> Simd<u32, N> {
         let k = Simd::splat(k);
         let first = f + a + k + m;
         let second = (first << s) | (first >> (32 - s));

tests/year2016/day04.rs

@@ -12,15 +12,15 @@ totally-real-room-200[decoy]";
 // order regardless of the order of skipped letters.  Go with the looser interpretation, since
 // it gives slightly faster code, and no one has reported an input file where it fails.  However,
 // when there is more than one higher-frequency letter, both should be in the checksum.
-const EXAMPLE2: &str = "\
+const SECOND_EXAMPLE: &str = "\
 a-b-c-d-e-f-g-h-001[bcdef]
 aa-bb-c-d-e-f-g-h-002[acdef]";
 
 #[test]
 fn part1_test() {
     let input = parse(EXAMPLE);
     assert_eq!(part1(&input), 1514);
-    let input = parse(EXAMPLE2);
+    let input = parse(SECOND_EXAMPLE);
     assert_eq!(part1(&input), 1);
 }
 

tests/year2024/day07.rs

@@ -11,7 +11,7 @@ const EXAMPLE: &str = "\
 21037: 9 7 18 13
 292: 11 6 16 20";
 
-const EXAMPLE2: &str = "\
+const SECOND_EXAMPLE: &str = "\
 190: 10 19
 11174: 15 8 9 79 74
 729: 6 6 7 37 650";
@@ -20,14 +20,14 @@ const EXAMPLE2: &str = "\
 fn part1_test() {
     let input = parse(EXAMPLE);
     assert_eq!(part1(&input), 3749);
-    let input2 = parse(EXAMPLE2);
+    let input2 = parse(SECOND_EXAMPLE);
     assert_eq!(part1(&input2), 190);
 }
 
 #[test]
 fn part2_test() {
     let input = parse(EXAMPLE);
     assert_eq!(part2(&input), 11387);
-    let input2 = parse(EXAMPLE2);
+    let input2 = parse(SECOND_EXAMPLE);
     assert_eq!(part2(&input2), 11364);
 }

tests/year2024/day24.rs

@@ -57,5 +57,5 @@ fn part1_test() {
 
 #[test]
 fn part2_test() {
-    // No test
+    // No example data
 }

tests/year2025/day11.rs

@@ -1,6 +1,6 @@
 use aoc::year2025::day11::*;
 
-const EXAMPLE_ONE: &str = "\
+const FIRST_EXAMPLE: &str = "\
 aaa: you hhh
 you: bbb ccc
 bbb: ddd eee
@@ -12,7 +12,7 @@ ggg: out
 hhh: ccc fff iii
 iii: out";
 
-const EXAMPLE_TWO: &str = "\
+const SECOND_EXAMPLE: &str = "\
 svr: aaa bbb
 aaa: fft
 fft: ccc
@@ -29,12 +29,12 @@ hhh: out";
 
 #[test]
 fn part1_test() {
-    let input = parse(EXAMPLE_ONE);
+    let input = parse(FIRST_EXAMPLE);
     assert_eq!(part1(&input), 5);
 }
 
 #[test]
 fn part2_test() {
-    let input = parse(EXAMPLE_TWO);
+    let input = parse(SECOND_EXAMPLE);
     assert_eq!(part2(&input), 2);
 }