diff --git a/src/bin/download.rs b/src/bin/download.rs index ac0851f..95ceae5 100644 --- a/src/bin/download.rs +++ b/src/bin/download.rs @@ -13,7 +13,7 @@ fn main() { }; dotenv().ok(); - let day_padded = format!("{:02}", day); + let day_padded = format!("{day:02}"); let token = env::var("TOKEN").expect("$TOKEN is not set"); let year = env::var("YEAR") .expect("$YEAR is not set") @@ -21,7 +21,7 @@ fn main() { .expect("$YEAR must be a number"); let mut headers = header::HeaderMap::new(); - let mut session_header = header::HeaderValue::from_str(format!("session={}", token).as_str()) + let mut session_header = header::HeaderValue::from_str(format!("session={token}").as_str()) .expect("Error building cookie header"); session_header.set_sensitive(true); headers.insert(header::COOKIE, session_header); @@ -29,15 +29,14 @@ fn main() { let client = Client::builder().default_headers(headers).build().unwrap(); let res = client .get(format!( - "https://adventofcode.com/{}/day/{}/input", - year, day + "https://adventofcode.com/{year}/day/{day}/input" )) .send() .unwrap() .text() .unwrap(); - let input_path = format!("src/inputs/{}.txt", day_padded); + let input_path = format!("src/inputs/{day_padded}.txt"); let mut file = match OpenOptions::new() .write(true) .create(true) @@ -45,7 +44,7 @@ fn main() { { Ok(file) => file, Err(e) => { - eprintln!("Failed to create module file: {}", e); + eprintln!("Failed to create module file: {e}"); process::exit(1); } }; @@ -55,7 +54,7 @@ fn main() { println!("Downloaded input file \"{}\"", &input_path); } Err(e) => { - eprintln!("Failed to write module contents: {}", e); + eprintln!("Failed to write module contents: {e}"); process::exit(1); } } diff --git a/src/bin/prepare.rs b/src/bin/prepare.rs index 2bc92af..446373a 100644 --- a/src/bin/prepare.rs +++ b/src/bin/prepare.rs @@ -52,16 +52,16 @@ fn main() { } }; - let day_padded = format!("{:02}", day); + let day_padded = format!("{day:02}"); - let input_path = format!("src/inputs/{}.txt", day_padded); - let example_path = format!("src/test_inputs/{}.txt", day_padded); - let module_path = format!("src/bin/{}.rs", day_padded); + let input_path = format!("src/inputs/{day_padded}.txt"); + let example_path = format!("src/test_inputs/{day_padded}.txt"); + let module_path = format!("src/bin/{day_padded}.rs"); let mut file = match safe_create_file(&module_path) { Ok(file) => file, Err(e) => { - eprintln!("Failed to create module file: {}", e); + eprintln!("Failed to create module file: {e}"); process::exit(1); } }; @@ -71,7 +71,7 @@ fn main() { println!("Created module file \"{}\"", &module_path); } Err(e) => { - eprintln!("Failed to write module contents: {}", e); + eprintln!("Failed to write module contents: {e}"); process::exit(1); } } @@ -81,7 +81,7 @@ fn main() { println!("Created empty input file \"{}\"", &input_path); } Err(e) => { - eprintln!("Failed to create input file: {}", e); + eprintln!("Failed to create input file: {e}"); process::exit(1); } } @@ -91,7 +91,7 @@ fn main() { println!("Created empty example file \"{}\"", &example_path); } Err(e) => { - eprintln!("Failed to create example file: {}", e); + eprintln!("Failed to create example file: {e}"); process::exit(1); } } diff --git a/src/lib.rs b/src/lib.rs index a789162..3f505e6 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -44,7 +44,7 @@ macro_rules! solve { pub fn read_file(folder: &str, day: u8) -> String { let cwd = env::current_dir().unwrap(); - let filepath = cwd.join("src").join(folder).join(format!("{:02}.txt", day)); + 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") @@ -104,8 +104,7 @@ mod tests { fn test_parse_exec_time() { assert_approx_eq!( parse_exec_time(&format!( - "šŸŽ„ Part 1 šŸŽ„\n0 (elapsed: 74.13ns){}\nšŸŽ„ Part 2 šŸŽ„\n0 (elapsed: 50.00ns){}", - ANSI_RESET, ANSI_RESET + "šŸŽ„ Part 1 šŸŽ„\n0 (elapsed: 74.13ns){ANSI_RESET}\nšŸŽ„ Part 2 šŸŽ„\n0 (elapsed: 50.00ns){ANSI_RESET}" )), 0_f64 ); diff --git a/src/main.rs b/src/main.rs index fd13201..3805710 100644 --- a/src/main.rs +++ b/src/main.rs @@ -8,7 +8,7 @@ use std::process::Command; fn main() { let total: f64 = (1..=25) .map(|day| { - let day = format!("{:02}", day); + let day = format!("{day:02}"); let cmd = Command::new("cargo") .args(["run", "--release", "--bin", &day]) @@ -16,7 +16,7 @@ fn main() { .unwrap(); println!("----------"); - println!("{}| Day {} |{}", ANSI_BOLD, day, ANSI_RESET); + println!("{ANSI_BOLD}| Day {day} |{ANSI_RESET}"); println!("----------"); let output = String::from_utf8(cmd.stdout).unwrap(); @@ -40,7 +40,6 @@ fn main() { .sum(); println!( - "{}Total:{} {}{:.2}ms{}", - ANSI_BOLD, ANSI_RESET, ANSI_ITALIC, total, ANSI_RESET + "{ANSI_BOLD}Total:{ANSI_RESET} {ANSI_ITALIC}{total:.2}ms{ANSI_RESET}" ); }