src/lib.rs

@@ -1,7 +1,8 @@
+extern crate core;
+
 pub mod prob1;
 pub mod prob2;
 pub mod prob3;
 pub mod prob4;
 pub mod prob5;
 pub mod prob6;
-pub mod prob7;

src/prob4/mod.rs

@@ -11,31 +11,37 @@ pub fn complete_overlap(first_pair: &[u32], second_pair: &[u32]) -> bool {
 
 pub fn solve(file_path: &str, unary_operator: &dyn Fn(&[u32], &[u32]) -> bool) -> i32 {
     std::fs::read_to_string(file_path)
-        .unwrap_or_else(|err| panic!("Please provide a text file as an argument: {err}"))
+        .expect("Please provide a text file as an argument.")
         .lines()
         .map(|line| {
             let tmp = line.split(',').collect::<Vec<&str>>();
             let first_pair = tmp
                 .first()
-                .unwrap_or_else(|| panic!("First character error"))
+                .expect("First character error")
                 .split('-')
                 .map(|first_split| {
                     first_split
                         .parse::<u32>()
-                        .unwrap_or_else(|err| panic!("Parsing number in first pair failed: {err}"))
+                        .expect("Parsing number in first pair failed")
                 })
                 .collect::<Vec<u32>>();
             let second_pair = tmp
                 .last()
-                .unwrap_or_else(|| panic!("First character error"))
+                .expect("First character error")
                 .split('-')
                 .map(|first_split| {
                     first_split
                         .parse::<u32>()
-                        .unwrap_or_else(|err| panic!("Parsing number in first pair failed: {err}"))
+                        .expect("Parsing number in first pair failed")
                 })
                 .collect::<Vec<u32>>();
-            i32::from(unary_operator(&first_pair, &second_pair))
+            if unary_operator(&first_pair, &second_pair) {
+                1
+            } else {
+                0
+            }
         })
+        .collect::<Vec<i32>>()
+        .iter()
         .sum()
 }

src/prob7.rs

@@ -1,17 +0,0 @@
-use nom::{branch::alt, bytes::complete::tag, combinator::map, IResult};
-
-use crate::prob7::Instructions::{Cd, Dir, Ls};
-
-enum Instructions {
-    Ls,
-    Cd,
-    Dir,
-}
-
-fn parse_instruction(i: &str) -> IResult<&str, Instructions> {
-    alt((
-        map(tag("ls"), |_| Ls),
-        map(tag("cd"), |_| Cd),
-        map(tag("dir"), |_| Dir),
-    ))(i)
-}