Format native builder and satisfy clippy

1 files changed, 26 insertions, 8 deletions

diff --git a/src/build.rs b/src/build.rs
index 1fd7720..7fd3989 100644
--- a/src/build.rs
+++ b/src/build.rs
@@ -1,13 +1,13 @@
 use std::path::{Path, PathBuf};
 
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 
+use crate::BuildPlan;
 use crate::archive::NativeTarWriter;
 use crate::initramfs::{InitramfsBuilder, InitramfsRequest, InitramfsResult};
 use crate::manifest::{ArtifactManifest, InitrdRecord};
 use crate::package_installer::PackageInstaller;
 use crate::rootfs::{InitrdOem, RootfsFinalization};
-use crate::BuildPlan;
 
 /// Executes the native stages after a plan has been validated.
 ///
@@ -22,7 +22,11 @@ pub struct BuildExecutor<I, B> {
 
 impl<I, B> BuildExecutor<I, B> {
     pub fn new(installer: I, initramfs_builder: B) -> Self {
-        Self { installer, initramfs_builder, tar_writer: NativeTarWriter::new() }
+        Self {
+            installer,
+            initramfs_builder,
+            tar_writer: NativeTarWriter::new(),
+        }
     }
 }
 
@@ -36,20 +40,31 @@ impl<I: PackageInstaller, B: InitramfsBuilder> BuildExecutor<I, B> {
     ) -> Result<BuildResult> {
         let workspace = workspace.as_ref();
         if workspace.exists() {
-            bail!("workspace already exists; refusing to reuse it: {}", workspace.display());
+            bail!(
+                "workspace already exists; refusing to reuse it: {}",
+                workspace.display()
+            );
         }
         let artifact = artifact.as_ref();
         if artifact.exists() {
-            bail!("output artifact already exists; refusing to overwrite it: {}", artifact.display());
+            bail!(
+                "output artifact already exists; refusing to overwrite it: {}",
+                artifact.display()
+            );
         }
         let manifest = ArtifactManifest::path_beside(artifact)?;
         if manifest.exists() {
-            bail!("output manifest already exists; refusing to overwrite it: {}", manifest.display());
+            bail!(
+                "output manifest already exists; refusing to overwrite it: {}",
+                manifest.display()
+            );
         }
         let parent = artifact
             .parent()
             .filter(|parent| !parent.as_os_str().is_empty())
-            .ok_or_else(|| anyhow::anyhow!("artifact path has no parent: {}", artifact.display()))?;
+            .ok_or_else(|| {
+                anyhow::anyhow!("artifact path has no parent: {}", artifact.display())
+            })?;
         if parent.exists() && !parent.is_dir() {
             bail!("artifact parent is not a directory: {}", parent.display());
         }
@@ -67,7 +82,10 @@ impl<I: PackageInstaller, B: InitramfsBuilder> BuildExecutor<I, B> {
         if !rootfs.is_dir() {
             return Self::fail_and_remove_workspace(
                 workspace,
-                anyhow::anyhow!("package installer did not create rootfs: {}", rootfs.display()),
+                anyhow::anyhow!(
+                    "package installer did not create rootfs: {}",
+                    rootfs.display()
+                ),
             );
         }
         if let Err(error) = RootfsFinalization::new(