From 14ea60b8232221ff69e383629a1bd36821eb94ae Mon Sep 17 00:00:00 2001 From: timoschneider Date: Sun, 8 Dec 2024 17:49:26 +0100 Subject: [PATCH] added trim_end because of windows --- src/day01/src/part01a.rs | 2 +- src/day01/src/part01b.rs | 2 +- src/day02/src/part02a.rs | 2 +- src/day02/src/part02b.rs | 2 +- src/day04/src/part04a.rs | 2 +- src/day04/src/part04b.rs | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/day01/src/part01a.rs b/src/day01/src/part01a.rs index a0a822f..5cb0355 100644 --- a/src/day01/src/part01a.rs +++ b/src/day01/src/part01a.rs @@ -14,7 +14,7 @@ pub fn day01a() -> u64 { // parse file file_content.split("\n").enumerate().for_each(|(line_nr, line)| { - let mut split = line.split(" "); + let mut split = line.trim_end().split(" "); list_a[line_nr] = split.next().unwrap().parse::().unwrap(); list_b[line_nr] = split.next().unwrap().parse::().unwrap(); }); diff --git a/src/day01/src/part01b.rs b/src/day01/src/part01b.rs index d840f25..5e61374 100644 --- a/src/day01/src/part01b.rs +++ b/src/day01/src/part01b.rs @@ -14,7 +14,7 @@ pub fn day01b() -> u64 { // parse file file_content.split("\n").enumerate().for_each(|(line_nr, line)| { - let mut split = line.split(" "); + let mut split = line.trim_end().split(" "); list_a[line_nr] = split.next().unwrap().parse::().unwrap(); list_b[line_nr] = split.next().unwrap().parse::().unwrap(); }); diff --git a/src/day02/src/part02a.rs b/src/day02/src/part02a.rs index e9ee582..6e95be8 100644 --- a/src/day02/src/part02a.rs +++ b/src/day02/src/part02a.rs @@ -11,7 +11,7 @@ pub fn day02a() -> u64 { let mut nr_or_correct_reports: u64 = 0; // iterate over all reports file_content.split("\n").for_each(|report| { - let levels: Vec = report.split(" ").map(|level| level.parse::().unwrap()).collect(); + let levels: Vec = report.trim_end().split(" ").map(|level| level.parse::().unwrap()).collect(); let mut trend: i32 = 0; let mut safe: bool = true; // iterate over all levels and ty to find a trend diff --git a/src/day02/src/part02b.rs b/src/day02/src/part02b.rs index ca83120..707d95d 100644 --- a/src/day02/src/part02b.rs +++ b/src/day02/src/part02b.rs @@ -11,7 +11,7 @@ pub fn day02b() -> u64 { let mut nr_or_correct_reports: u64 = 0; // iterate over all reports file_content.split("\n").for_each(|report| { - let levels: Vec = report.split(" ").map(|level| level.parse::().unwrap()).collect(); + let levels: Vec = report.trim_end().split(" ").map(|level| level.parse::().unwrap()).collect(); let mut trend: i32 = 0; let mut safe: i32 = 2; // iterate over all levels and ty to find a trend diff --git a/src/day04/src/part04a.rs b/src/day04/src/part04a.rs index 36309d1..7004a5b 100644 --- a/src/day04/src/part04a.rs +++ b/src/day04/src/part04a.rs @@ -10,7 +10,7 @@ pub fn day04a() -> u64 { // create n*n matrix from input let mut matrix: [[char; 140]; 140] = [[' '; 140]; 140]; file_content.split("\n").enumerate().for_each(|(line_nr, line)| { - line.chars().enumerate().for_each(|(col_nr, ch)| { + line.trim_end().chars().enumerate().for_each(|(col_nr, ch)| { matrix[line_nr][col_nr] = ch; }); }); diff --git a/src/day04/src/part04b.rs b/src/day04/src/part04b.rs index 5985410..6ce3eb3 100644 --- a/src/day04/src/part04b.rs +++ b/src/day04/src/part04b.rs @@ -10,7 +10,7 @@ pub fn day04b() -> u64 { // create n*n matrix from input let mut matrix: [[char; 140]; 140] = [[' '; 140]; 140]; file_content.split("\n").enumerate().for_each(|(line_nr, line)| { - line.chars().enumerate().for_each(|(col_nr, ch)| { + line.trim_end().chars().enumerate().for_each(|(col_nr, ch)| { matrix[line_nr][col_nr] = ch; }); });