Skip to content

Commit 9f1b095

Browse files
committed
chore: Run cargo fmt
1 parent 2f690a4 commit 9f1b095

File tree

1 file changed

+31
-14
lines changed

1 file changed

+31
-14
lines changed

src/day04.rs

+31-14
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
pub fn solve_part1(input: &str) -> i32 {
2-
32
let mut xmas_count = 0;
43

54
let word_search_matrix = parse_string_to_2d_vector(input);
@@ -31,31 +30,50 @@ pub fn solve_part1(input: &str) -> i32 {
3130
}
3231

3332
pub fn solve_part2(input: &str) -> i32 {
34-
3533
let m = parse_string_to_2d_vector(input);
3634

3735
let mut x_mas_count = 0;
38-
for (i , row) in m.iter().enumerate() {
36+
for (i, row) in m.iter().enumerate() {
3937
for (j, _) in row.iter().enumerate() {
4038
if i > 0 && j > 0 && i < m.len() - 1 && j < row.len() - 1 && m[i][j] == 'A' {
41-
let upper_left = m[(i as isize-1).rem_euclid(m.len() as isize) as usize][(j as isize-1).rem_euclid(m[0].len() as isize) as usize];
42-
let upper_right = m[(i as isize-1).rem_euclid(m.len() as isize) as usize][(j as isize+1).rem_euclid(m[0].len() as isize) as usize];
43-
let lower_left = m[(i as isize+1).rem_euclid(m.len() as isize) as usize][(j as isize-1).rem_euclid(m[0].len() as isize) as usize];
44-
let lower_right = m[(i as isize+1).rem_euclid(m.len() as isize) as usize][(j as isize+1).rem_euclid(m[0].len() as isize) as usize];
45-
46-
if upper_left == 'M' && lower_right == 'S' && lower_left == 'M' && upper_right == 'S' {
39+
let upper_left = m[(i as isize - 1).rem_euclid(m.len() as isize) as usize]
40+
[(j as isize - 1).rem_euclid(m[0].len() as isize) as usize];
41+
let upper_right = m[(i as isize - 1).rem_euclid(m.len() as isize) as usize]
42+
[(j as isize + 1).rem_euclid(m[0].len() as isize) as usize];
43+
let lower_left = m[(i as isize + 1).rem_euclid(m.len() as isize) as usize]
44+
[(j as isize - 1).rem_euclid(m[0].len() as isize) as usize];
45+
let lower_right = m[(i as isize + 1).rem_euclid(m.len() as isize) as usize]
46+
[(j as isize + 1).rem_euclid(m[0].len() as isize) as usize];
47+
48+
if upper_left == 'M'
49+
&& lower_right == 'S'
50+
&& lower_left == 'M'
51+
&& upper_right == 'S'
52+
{
4753
x_mas_count += 1;
4854
}
4955

50-
if upper_left == 'S' && lower_right == 'M' && lower_left == 'M' && upper_right == 'S' {
56+
if upper_left == 'S'
57+
&& lower_right == 'M'
58+
&& lower_left == 'M'
59+
&& upper_right == 'S'
60+
{
5161
x_mas_count += 1;
5262
}
53-
54-
if upper_left == 'S' && lower_right == 'M' && lower_left == 'S' && upper_right == 'M' {
63+
64+
if upper_left == 'S'
65+
&& lower_right == 'M'
66+
&& lower_left == 'S'
67+
&& upper_right == 'M'
68+
{
5569
x_mas_count += 1;
5670
}
5771

58-
if upper_left == 'M' && lower_right == 'S' && lower_left == 'S' && upper_right == 'M' {
72+
if upper_left == 'M'
73+
&& lower_right == 'S'
74+
&& lower_left == 'S'
75+
&& upper_right == 'M'
76+
{
5977
x_mas_count += 1;
6078
}
6179
}
@@ -111,7 +129,6 @@ fn collect_diagonals(matrix: &[Vec<char>]) -> Vec<Vec<char>> {
111129
diagonals.push(diagonal);
112130
}
113131

114-
115132
diagonals
116133
}
117134

0 commit comments

Comments
 (0)