From beea741e631ea0704a424dfbeb32d523a4190ca3 Mon Sep 17 00:00:00 2001
From: Eric Huss <eric@huss.org>
Date: Tue, 6 May 2025 14:34:45 -0700
Subject: [PATCH 1/2] Fix broken config

The `puid` crate was deleted on Apr 17, 2025.
This is causing `cargo run -- check-config` to fail.
---
 config.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config.toml b/config.toml
index 91ab02cf..47aea9d4 100644
--- a/config.toml
+++ b/config.toml
@@ -143,7 +143,6 @@ yices2 = { skip = true } # Sometimes times out, sometimes doesn't
 scheduled-executor = { skip-tests = true } # UB, allocator corruption
 skippy-rs = { skip-tests = true } # UB, out-of-bounds get_unchecked
 pepe-telemetry = { skip-test = true } # flaky test (concurrency)
-puid = { skip-tests = true } # flaky test (timing)
 watchable = { skip-tests = true } # flaky test (timing)
 lispi = { skip-tests = true } # flaky test (data races)
 cargo-ramdisk = { skip-tests = true } # flaky test (concurrency)

From d773a989fef00b5b5299bfe2fa43bee7212ff882 Mon Sep 17 00:00:00 2001
From: Eric Huss <eric@huss.org>
Date: Tue, 6 May 2025 12:32:03 -0700
Subject: [PATCH 2/2] Fix clippy warnings

This fixes the clippy::uninlined_format_args lint which looks like
it was moved to "style" in https://github.com/rust-lang/rust-clippy/pull/14160.
---
 src/bin/test-report.rs              | 2 +-
 src/db/mod.rs                       | 2 +-
 src/report/archives.rs              | 2 +-
 src/runner/worker.rs                | 9 +++------
 src/server/routes/ui/experiments.rs | 2 +-
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/bin/test-report.rs b/src/bin/test-report.rs
index 3933fe92..8f65ea84 100644
--- a/src/bin/test-report.rs
+++ b/src/bin/test-report.rs
@@ -79,6 +79,6 @@ impl ReportWriter for NullWriter {
 
 impl fmt::Display for NullWriter {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{:?}", self)
+        write!(f, "{self:?}")
     }
 }
diff --git a/src/db/mod.rs b/src/db/mod.rs
index 46b2960c..198180ef 100644
--- a/src/db/mod.rs
+++ b/src/db/mod.rs
@@ -60,7 +60,7 @@ impl<E: std::error::Error> r2d2::HandleError<E> for ErrorHandler {
         if log::log_enabled!(log::Level::Error) {
             log::error!("r2d2 error: {:?}", error);
         } else {
-            eprintln!("r2d2 error: {:?}", error);
+            eprintln!("r2d2 error: {error:?}");
         }
     }
 }
diff --git a/src/report/archives.rs b/src/report/archives.rs
index 95726e82..aa9cd73e 100644
--- a/src/report/archives.rs
+++ b/src/report/archives.rs
@@ -51,7 +51,7 @@ impl Drop for TempfileBackedBuffer {
     fn drop(&mut self) {
         unsafe {
             if let Err(e) = nix::sys::mman::munmap(self.mmap.as_ptr() as *mut _, self.mmap.len()) {
-                eprintln!("Failed to unmap temporary file: {:?}", e);
+                eprintln!("Failed to unmap temporary file: {e:?}");
             }
         }
     }
diff --git a/src/runner/worker.rs b/src/runner/worker.rs
index 9e2dd373..b2c2b3ee 100644
--- a/src/runner/worker.rs
+++ b/src/runner/worker.rs
@@ -256,11 +256,8 @@ impl<'a> Worker<'a> {
                         self.ex,
                         &krate,
                         tc,
-                        format!(
-                            "{}\n\nthis task or one of its parent failed: {:?}",
-                            logs, err
-                        )
-                        .as_bytes(),
+                        format!("{logs}\n\nthis task or one of its parent failed: {err:?}")
+                            .as_bytes(),
                         &result,
                         updated_version.as_ref().map(|new| (&krate, new)),
                     ) {
@@ -327,7 +324,7 @@ impl<'a> Worker<'a> {
                             self.ex,
                             &task.krate,
                             tc,
-                            format!("{}\n\n{:?}", storage, err).as_bytes(),
+                            format!("{storage}\n\n{err:?}").as_bytes(),
                             &test_result,
                             updated_version.as_ref().map(|new| (&krate, new)),
                         )?;
diff --git a/src/server/routes/ui/experiments.rs b/src/server/routes/ui/experiments.rs
index b85296f8..eeb3c1d0 100644
--- a/src/server/routes/ui/experiments.rs
+++ b/src/server/routes/ui/experiments.rs
@@ -131,7 +131,7 @@ fn humanize(duration: Duration) -> String {
         Ok(d) => d,
         Err(_) => {
             // Don't try to make it pretty as a fallback.
-            return format!("{:?}", duration);
+            return format!("{duration:?}");
         }
     };
     if duration.as_secs() < 60 {