From 000002809a62ee3fefe25bb44ffc8aa1de157635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Jane=C5=BEi=C4=8D?= Date: Sat, 18 Nov 2023 20:08:29 +0100 Subject: [PATCH] feat: move .trim inside read function --- Cargo.lock | 2 +- Cargo.toml | 2 +- src/bin/scaffold.rs | 4 ++-- src/lib.rs | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 95d3864..490e380 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -45,7 +45,7 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[package]] name = "aoc" -version = "27.0.0" +version = "28.0.0" dependencies = [ "dotenvy", "elves", diff --git a/Cargo.toml b/Cargo.toml index 93d7ae3..0ec0977 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "aoc" description = "template for advent of code" readme = "README.md" -version = "27.0.0" +version = "28.0.0" edition = "2021" license = "MIT" authors = ["Matej Janežič "] diff --git a/src/bin/scaffold.rs b/src/bin/scaffold.rs index 7ca609d..dcb5cb5 100644 --- a/src/bin/scaffold.rs +++ b/src/bin/scaffold.rs @@ -24,12 +24,12 @@ mod tests { use super::*; #[test] fn test_part_one() { - let input = aoc::read_file("examples", DAY).trim(); + let input = aoc::read_file("examples", DAY); assert_eq!(part_one(&input), None); } #[test] fn test_part_two() { - let input = aoc::read_file("examples", DAY).trim(); + let input = aoc::read_file("examples", DAY); assert_eq!(part_two(&input), None); } } diff --git a/src/lib.rs b/src/lib.rs index 5fa41e8..c1624c9 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -45,11 +45,10 @@ pub fn read_file(folder: &str, day: u8) -> String { let filepath = cwd.join("src").join(folder).join(format!("{day:02}.txt")); let f = fs::read_to_string(filepath); - f.expect("could not open input file") + f.expect("could not open input file").trim().to_string() } pub fn parse_args() -> Result { let mut args = pico_args::Arguments::from_env(); args.free_from_str() } -