Skip to content

Commit 645c708

Browse files
authored
Merge pull request #773 from ehuss/fix-config
Fix broken config and clippy warnings
2 parents 53fc2ea + d773a98 commit 645c708

File tree

6 files changed

+7
-11
lines changed

6 files changed

+7
-11
lines changed

config.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ yices2 = { skip = true } # Sometimes times out, sometimes doesn't
143143
scheduled-executor = { skip-tests = true } # UB, allocator corruption
144144
skippy-rs = { skip-tests = true } # UB, out-of-bounds get_unchecked
145145
pepe-telemetry = { skip-test = true } # flaky test (concurrency)
146-
puid = { skip-tests = true } # flaky test (timing)
147146
watchable = { skip-tests = true } # flaky test (timing)
148147
lispi = { skip-tests = true } # flaky test (data races)
149148
cargo-ramdisk = { skip-tests = true } # flaky test (concurrency)

src/bin/test-report.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,6 @@ impl ReportWriter for NullWriter {
7979

8080
impl fmt::Display for NullWriter {
8181
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
82-
write!(f, "{:?}", self)
82+
write!(f, "{self:?}")
8383
}
8484
}

src/db/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ impl<E: std::error::Error> r2d2::HandleError<E> for ErrorHandler {
6060
if log::log_enabled!(log::Level::Error) {
6161
log::error!("r2d2 error: {:?}", error);
6262
} else {
63-
eprintln!("r2d2 error: {:?}", error);
63+
eprintln!("r2d2 error: {error:?}");
6464
}
6565
}
6666
}

src/report/archives.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ impl Drop for TempfileBackedBuffer {
5151
fn drop(&mut self) {
5252
unsafe {
5353
if let Err(e) = nix::sys::mman::munmap(self.mmap.as_ptr() as *mut _, self.mmap.len()) {
54-
eprintln!("Failed to unmap temporary file: {:?}", e);
54+
eprintln!("Failed to unmap temporary file: {e:?}");
5555
}
5656
}
5757
}

src/runner/worker.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -256,11 +256,8 @@ impl<'a> Worker<'a> {
256256
self.ex,
257257
&krate,
258258
tc,
259-
format!(
260-
"{}\n\nthis task or one of its parent failed: {:?}",
261-
logs, err
262-
)
263-
.as_bytes(),
259+
format!("{logs}\n\nthis task or one of its parent failed: {err:?}")
260+
.as_bytes(),
264261
&result,
265262
updated_version.as_ref().map(|new| (&krate, new)),
266263
) {
@@ -327,7 +324,7 @@ impl<'a> Worker<'a> {
327324
self.ex,
328325
&task.krate,
329326
tc,
330-
format!("{}\n\n{:?}", storage, err).as_bytes(),
327+
format!("{storage}\n\n{err:?}").as_bytes(),
331328
&test_result,
332329
updated_version.as_ref().map(|new| (&krate, new)),
333330
)?;

src/server/routes/ui/experiments.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ fn humanize(duration: Duration) -> String {
131131
Ok(d) => d,
132132
Err(_) => {
133133
// Don't try to make it pretty as a fallback.
134-
return format!("{:?}", duration);
134+
return format!("{duration:?}");
135135
}
136136
};
137137
if duration.as_secs() < 60 {

0 commit comments

Comments
 (0)