From 3dc88e4e6e2ecf65f988e691a1d7cf46894f9471 Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Sat, 23 Sep 2023 22:05:10 +0200 Subject: [PATCH 1/2] Revert "Update Rust crate prettyplease to 0.2.15" This reverts commit 5284742c5265049b6ba221def79afc7826b77e52. --- Cargo.lock | 6 +++--- aoc-build/Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ded1f71..b431fc4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -568,12 +568,12 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "prettyplease" -version = "0.2.15" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" +checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" dependencies = [ "proc-macro2", - "syn 2.0.37", + "syn 1.0.109", ] [[package]] diff --git a/aoc-build/Cargo.toml b/aoc-build/Cargo.toml index 21ec34b..fc66459 100644 --- a/aoc-build/Cargo.toml +++ b/aoc-build/Cargo.toml @@ -8,6 +8,6 @@ license = "Apache-2.0/MIT" [dependencies] eyre = "0.6.8" -prettyplease = "0.2.15" +prettyplease = "0.1.25" regex = "1.9.5" syn = "1.0.109" From 53fef911301c23e534cd934dc462f5a173307780 Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Sat, 23 Sep 2023 21:59:42 +0200 Subject: [PATCH 2/2] Inline variable to display --- aoc/src/run.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aoc/src/run.rs b/aoc/src/run.rs index 6bcb61b..0da4bb3 100644 --- a/aoc/src/run.rs +++ b/aoc/src/run.rs @@ -69,7 +69,7 @@ where let after = chrono::Utc::now(); let version = version .clone() - .map_or_else(String::new, |v| format!(" — {}", v)); + .map_or_else(String::new, |v| format!(" — {v}")); let elapsed = if opts.timing { format!(" ({})", pretty_duration(after - before)) } else {