Fix style issues caught by newer rust and clippy (#3368)

While I was debugging an unrelated issue I tried compiling our repo
with latest nightly and it found some new style issues that should be
addressed.

I quite like that it calls out unnecessary transmute if safe versions
exist

Signed-off-by: Robert Kruszewski <[email protected]>

Signed-off-by: Robert Kruszewski <[email protected]>

Author: robert3005

bench-vortex/src/bin/clickbench.rs

@@ -329,7 +329,7 @@ fn print_results(
 fn data_source_base_url(remote_data_dir: &Option<String>, flavor: Flavor) -> anyhow::Result<Url> {
     match remote_data_dir {
         None => {
-            let basepath = format!("clickbench_{}", flavor).to_data_path();
+            let basepath = format!("clickbench_{flavor}").to_data_path();
             let client = reqwest::blocking::Client::default();
 
             flavor.download(&client, basepath.as_path())?;

bench-vortex/src/bin/public_bi.rs

@@ -176,7 +176,7 @@ fn main() -> anyhow::Result<()> {
                             .sorted_for_display()
                             .iter()
                         {
-                            println!("{}", m);
+                            println!("{m}");
                         }
                     }
                 }

bench-vortex/src/bin/tpch.rs

@@ -434,7 +434,7 @@ async fn bench_main(
                 }
             }
             _ => {
-                warn!("Engine {:?} not supported for TPC-H benchmarks", engine);
+                warn!("Engine {engine:?} not supported for TPC-H benchmarks");
             }
         }
     }
@@ -447,7 +447,7 @@ async fn bench_main(
                 metrics = metrics.aggregate();
             }
             for m in metrics.timestamps_removed().sorted_for_display().iter() {
-                println!("{}", m);
+                println!("{m}");
             }
             render_table(measurements, &targets)?;
         }

bench-vortex/src/compress/bench.rs

@@ -91,15 +91,15 @@ pub fn benchmark_compress(
         });
         vortex_compress_time = Some(time);
         timings.push(CompressionTimingMeasurement {
-            name: format!("compress time/{}", bench_name),
+            name: format!("compress time/{bench_name}"),
             time,
             format: Format::OnDiskVortex,
         });
         progress.inc(1);
 
         let compressed_size_f64 = compressed_size.load(Ordering::SeqCst) as f64;
         ratios.push(CustomUnitMeasurement {
-            name: format!("vortex size/{}", bench_name),
+            name: format!("vortex size/{bench_name}"),
             format: Format::OnDiskVortex,
             unit: Cow::from("bytes"),
             value: compressed_size_f64,
@@ -123,22 +123,22 @@ pub fn benchmark_compress(
         });
         parquet_compress_time = Some(time);
         timings.push(CompressionTimingMeasurement {
-            name: format!("compress time/{}", bench_name),
+            name: format!("compress time/{bench_name}"),
             time,
             format: Format::Parquet,
         });
 
         progress.inc(1);
         let parquet_compressed_size = parquet_compressed_size.into_inner();
         ratios.push(CustomUnitMeasurement {
-            name: format!("parquet-zstd size/{}", bench_name),
+            name: format!("parquet-zstd size/{bench_name}"),
             // unlike timings, ratios have a single column vortex
             format: Format::OnDiskVortex,
             unit: Cow::from("bytes"),
             value: parquet_compressed_size as f64,
         });
         ratios.push(CustomUnitMeasurement {
-            name: format!("vortex:parquet-zstd size/{}", bench_name),
+            name: format!("vortex:parquet-zstd size/{bench_name}"),
             format: Format::OnDiskVortex,
             unit: Cow::from("ratio"),
             value: compressed_size.load(Ordering::SeqCst) as f64 / parquet_compressed_size as f64,
@@ -161,7 +161,7 @@ pub fn benchmark_compress(
         });
         vortex_decompress_time = Some(time);
         timings.push(CompressionTimingMeasurement {
-            name: format!("decompress time/{}", bench_name),
+            name: format!("decompress time/{bench_name}"),
             time,
             format: Format::OnDiskVortex,
         });
@@ -188,7 +188,7 @@ pub fn benchmark_compress(
         });
         parquet_decompress_time = Some(time);
         timings.push(CompressionTimingMeasurement {
-            name: format!("decompress time/{}", bench_name),
+            name: format!("decompress time/{bench_name}"),
             time,
             format: Format::Parquet,
         });
@@ -197,7 +197,7 @@ pub fn benchmark_compress(
 
     if let Some((vortex, parquet)) = vortex_compress_time.zip(parquet_compress_time) {
         ratios.push(CustomUnitMeasurement {
-            name: format!("vortex:parquet-zstd ratio compress time/{}", bench_name),
+            name: format!("vortex:parquet-zstd ratio compress time/{bench_name}"),
             format: Format::OnDiskVortex,
             unit: Cow::from("ratio"),
             value: vortex.as_nanos() as f64 / parquet.as_nanos() as f64,
@@ -206,7 +206,7 @@ pub fn benchmark_compress(
 
     if let Some((vortex, parquet)) = vortex_decompress_time.zip(parquet_decompress_time) {
         ratios.push(CustomUnitMeasurement {
-            name: format!("vortex:parquet-zstd ratio decompress time/{}", bench_name),
+            name: format!("vortex:parquet-zstd ratio decompress time/{bench_name}"),
             format: Format::OnDiskVortex,
             unit: Cow::from("ratio"),
             value: vortex.as_nanos() as f64 / parquet.as_nanos() as f64,

bench-vortex/src/engines/ddb/mod.rs

@@ -271,7 +271,7 @@ pub fn register_tables(
         object,
     ));
 
-    trace!("register duckdb tables with command: {:?}", command);
+    trace!("register duckdb tables with command: {command:?}");
 
     // Pass along OS env vars (for aws creds)
     // Don't trace env vars.
@@ -318,7 +318,7 @@ pub fn execute_query(
         .arg("-c")
         .arg(query);
 
-    trace!("execute duckdb query with command: {:?}", command);
+    trace!("execute duckdb query with command: {command:?}");
 
     let time_instant = Instant::now();
     let output = command.output()?;

bench-vortex/src/engines/df/mod.rs

@@ -84,7 +84,7 @@ pub fn make_object_store(
                     .build()
                     .unwrap(),
             );
-            df.register_object_store(&Url::parse(&format!("s3://{}/", bucket_name))?, s3.clone());
+            df.register_object_store(&Url::parse(&format!("s3://{bucket_name}/"))?, s3.clone());
             Ok(s3)
         }
         "gs" => {
@@ -95,7 +95,7 @@ pub fn make_object_store(
                     .build()
                     .unwrap(),
             );
-            df.register_object_store(&Url::parse(&format!("gs://{}/", bucket_name))?, gcs.clone());
+            df.register_object_store(&Url::parse(&format!("gs://{bucket_name}/"))?, gcs.clone());
             Ok(gcs)
         }
         _ => {
@@ -130,7 +130,7 @@ pub fn write_execution_plan(
 ) {
     fs::write(
         format!("{dataset_name}_{format}_q{query_idx:02}.plan"),
-        format!("{:#?}", execution_plan),
+        format!("{execution_plan:#?}"),
     )
     .expect("Unable to write file");
 

bench-vortex/src/measurements.rs

@@ -27,10 +27,10 @@ pub enum MeasurementValue {
 impl Display for MeasurementValue {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         match self {
-            MeasurementValue::Int(i) => write!(f, "{}", i),
+            MeasurementValue::Int(i) => write!(f, "{i}"),
             MeasurementValue::Float(fl) => match f.precision() {
-                None => write!(f, "{}", fl),
-                Some(p) => write!(f, "{1:.*}", p, fl),
+                None => write!(f, "{fl}"),
+                Some(p) => write!(f, "{fl:.p$}"),
             },
         }
     }

bench-vortex/src/tpcds/mod.rs

@@ -24,7 +24,7 @@ pub fn tpcds_queries() -> impl Iterator<Item = (usize, String)> {
 fn tpch_query(query_idx: usize) -> String {
     let manifest_dir = Path::new(env!("CARGO_MANIFEST_DIR"))
         .join("tpcds")
-        .join(format!("{:02}", query_idx))
+        .join(format!("{query_idx:02}"))
         .with_extension("sql");
     fs::read_to_string(manifest_dir).unwrap()
 }

bench-vortex/src/tpch/dbgen.rs

@@ -153,7 +153,7 @@ impl Display for Platform {
             Platform::MacOS => "macos",
             Platform::Linux => "linux",
         };
-        write!(f, "{}", str)
+        write!(f, "{str}")
     }
 }
 

bench-vortex/src/tpch/mod.rs

@@ -289,7 +289,7 @@ pub fn tpch_queries() -> impl Iterator<Item = (usize, Vec<String>)> {
 fn tpch_query(query_idx: usize) -> Vec<String> {
     let manifest_dir = Path::new(env!("CARGO_MANIFEST_DIR"))
         .join("tpch")
-        .join(format!("q{}", query_idx))
+        .join(format!("q{query_idx}"))
         .with_extension("sql");
     fs::read_to_string(manifest_dir)
         .unwrap()