@@ -16,14 +16,14 @@ fn part_1(input: Vec<Vec<i32>>) -> i32 {
16
16
17
17
dijkstra:: dijkstra (
18
18
& start,
19
- |( x , y ) | successors_small ( ( x , y ) , & input) ,
19
+ |curr | successors_small ( curr , & input) ,
20
20
|& node| node == goal,
21
21
)
22
22
. unwrap ( )
23
23
. 1
24
24
}
25
25
26
- fn successors_small ( current : ( & i32 , & i32 ) , grid : & [ Vec < i32 > ] ) -> Vec < ( ( i32 , i32 ) , i32 ) > {
26
+ fn successors_small ( current : & ( i32 , i32 ) , grid : & [ Vec < i32 > ] ) -> Vec < ( ( i32 , i32 ) , i32 ) > {
27
27
let ( x, y) = current;
28
28
SURROUNDING_POINTS
29
29
. iter ( )
@@ -34,6 +34,7 @@ fn successors_small(current: (&i32, &i32), grid: &[Vec<i32>]) -> Vec<((i32, i32)
34
34
} )
35
35
. flatten ( )
36
36
. collect :: < Vec < _ > > ( )
37
+
37
38
}
38
39
39
40
fn part_2 ( input : Vec < Vec < i32 > > ) -> i32 {
@@ -43,14 +44,14 @@ fn part_2(input: Vec<Vec<i32>>) -> i32 {
43
44
44
45
dijkstra:: dijkstra (
45
46
& start,
46
- |( x , y ) | successors_large ( ( x , y ) , & input) ,
47
+ |curr | successors_large ( curr , & input) ,
47
48
|& node| node == goal,
48
49
)
49
50
. unwrap ( )
50
51
. 1
51
52
}
52
53
53
- fn successors_large ( current : ( & i32 , & i32 ) , grid : & [ Vec < i32 > ] ) -> Vec < ( ( i32 , i32 ) , i32 ) > {
54
+ fn successors_large ( current : & ( i32 , i32 ) , grid : & [ Vec < i32 > ] ) -> Vec < ( ( i32 , i32 ) , i32 ) > {
54
55
let ( x, y) = current;
55
56
let square_size = grid. len ( ) ;
56
57
SURROUNDING_POINTS
0 commit comments