Format

Author: blyxyas

collector/benchlib/src/benchmark.rs

@@ -119,8 +119,15 @@ impl<'a> BenchmarkGroup<'a> {
 
     fn profile_benchmark(self, args: ProfileArgs) -> anyhow::Result<()> {
         let Some(benchmark) = self.benchmarks.get(args.benchmark.as_str()) else {
-            return Err(anyhow::anyhow!("Benchmark `{}` not found. Available benchmarks: {}", args.benchmark,
-                self.benchmarks.keys().map(|s| s.to_string()).collect::<Vec<_>>().join(", ")));
+            return Err(anyhow::anyhow!(
+                "Benchmark `{}` not found. Available benchmarks: {}",
+                args.benchmark,
+                self.benchmarks
+                    .keys()
+                    .map(|s| s.to_string())
+                    .collect::<Vec<_>>()
+                    .join(", ")
+            ));
         };
         (benchmark.profile_fn)();
 

collector/src/bin/collector.rs

@@ -38,7 +38,8 @@ use collector::runtime::{
 };
 use collector::runtime::{profile_runtime, RuntimeCompilationOpts};
 use collector::toolchain::{
-    create_toolchain_from_published_version, get_local_toolchain, Sysroot, Toolchain, ToolchainConfig,
+    create_toolchain_from_published_version, get_local_toolchain, Sysroot, Toolchain,
+    ToolchainConfig,
 };
 use collector::utils::cachegrind::cachegrind_diff;
 use collector::utils::{is_installed, wait_for_future};
@@ -378,7 +379,7 @@ struct CompileTimeOptions {
 
     /// The path to the local clippy to measure
     #[arg(long)]
-    clippy: Option<PathBuf>
+    clippy: Option<PathBuf>,
 }
 
 #[derive(Debug, clap::Args)]
@@ -1197,18 +1198,9 @@ fn bench_published_artifact(
     let artifact_id = ArtifactId::Tag(toolchain.id.clone());
 
     let profiles = if collector::version_supports_doc(&toolchain.id) {
-        vec![
-            Profile::Check,
-            Profile::Debug,
-            Profile::Doc,
-            Profile::Opt
-        ]
+        vec![Profile::Check, Profile::Debug, Profile::Doc, Profile::Opt]
     } else {
-        vec![
-            Profile::Check,
-            Profile::Debug,
-            Profile::Opt,
-        ]
+        vec![Profile::Check, Profile::Debug, Profile::Opt]
     };
     let scenarios = if collector::version_supports_incremental(&toolchain.id) {
         Scenario::all()

collector/src/toolchain.rs

@@ -125,7 +125,7 @@ impl SysrootDownload {
             Some(sysroot_bin("rustdoc")?),
             match sysroot_bin("cargo-clippy") {
                 Err(_) => None,
-                Ok(path) => Some(path)
+                Ok(path) => Some(path),
             },
             sysroot_bin("cargo")?,
             &self.directory.join(&self.rust_sha).join("lib"),
@@ -435,26 +435,27 @@ pub fn get_local_toolchain(
             None
         };
 
-        let clippy =
-        if let Some(clippy) = &toolchain_config.clippy {
-            Some(clippy.canonicalize().with_context(|| {
+    let clippy = if let Some(clippy) = &toolchain_config.clippy {
+        Some(
+            clippy.canonicalize().with_context(|| {
                 format!("failed to canonicalize clippy executable {:?}", clippy)
-            })?)
-        } else if profiles.contains(&Profile::Clippy) {
-            // We need a `clippy`. Look for one next to `rustc`.
-            if let Ok(clippy) = rustc.with_file_name("cargo-clippy").canonicalize() {
-                debug!("found clippy: {:?}", &clippy);
-                Some(clippy)
-            } else {
-                anyhow::bail!(
+            })?,
+        )
+    } else if profiles.contains(&Profile::Clippy) {
+        // We need a `clippy`. Look for one next to `rustc`.
+        if let Ok(clippy) = rustc.with_file_name("cargo-clippy").canonicalize() {
+            debug!("found clippy: {:?}", &clippy);
+            Some(clippy)
+        } else {
+            anyhow::bail!(
                     "'Clippy' build specified but '--clippy' not specified and no 'cargo-clippy' found \
                     next to 'rustc'"
                 );
-            }
-        } else {
-            // No `clippy` provided, but none needed.
-            None
-        };
+        }
+    } else {
+        // No `clippy` provided, but none needed.
+        None
+    };
     let cargo = if let Some(cargo) = &toolchain_config.cargo {
         cargo
             .canonicalize()
@@ -483,7 +484,9 @@ pub fn get_local_toolchain(
     let lib_dir = get_lib_dir_from_rustc(&rustc).context("Cannot find libdir for rustc")?;
 
     Ok(Toolchain {
-        components: ToolchainComponents::from_binaries_and_libdir(rustc, rustdoc, clippy, cargo, &lib_dir)?,
+        components: ToolchainComponents::from_binaries_and_libdir(
+            rustc, rustdoc, clippy, cargo, &lib_dir,
+        )?,
         id,
         triple: target_triple,
     })
@@ -530,8 +533,13 @@ pub fn create_toolchain_from_published_version(
 
     let lib_dir = get_lib_dir_from_rustc(&rustc)?;
 
-    let components =
-        ToolchainComponents::from_binaries_and_libdir(rustc, Some(rustdoc), Some(clippy), cargo, &lib_dir)?;
+    let components = ToolchainComponents::from_binaries_and_libdir(
+        rustc,
+        Some(rustdoc),
+        Some(clippy),
+        cargo,
+        &lib_dir,
+    )?;
 
     Ok(Toolchain {
         components,

database/src/lib.rs

@@ -225,7 +225,7 @@ pub enum Profile {
     /// An optimized "release" build
     Opt,
     /// A Clippy run
-    Clippy
+    Clippy,
 }
 
 impl Profile {
@@ -235,7 +235,7 @@ impl Profile {
             Profile::Opt => "opt",
             Profile::Debug => "debug",
             Profile::Doc => "doc",
-            Profile::Clippy => "clippy"
+            Profile::Clippy => "clippy",
         }
     }
 }

site/src/request_handlers/dashboard.rs

@@ -150,7 +150,7 @@ pub struct ByProfile<T> {
     pub debug: T,
     pub doc: T,
     pub opt: T,
-    pub clippy: T
+    pub clippy: T,
 }
 
 impl<T> ByProfile<T> {
@@ -177,7 +177,7 @@ impl<T> std::ops::Index<Profile> for ByProfile<T> {
             Profile::Debug => &self.debug,
             Profile::Doc => &self.doc,
             Profile::Opt => &self.opt,
-            Profile::Clippy => &self.clippy
+            Profile::Clippy => &self.clippy,
         }
     }
 }