From 8c19bc6597d3023001a54ebb5cc72f03ee9d4d45 Mon Sep 17 00:00:00 2001
From: Crizomb <clementbart.45@gmail.com>
Date: Sun, 8 Dec 2024 23:09:33 +0100
Subject: [PATCH] rustfmt + other things

---
 src/day_2_1.rs | 23 ++++++++++++-----------
 src/day_2_2.rs | 31 ++++++++++++-------------------
 2 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/src/day_2_1.rs b/src/day_2_1.rs
index 36d2474..69b1976 100644
--- a/src/day_2_1.rs
+++ b/src/day_2_1.rs
@@ -7,26 +7,27 @@ pub fn solve_day_2_1() {
         .expect("Something went wrong reading the file")
         .split("\n")
         .map(|x| {
-            x.split(" ").map(|y| y.parse::<i32>().unwrap()).collect::<Vec<i32>>()
-        }).collect::<Vec<Vec<i32>>>();
+            x.split(" ")
+                .map(|y| y.parse::<i32>().unwrap())
+                .collect::<Vec<i32>>()
+        })
+        .collect::<Vec<Vec<i32>>>();
 
-    let first_diff_sign = contents
-        .iter()
-        .map(|vec| vec[1] - vec[0] > 0);
+    let first_diff_sign = contents.iter().map(|vec| vec[1] - vec[0] > 0);
 
     let is_safe_list = contents
         .iter()
         .map(|vec| vec.windows(2))
         .zip(first_diff_sign)
         .map(|(mut vec_win, should_increase)| {
-            vec_win.all(|win| (
-                win[1] - win[0]).abs() <= 3 &&
-                (win[1] - win[0] > 0) == should_increase &&
-                win[1] != win[0])
+            vec_win.all(|win| {
+                (win[1] - win[0]).abs() <= 3
+                    && (win[1] - win[0] > 0) == should_increase
+                    && win[1] != win[0]
+            })
         });
 
     let ans = is_safe_list.filter(|x| *x).count();
 
     println!("{:?}", ans);
-
-}
\ No newline at end of file
+}
diff --git a/src/day_2_2.rs b/src/day_2_2.rs
index d624738..c1e9c49 100644
--- a/src/day_2_2.rs
+++ b/src/day_2_2.rs
@@ -1,7 +1,6 @@
 use std::fs;
 
-pub fn is_safe(level : &Vec<i32>, skip_i : usize) -> bool
-{
+pub fn is_safe(level: &Vec<i32>, skip_i: usize) -> bool {
     let level_without_skip_i = level
         .iter()
         .enumerate()
@@ -9,33 +8,27 @@ pub fn is_safe(level : &Vec<i32>, skip_i : usize) -> bool
         .map(|(_, x)| *x)
         .collect::<Vec<i32>>();
 
-
     let should_increase = level_without_skip_i[1] > level_without_skip_i[0];
 
-    level_without_skip_i.windows(2).all(|win| (
-        win[1] - win[0]).abs() <= 3 &&
-        (win[1] > win[0]) == should_increase &&
-        win[1] != win[0])
+    level_without_skip_i.windows(2).all(|win| {
+        (win[1] - win[0]).abs() <= 3 && (win[1] > win[0]) == should_increase && win[1] != win[0]
+    })
 }
 pub fn solve_day_2_2() {
     let file_path = "/home/clement/RustroverProjects/advent_of_code/src/inputs/input_2.txt";
     println!("In file {file_path}");
 
-    let binding = fs::read_to_string(file_path)
-        .expect("Something went wrong reading the file");
+    let binding = fs::read_to_string(file_path).expect("Something went wrong reading the file");
 
-    let contents = binding
-        .split("\n")
-        .map(|x|x.split(" ").map(|y| y.parse::<i32>().unwrap()).collect::<Vec<i32>>());
+    let contents = binding.lines().map(|x| {
+        x.split_whitespace()
+            .map(|y| y.parse::<i32>().unwrap())
+            .collect::<Vec<i32>>()
+    });
 
-    let good_levels = contents.map(
-        |level| {
-            (0..(level.len()+1)).rev().any(|i| is_safe(&level, i))
-        }
-    );
+    let good_levels = contents.map(|level| (0..=level.len()).rev().any(|i| is_safe(&level, i)));
 
     let ans = good_levels.filter(|x| *x).count();
 
     println!("{:?}", ans);
-
-}
\ No newline at end of file
+}