flatten

Author: sourproton

src/main.rs

@@ -1,13 +1,11 @@
-use std::{env, time::SystemTime};
-
 mod helpers;
 mod solutions;
 
 fn main() {
-    let time = SystemTime::now();
+    let time = std::time::SystemTime::now();
 
     // reading command line arguments
-    let args: Vec<String> = env::args().collect();
+    let args: Vec<String> = std::env::args().collect();
 
     if args.len() == 1 {
         // if no arguments given, run all available solutions
@@ -17,10 +15,9 @@ fn main() {
     } else {
         // if arguments are given, run the respective solutions
         args.into_iter().skip(1).for_each(|arg| {
-            let day = arg
-                .parse()
-                .unwrap_or_else(|_| panic!("not able to parse command line argument {arg}"));
-            helpers::solve_day(day);
+            if let Ok(day) = arg.parse() {
+                helpers::solve_day(day);
+            }
         })
     }
 

src/solutions/day01.rs

@@ -12,18 +12,15 @@ pub fn pt1(filename: &str) -> (u32, u32) {
     let mut biggest = 0;
     let mut current = 0;
 
-    // iterating through each line of the file
-    read_lines(filename).for_each(|line| {
-        if let Ok(line) = line {
-            match line.as_str() {
-                // if empty line, compare current block with biggest found until then
-                "" => {
-                    biggest = biggest.max(current);
-                    current = 0;
-                }
-                // if number, continue the sum of current block
-                _ => current += line.parse::<u32>().expect("unable to parse line {line}"),
+    read_lines(filename).flatten().for_each(|line| {
+        match line.as_str() {
+            // if empty line, compare current block with biggest found until then
+            "" => {
+                biggest = biggest.max(current);
+                current = 0;
             }
+            // if number, continue the sum of current block
+            _ => current += line.parse::<u32>().expect("unable to parse line {line}"),
         }
     });
 
@@ -43,26 +40,24 @@ pub fn pt2(filename: &str) -> (u32, u32) {
     let mut current = 0;
 
     // iterating through each line of the file
-    read_lines(filename).for_each(|line| {
-        if let Ok(line) = line {
-            match line.as_str() {
-                // if empty line, compare current block with 3 biggest known
-                "" => {
-                    if current > biggest[0] {
-                        biggest[2] = biggest[1];
-                        biggest[1] = biggest[0];
-                        biggest[0] = current;
-                    } else if current > biggest[1] {
-                        biggest[2] = biggest[1];
-                        biggest[1] = current;
-                    } else if current > biggest[2] {
-                        biggest[2] = current;
-                    }
-                    current = 0;
+    read_lines(filename).flatten().for_each(|line| {
+        match line.as_str() {
+            // if empty line, compare current block with 3 biggest known
+            "" => {
+                if current > biggest[0] {
+                    biggest[2] = biggest[1];
+                    biggest[1] = biggest[0];
+                    biggest[0] = current;
+                } else if current > biggest[1] {
+                    biggest[2] = biggest[1];
+                    biggest[1] = current;
+                } else if current > biggest[2] {
+                    biggest[2] = current;
                 }
-                // if number, continue the sum of current block
-                _ => current += line.parse::<u32>().expect("unable to parse line {line}"),
+                current = 0;
             }
+            // if number, continue the sum of current block
+            _ => current += line.parse::<u32>().expect("unable to parse line {line}"),
         }
     });
 

src/solutions/day02.rs

@@ -9,14 +9,9 @@ use {crate::helpers::read_lines, std::time::SystemTime};
 pub fn pt1(filename: &str) -> (u32, u32) {
     let time = SystemTime::now();
 
-    // iterating through each line
     let answer = read_lines(filename)
-        // getting a `RoundMoves` out of each line and calculating its `total_points`
-        .map(|line| match line {
-            Ok(line) => RoundMoves::from_line(line).total_points(),
-            _ => panic!("unable to read line"),
-        })
-        // getting the sum of all `total_points`
+        .flatten()
+        .map(|line| RoundMoves::from_line(line).total_points())
         .sum();
 
     let time = time.elapsed().unwrap().as_millis() as u32;
@@ -27,14 +22,9 @@ pub fn pt1(filename: &str) -> (u32, u32) {
 pub fn pt2(filename: &str) -> (u32, u32) {
     let time = SystemTime::now();
 
-    // iterating through each line
     let answer = read_lines(filename)
-        // getting a `RoundMoves` out of each line and calculating its `total_points`
-        .map(|line| match line {
-            Ok(line) => RoundOutcome::from_line(line).total_points(),
-            _ => panic!("unable to read line"),
-        })
-        // getting the sum of all `total_points`
+        .flatten()
+        .map(|line| RoundOutcome::from_line(line).total_points())
         .sum();
 
     let time = time.elapsed().unwrap().as_millis() as u32;

src/solutions/day03.rs

@@ -10,10 +10,8 @@ pub fn pt1(filename: &str) -> (u32, u32) {
     let time = SystemTime::now();
 
     let answer = read_lines(filename)
-        .map(|line| match line {
-            Ok(line) => Rucksack::from_line(line).value_of_common(),
-            _ => panic!("unable to read line"),
-        })
+        .flatten()
+        .map(|line| Rucksack::from_line(line).value_of_common())
         .sum();
 
     let time = time.elapsed().unwrap().as_millis() as u32;