cargo fmt

day_01/src/lib.rs

@@ -3,10 +3,10 @@ use itertools::Itertools;
 fn input_parse(input: &str) -> Vec<u32> {
     input
         .split_whitespace()
-        .map(|t|
+        .map(|t| {
             t.parse::<u32>()
-                .expect(&format!("Could not parse {} into u32", &t))
-        )
+                .unwrap_or_else(|t| panic!("Could not parse {} into u32", &t))
+        })
         .collect::<Vec<_>>()
 }
 
@@ -56,9 +56,16 @@ fn input_parse(input: &str) -> Vec<u32> {
 pub fn part1(input: &str) -> u32 {
     let input = input_parse(input);
 
-    input.iter()
-        .tuple_windows::<(_,_)>()
-        .fold(0, |acc, inp| { if inp.0 < inp.1 { acc + 1 } else { acc }})
+    input.iter().tuple_windows::<(_, _)>().fold(
+        0,
+        |acc, inp| {
+            if inp.0 < inp.1 {
+                acc + 1
+            } else {
+                acc
+            }
+        },
+    )
 }
 
 ///
@@ -102,9 +109,10 @@ pub fn part1(input: &str) -> u32 {
 ///
 pub fn part2(input: &str) -> u32 {
     let input = input_parse(input);
-    input.iter()
-        .tuple_windows::<(_,_,_)>()
-        .map(|(a,b,c) | a + b + c)
-        .tuple_windows::<(_,_)>()
-        .fold(0, |acc, inp| if inp.0 < inp.1 { acc + 1 } else { acc } )
-}
+    input
+        .iter()
+        .tuple_windows::<(_, _, _)>()
+        .map(|(a, b, c)| a + b + c)
+        .tuple_windows::<(_, _)>()
+        .fold(0, |acc, inp| if inp.0 < inp.1 { acc + 1 } else { acc })
+}

day_02/src/lib.rs

@@ -1,6 +1,6 @@
 use std::fmt::Debug;
 
-peg::parser!{
+peg::parser! {
     grammar input_parser() for str {
         rule number() -> usize
           = n:$(['0'..='9']+) {? n.parse().or(Err("u32"))}
@@ -41,11 +41,11 @@ impl SubmarinePart1 {
             depth: 0,
         }
     }
-    fn move_in_direction(&mut self, direction: &Direction) -> () {
+    fn move_in_direction(&mut self, direction: &Direction) {
         match direction {
             Direction::Forward(x) => {
                 self.horizontal += x;
-            },
+            }
             Direction::Up(y) => self.depth -= y,
             Direction::Down(y) => self.depth += y,
         }
@@ -55,7 +55,7 @@ impl SubmarinePart1 {
 pub(crate) struct SubmarinePart2 {
     horizontal: usize,
     depth: usize,
-    aim: usize
+    aim: usize,
 }
 
 impl SubmarinePart2 {
@@ -66,12 +66,12 @@ impl SubmarinePart2 {
             aim: 0,
         }
     }
-    fn move_in_direction(&mut self, direction: &Direction) -> () {
+    fn move_in_direction(&mut self, direction: &Direction) {
         match direction {
             Direction::Forward(x) => {
                 self.horizontal += x;
                 self.depth += self.aim * x
-            },
+            }
             Direction::Up(y) => self.aim -= y,
             Direction::Down(y) => self.aim += y,
         }
@@ -122,7 +122,9 @@ pub(crate) fn input_parse(input: &str) -> Vec<Direction> {
 pub fn part1(input: &str) -> usize {
     let directions = input_parse(input);
     let mut p = SubmarinePart1::new();
-    directions.iter().for_each(|direction| p.move_in_direction(direction));
+    directions
+        .iter()
+        .for_each(|direction| p.move_in_direction(direction));
     p.horizontal * p.depth
 }
 
@@ -159,6 +161,8 @@ pub fn part1(input: &str) -> usize {
 pub fn part2(input: &str) -> usize {
     let directions = input_parse(input);
     let mut p = SubmarinePart2::new();
-    directions.iter().for_each(|direction| p.move_in_direction(direction));
+    directions
+        .iter()
+        .for_each(|direction| p.move_in_direction(direction));
     p.depth * p.horizontal
-}
+}

src/main.rs

@@ -1,9 +1,9 @@
 extern crate clap;
 
+use clap::{arg_enum, clap_app, value_t};
 use std::error::Error;
 use std::fs::File;
 use std::io::{BufReader, Read};
-use clap::{arg_enum, clap_app, value_t};
 
 arg_enum! {
     #[derive(Debug)]
@@ -40,7 +40,9 @@ fn main() -> Result<(), Box<dyn Error>> {
         (DaysImplemented::Day1, 2) => println!("{}", day_01::part2(&input)),
         (DaysImplemented::Day2, 1) => println!("{}", day_02::part1(&input)),
         (DaysImplemented::Day2, 2) => println!("{}", day_02::part2(&input)),
-        _ => {unimplemented!()}
+        _ => {
+            unimplemented!()
+        }
     };
 
     Ok(())
@@ -50,6 +52,6 @@ fn file_exists(val: String) -> Result<(), String> {
     if std::fs::metadata(&val).is_ok() {
         Ok(())
     } else {
-        Err(String::from(format!("File at {} doesn't exist", &val)))
+        Err(format!("File at {} doesn't exist", &val))
     }
 }