From 495e258ba810c749855311eb05eab8807eac6861 Mon Sep 17 00:00:00 2001
From: Mark Hildebrand <mhildebrand@microsoft.com>
Date: Mon, 28 Sep 2026 14:43:04 -0700
Subject: [PATCH] Bump benchmark-runner to 2024.

---
 diskann-benchmark-runner/Cargo.toml                 |  2 +-
 diskann-benchmark-runner/dev/main.rs                |  2 +-
 diskann-benchmark-runner/src/benchmark.rs           |  4 ++--
 diskann-benchmark-runner/src/checker.rs             |  2 +-
 diskann-benchmark-runner/src/features.rs            |  6 +-----
 diskann-benchmark-runner/src/files.rs               |  2 +-
 diskann-benchmark-runner/src/input.rs               |  2 +-
 diskann-benchmark-runner/src/internal/regression.rs |  5 +++--
 diskann-benchmark-runner/src/internal/visibility.rs | 10 ++++++----
 diskann-benchmark-runner/src/jobs.rs                |  2 +-
 diskann-benchmark-runner/src/registry.rs            |  8 ++++----
 diskann-benchmark-runner/src/result.rs              |  2 +-
 diskann-benchmark-runner/src/test/dim.rs            |  2 +-
 diskann-benchmark-runner/src/test/gated.rs          |  2 +-
 diskann-benchmark-runner/src/test/mod.rs            |  2 +-
 diskann-benchmark-runner/src/test/typed.rs          |  2 +-
 diskann-benchmark-runner/src/ux.rs                  |  8 ++++----
 17 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/diskann-benchmark-runner/Cargo.toml b/diskann-benchmark-runner/Cargo.toml
index 3a12ccb566..041f16df33 100644
--- a/diskann-benchmark-runner/Cargo.toml
+++ b/diskann-benchmark-runner/Cargo.toml
@@ -5,7 +5,7 @@ description.workspace = true
 authors.workspace = true
 repository.workspace = true
 license.workspace = true
-edition.workspace = true
+edition = "2024"
 
 [dependencies]
 anyhow = { workspace = true }
diff --git a/diskann-benchmark-runner/dev/main.rs b/diskann-benchmark-runner/dev/main.rs
index 0d627c421d..788e9016b3 100644
--- a/diskann-benchmark-runner/dev/main.rs
+++ b/diskann-benchmark-runner/dev/main.rs
@@ -6,7 +6,7 @@
 //! Development CLI for exercising the benchmark runner with its test registry.
 
 use clap::Parser;
-use diskann_benchmark_runner::{output, test, App, Registry};
+use diskann_benchmark_runner::{App, Registry, output, test};
 
 fn main() -> anyhow::Result<()> {
     // Parse the command line options.
diff --git a/diskann-benchmark-runner/src/benchmark.rs b/diskann-benchmark-runner/src/benchmark.rs
index 5e71c907ad..00c714d60d 100644
--- a/diskann-benchmark-runner/src/benchmark.rs
+++ b/diskann-benchmark-runner/src/benchmark.rs
@@ -5,7 +5,7 @@
 
 use serde::{Deserialize, Serialize};
 
-use crate::{internal::visibility::Visibility, Checkpoint, Input, Output};
+use crate::{Checkpoint, Input, Output, internal::visibility::Visibility};
 
 ///////////////
 // Benchmark //
@@ -328,7 +328,7 @@ pub(crate) struct FailureScore(pub(crate) u32);
 pub(crate) mod internal {
     use super::*;
 
-    use crate::{input::internal::Any, Features};
+    use crate::{Features, input::internal::Any};
 
     use anyhow::Context;
     use thiserror::Error;
diff --git a/diskann-benchmark-runner/src/checker.rs b/diskann-benchmark-runner/src/checker.rs
index f561983a13..85caaae63b 100644
--- a/diskann-benchmark-runner/src/checker.rs
+++ b/diskann-benchmark-runner/src/checker.rs
@@ -213,7 +213,7 @@ impl Kind {
 mod tests {
     use super::*;
 
-    use std::fs::{create_dir, File};
+    use std::fs::{File, create_dir};
 
     #[test]
     fn test_constructor() {
diff --git a/diskann-benchmark-runner/src/features.rs b/diskann-benchmark-runner/src/features.rs
index 8419b5df5c..8d7b286716 100644
--- a/diskann-benchmark-runner/src/features.rs
+++ b/diskann-benchmark-runner/src/features.rs
@@ -103,11 +103,7 @@ impl From<&'static str> for Features {
 impl std::fmt::Display for Features {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         fn feature(plural: bool) -> &'static str {
-            if plural {
-                "features"
-            } else {
-                "feature"
-            }
+            if plural { "features" } else { "feature" }
         }
 
         match &self.0 {
diff --git a/diskann-benchmark-runner/src/files.rs b/diskann-benchmark-runner/src/files.rs
index eb161d52ed..02b0c97979 100644
--- a/diskann-benchmark-runner/src/files.rs
+++ b/diskann-benchmark-runner/src/files.rs
@@ -74,7 +74,7 @@ impl std::fmt::Display for InputFile {
 
 #[cfg(test)]
 mod tests {
-    use std::fs::{create_dir, File};
+    use std::fs::{File, create_dir};
 
     use super::*;
 
diff --git a/diskann-benchmark-runner/src/input.rs b/diskann-benchmark-runner/src/input.rs
index 3868ac229c..64bb7fac07 100644
--- a/diskann-benchmark-runner/src/input.rs
+++ b/diskann-benchmark-runner/src/input.rs
@@ -3,7 +3,7 @@
  * Licensed under the MIT license.
  */
 
-use crate::{internal::visibility::Visibility, Checker};
+use crate::{Checker, internal::visibility::Visibility};
 
 /// Inputs to [`Benchmarks`](crate::Benchmark).
 ///
diff --git a/diskann-benchmark-runner/src/internal/regression.rs b/diskann-benchmark-runner/src/internal/regression.rs
index 75e92c7cb4..d9842bf14f 100644
--- a/diskann-benchmark-runner/src/internal/regression.rs
+++ b/diskann-benchmark-runner/src/internal/regression.rs
@@ -99,10 +99,11 @@ use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
 use crate::{
-    benchmark::{internal::CheckedPassFail, PassFail},
+    Checker,
+    benchmark::{PassFail, internal::CheckedPassFail},
     input::internal::Any,
     internal::load_from_disk,
-    jobs, registry, result, Checker,
+    jobs, registry, result,
 };
 
 ////////////
diff --git a/diskann-benchmark-runner/src/internal/visibility.rs b/diskann-benchmark-runner/src/internal/visibility.rs
index e9385f36ea..5788cdee06 100644
--- a/diskann-benchmark-runner/src/internal/visibility.rs
+++ b/diskann-benchmark-runner/src/internal/visibility.rs
@@ -52,10 +52,12 @@ mod tests {
     fn test_is_available() {
         let features = Features::new("some-feature");
         assert!(Visibility::Available.is_available());
-        assert!(!Visibility::Gated {
-            features: &features
-        }
-        .is_available());
+        assert!(
+            !Visibility::Gated {
+                features: &features
+            }
+            .is_available()
+        );
     }
 
     #[test]
diff --git a/diskann-benchmark-runner/src/jobs.rs b/diskann-benchmark-runner/src/jobs.rs
index 0cc75e7511..f5a7abc87e 100644
--- a/diskann-benchmark-runner/src/jobs.rs
+++ b/diskann-benchmark-runner/src/jobs.rs
@@ -8,7 +8,7 @@ use std::path::{Path, PathBuf};
 use anyhow::Context;
 use serde::{Deserialize, Serialize};
 
-use crate::{checker::Checker, input, Registry};
+use crate::{Registry, checker::Checker, input};
 
 #[derive(Debug)]
 pub(crate) struct Jobs {
diff --git a/diskann-benchmark-runner/src/registry.rs b/diskann-benchmark-runner/src/registry.rs
index 82429114f8..b44a845c7f 100644
--- a/diskann-benchmark-runner/src/registry.rs
+++ b/diskann-benchmark-runner/src/registry.rs
@@ -3,15 +3,15 @@
  * Licensed under the MIT license.
  */
 
-use std::collections::{hash_map::Entry, HashMap};
+use std::collections::{HashMap, hash_map::Entry};
 
 use thiserror::Error;
 
 use crate::{
-    benchmark::{self, internal::AnnotatedMatch, Benchmark, MatchContext, Regression, Score},
+    Checkpoint, Features, Input, Output,
+    benchmark::{self, Benchmark, MatchContext, Regression, Score, internal::AnnotatedMatch},
     input,
     internal::visibility::Visibility,
-    Checkpoint, Features, Input, Output,
 };
 
 /// A collection of registered inputs and benchmarks.
@@ -609,7 +609,7 @@ pub(crate) struct RegisteredTolerance<'a> {
 mod tests {
     use super::*;
 
-    use crate::{input, Checker};
+    use crate::{Checker, input};
 
     macro_rules! input {
         ($T:ident, $tag:literal) => {
diff --git a/diskann-benchmark-runner/src/result.rs b/diskann-benchmark-runner/src/result.rs
index f80b445818..ec4331ed29 100644
--- a/diskann-benchmark-runner/src/result.rs
+++ b/diskann-benchmark-runner/src/result.rs
@@ -7,7 +7,7 @@
 
 use std::path::Path;
 
-use serde::{ser::SerializeSeq, Deserialize, Serialize, Serializer};
+use serde::{Deserialize, Serialize, Serializer, ser::SerializeSeq};
 
 /// A helper to generate incremental snapshots of data while a benchmark is progressing.
 ///
diff --git a/diskann-benchmark-runner/src/test/dim.rs b/diskann-benchmark-runner/src/test/dim.rs
index 61dc07a1b4..329cb64a34 100644
--- a/diskann-benchmark-runner/src/test/dim.rs
+++ b/diskann-benchmark-runner/src/test/dim.rs
@@ -8,8 +8,8 @@ use std::io::Write;
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    benchmark::{MatchContext, PassFail, Regression, Score},
     Benchmark, Checker, Checkpoint, Input, Output,
+    benchmark::{MatchContext, PassFail, Regression, Score},
 };
 
 ///////////
diff --git a/diskann-benchmark-runner/src/test/gated.rs b/diskann-benchmark-runner/src/test/gated.rs
index 1391c36223..033fab55db 100644
--- a/diskann-benchmark-runner/src/test/gated.rs
+++ b/diskann-benchmark-runner/src/test/gated.rs
@@ -16,7 +16,7 @@ use std::io::Write;
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    benchmark::MatchContext, benchmark::Score, Benchmark, Checker, Checkpoint, Input, Output,
+    Benchmark, Checker, Checkpoint, Input, Output, benchmark::MatchContext, benchmark::Score,
 };
 
 use super::{dim::DimInput, typed::TypeInput};
diff --git a/diskann-benchmark-runner/src/test/mod.rs b/diskann-benchmark-runner/src/test/mod.rs
index 93b9997147..c2af19e088 100644
--- a/diskann-benchmark-runner/src/test/mod.rs
+++ b/diskann-benchmark-runner/src/test/mod.rs
@@ -5,7 +5,7 @@
 
 use std::collections::HashSet;
 
-use crate::{registry, Features};
+use crate::{Features, registry};
 
 mod dim;
 mod gated;
diff --git a/diskann-benchmark-runner/src/test/typed.rs b/diskann-benchmark-runner/src/test/typed.rs
index dd94f222e4..3ab0e7a891 100644
--- a/diskann-benchmark-runner/src/test/typed.rs
+++ b/diskann-benchmark-runner/src/test/typed.rs
@@ -8,9 +8,9 @@ use std::io::Write;
 use serde::{Deserialize, Serialize};
 
 use crate::{
+    Benchmark, Checker, Checkpoint, Input, Output,
     benchmark::{MatchContext, PassFail, Regression, Score},
     utils::datatype::{AsDataType, DataType},
-    Benchmark, Checker, Checkpoint, Input, Output,
 };
 
 ///////////
diff --git a/diskann-benchmark-runner/src/ux.rs b/diskann-benchmark-runner/src/ux.rs
index 98e0a6b42b..9f862d5619 100644
--- a/diskann-benchmark-runner/src/ux.rs
+++ b/diskann-benchmark-runner/src/ux.rs
@@ -78,10 +78,10 @@ pub fn strip_backtrace(s: String) -> String {
             in_stacktrace = true;
 
             // Remove a previous empty line (if any).
-            if let Some(previous) = lines.last() {
-                if previous.is_empty() {
-                    lines.pop();
-                }
+            if let Some(previous) = lines.last()
+                && previous.is_empty()
+            {
+                lines.pop();
             }
         } else {
             lines.push(line);