From cfb3ae497ec6695b75d71cc78e0fcb4e4eb0c762 Mon Sep 17 00:00:00 2001 From: Johannes Date: Fri, 26 May 2023 10:02:22 +0200 Subject: [PATCH] Reformatted --- src/tasks/day01.rs | 5 +++-- src/tasks/day03.rs | 14 +++++++++----- src/tasks/day04.rs | 8 +++++--- src/tasks/day05.rs | 11 +++++++---- src/tasks/day07.rs | 3 ++- src/tasks/day15.rs | 3 ++- src/tasks/day22.rs | 5 +---- 7 files changed, 29 insertions(+), 20 deletions(-) diff --git a/src/tasks/day01.rs b/src/tasks/day01.rs index 45dc2b1..c671220 100644 --- a/src/tasks/day01.rs +++ b/src/tasks/day01.rs @@ -1,5 +1,5 @@ -use std::collections::HashSet; use crate::utils; +use std::collections::HashSet; pub fn task1() { let frequency: i32 = utils::read_file("input/day01.txt") @@ -23,7 +23,8 @@ pub fn task2() { } else { Some((*current, true)) } - }).find(|state| state.1); + }) + .find(|state| state.1); println!("Part 2: {} was there already!", final_state.unwrap().0); } diff --git a/src/tasks/day03.rs b/src/tasks/day03.rs index fd0d325..00ce7dc 100644 --- a/src/tasks/day03.rs +++ b/src/tasks/day03.rs @@ -1,6 +1,6 @@ +use crate::utils; use regex::Regex; use std::collections::HashMap; -use crate::utils; #[derive(PartialEq)] enum Use { @@ -23,7 +23,8 @@ pub fn task1() { let width: u32 = m.get(4).unwrap().as_str().parse().unwrap(); let height: u32 = m.get(5).unwrap().as_str().parse().unwrap(); (id, left, top, width, height) - }).fold( + }) + .fold( HashMap::<(u32, u32), Use>::new(), |mut map, (id, left, top, width, height)| { for x in left..left + width { @@ -38,7 +39,8 @@ pub fn task1() { map }, - ).iter() + ) + .iter() .filter(|it| *it.1 == Use::Multi) .count(); @@ -60,7 +62,8 @@ pub fn task2() { let width: u32 = m.get(4).unwrap().as_str().parse().unwrap(); let height: u32 = m.get(5).unwrap().as_str().parse().unwrap(); (id, left, top, width, height) - }).collect(); + }) + .collect(); let distribution: HashMap<(u32, u32), Use> = claims.iter().fold( HashMap::<(u32, u32), Use>::new(), @@ -90,7 +93,8 @@ pub fn task2() { } } true - }).unwrap(); + }) + .unwrap(); println!("Part 2: {}", winner_id); } diff --git a/src/tasks/day04.rs b/src/tasks/day04.rs index 1d0e3fc..b1db9e5 100644 --- a/src/tasks/day04.rs +++ b/src/tasks/day04.rs @@ -1,8 +1,8 @@ +use crate::utils; use chrono::prelude::*; use chrono::Duration; use chrono::NaiveDateTime; use std::collections::HashMap; -use crate::utils; enum Activity { Starts(u32), @@ -35,7 +35,8 @@ pub fn task1() { Activity::Starts(number) }; (time, activity) - }).collect(); + }) + .collect(); input.sort_by_key(|it| it.0); let mut current_id: u32 = 0; @@ -104,7 +105,8 @@ pub fn task2() { Activity::Starts(number) }; (time, activity) - }).collect(); + }) + .collect(); input.sort_by_key(|it| it.0); let mut current_id: u32 = 0; diff --git a/src/tasks/day05.rs b/src/tasks/day05.rs index 1b7c6c2..d13d8d2 100644 --- a/src/tasks/day05.rs +++ b/src/tasks/day05.rs @@ -1,5 +1,5 @@ -use std::time::Instant; use crate::utils; +use std::time::Instant; pub fn task1() { let mut input = utils::read_file("input/day05.txt"); @@ -24,9 +24,11 @@ pub fn task2() { .chars() .filter(|ch| ch.eq_ignore_ascii_case(&c)) .collect::(), - ).len(), + ) + .len(), ) - }).min_by_key(|it| it.1) + }) + .min_by_key(|it| it.1) .unwrap(); println!("Duration: {:?}", Instant::now() - start); @@ -56,6 +58,7 @@ fn reduce(input: &str) -> String { stack.push(c); } stack - }).iter() + }) + .iter() .collect() } diff --git a/src/tasks/day07.rs b/src/tasks/day07.rs index d0c1a3a..e28d0a5 100644 --- a/src/tasks/day07.rs +++ b/src/tasks/day07.rs @@ -18,7 +18,8 @@ pub fn task1() { let mut open: HashSet = tasks .iter() - .filter(|task| !depends_on.contains_key(task)).copied() + .filter(|task| !depends_on.contains_key(task)) + .copied() .collect(); let mut result = String::new(); diff --git a/src/tasks/day15.rs b/src/tasks/day15.rs index 048a9ca..d58bb19 100644 --- a/src/tasks/day15.rs +++ b/src/tasks/day15.rs @@ -200,7 +200,8 @@ impl Game { // None // } let map = Map::from_game(self, from); - map.shortest_path(from, to).map(|path| *path.get(1).unwrap_or(&from)) + map.shortest_path(from, to) + .map(|path| *path.get(1).unwrap_or(&from)) } /// Returns true if a full round was played, false if the round aborted because all diff --git a/src/tasks/day22.rs b/src/tasks/day22.rs index 9f4c91a..a022c2e 100644 --- a/src/tasks/day22.rs +++ b/src/tasks/day22.rs @@ -164,10 +164,7 @@ impl Cave { }) .for_each(|node| { if self.equipment_allowed_for_region(node.0, node.1, node.2) { - result.push(Edge { - cost: 1, - node, - }) + result.push(Edge { cost: 1, node }) } });