Refactoring

jurisk · Dec 10, 2024 · 54cbf88 · 54cbf88
1 parent f7258a5
commit 54cbf88
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/rust/y2024/src/bin/solution_2024_09.rs b/rust/y2024/src/bin/solution_2024_09.rs
@@ -69,25 +69,21 @@ impl Disk {
                         head += 1;
                         tail -= 1;
                     } else if free_count < full_count {
-                        let new_nodes = vec![
-                            self.nodes[0 .. head].to_vec(),
+                        let new_nodes = [self.nodes[0 .. head].to_vec(),
                             vec![Node::Full(free_count, file_id)],
                             self.nodes[head + 1 .. tail].to_vec(),
                             vec![Node::Full(full_count - free_count, file_id)],
-                            self.nodes[tail + 1 ..].to_vec(),
-                        ]
+                            self.nodes[tail + 1 ..].to_vec()]
                         .concat();
                         self.nodes = new_nodes;
                     } else if free_count > full_count {
-                        let new_nodes = vec![
-                            self.nodes[0 .. head].to_vec(),
+                        let new_nodes = [self.nodes[0 .. head].to_vec(),
                             vec![
                                 Node::Full(full_count, file_id),
                                 Node::Free(free_count - full_count),
                             ],
                             self.nodes[head + 1 .. tail].to_vec(),
-                            self.nodes[tail + 1 ..].to_vec(),
-                        ]
+                            self.nodes[tail + 1 ..].to_vec()]
                         .concat();
                         self.nodes = new_nodes;
                     }
@@ -122,13 +118,11 @@ impl Disk {
                                 self.nodes[found_idx] = Node::Full(*count, *file_id);
                                 self.nodes[pointer] = Node::Free(free);
                             } else if *count < free {
-                                let new_nodes = vec![
-                                    self.nodes[0 .. found_idx].to_vec(),
+                                let new_nodes = [self.nodes[0 .. found_idx].to_vec(),
                                     vec![Node::Full(*count, *file_id), Node::Free(free - *count)],
                                     self.nodes[found_idx + 1 .. pointer].to_vec(),
                                     vec![Node::Free(*count)],
-                                    self.nodes[pointer + 1 ..].to_vec(),
-                                ]
+                                    self.nodes[pointer + 1 ..].to_vec()]
                                 .concat();
                                 self.nodes = new_nodes;
                             } else {

diff --git a/scala2/src/main/scala/jurisk/adventofcode/y2024/Advent10.scala b/scala2/src/main/scala/jurisk/adventofcode/y2024/Advent10.scala
@@ -1,6 +1,7 @@
 package jurisk.adventofcode.y2024
 
-import jurisk.geometry.{Coords2D, Field2D}
+import jurisk.geometry.Coords2D
+import jurisk.geometry.Field2D
 import jurisk.utils.FileInput._
 
 object Advent10 {