Run cargo fmt

Author: phil-opp

src/args/runner.rs

@@ -52,9 +52,8 @@ impl RunnerCommand {
         }
 
         Ok(Self::Runner(RunnerArgs {
-            executable: executable.ok_or_else(|| anyhow!(
-                "excepted path to kernel executable as first argument"
-            ))?,
+            executable: executable
+                .ok_or_else(|| anyhow!("excepted path to kernel executable as first argument"))?,
             quiet,
             runner_args,
         }))

src/bin/cargo-bootimage.rs

@@ -31,12 +31,13 @@ pub fn main() -> Result<()> {
     match BuildCommand::parse_args(raw_args)? {
         BuildCommand::Build(args) => build(args),
         BuildCommand::Version => {
-            help::print_version(); Ok(())
-        },
+            help::print_version();
+            Ok(())
+        }
         BuildCommand::Help => {
             help::print_cargo_bootimage_help();
             Ok(())
-        },
+        }
     }
 }
 

src/builder/bootloader.rs

@@ -25,13 +25,9 @@ impl BuildConfig {
     ) -> Result<Self, BootloaderError> {
         let kernel_pkg = kernel_package(project_metadata, kernel_bin_name)?;
         let bootloader_pkg = bootloader_package(project_metadata, kernel_pkg)?;
-        let bootloader_root =
-            bootloader_pkg
-                .manifest_path
-                .parent()
-                .ok_or_else(|| BootloaderError::BootloaderInvalid(
-                    "bootloader manifest has no target directory".into(),
-                ))?;
+        let bootloader_root = bootloader_pkg.manifest_path.parent().ok_or_else(|| {
+            BootloaderError::BootloaderInvalid("bootloader manifest has no target directory".into())
+        })?;
 
         let cargo_toml_content = fs::read_to_string(&bootloader_pkg.manifest_path)
             .map_err(|err| format!("bootloader has no valid Cargo.toml: {}", err))
@@ -44,14 +40,13 @@ impl BuildConfig {
         let target = metadata
             .and_then(|t| t.get("bootloader"))
             .and_then(|t| t.get("target"));
-        let target_str =
-            target
-                .and_then(|v| v.as_str())
-                .ok_or_else(|| BootloaderError::BootloaderInvalid(
+        let target_str = target.and_then(|v| v.as_str()).ok_or_else(|| {
+            BootloaderError::BootloaderInvalid(
                 "No `package.metadata.bootloader.target` key found in Cargo.toml of bootloader\n\n\
                  (If you're using the official bootloader crate, you need at least version 0.5.1)"
                     .into(),
-            ))?;
+            )
+        })?;
 
         let binary_feature = cargo_toml
             .get("features")

src/builder/mod.rs

@@ -168,13 +168,14 @@ impl Builder {
                 {
                     return Err(BootloaderError::BootloaderInvalid(
                         "bootloader has multiple executables".into(),
-                    ).into());
+                    )
+                    .into());
                 }
             }
         }
-        let bootloader_elf_path = bootloader_elf_path.ok_or_else(|| BootloaderError::BootloaderInvalid(
-            "bootloader has no executable".into(),
-        ))?;
+        let bootloader_elf_path = bootloader_elf_path.ok_or_else(|| {
+            BootloaderError::BootloaderInvalid("bootloader has no executable".into())
+        })?;
 
         disk_image::create_disk_image(&bootloader_elf_path, output_bin_path)?;
 

src/config.rs

@@ -105,12 +105,14 @@ fn read_config_inner(manifest_path: &Path) -> Result<Config> {
                 }
                 config.test_args = Some(args);
             }
-            (key, value) => return Err(anyhow!(
-                "unexpected `package.metadata.bootimage` \
+            (key, value) => {
+                return Err(anyhow!(
+                    "unexpected `package.metadata.bootimage` \
                  key `{}` with value `{}`",
-                key,
-                value
-            )),
+                    key,
+                    value
+                ))
+            }
         }
     }
     Ok(config.into())
@@ -128,11 +130,13 @@ struct ConfigBuilder {
 impl Into<Config> for ConfigBuilder {
     fn into(self) -> Config {
         Config {
-            run_command: self.run_command.unwrap_or_else(|| vec![
-                "qemu-system-x86_64".into(),
-                "-drive".into(),
-                "format=raw,file={}".into(),
-            ]),
+            run_command: self.run_command.unwrap_or_else(|| {
+                vec![
+                    "qemu-system-x86_64".into(),
+                    "-drive".into(),
+                    "format=raw,file={}".into(),
+                ]
+            }),
             run_args: self.run_args,
             test_args: self.test_args,
             test_timeout: self.test_timeout.unwrap_or(60 * 5),

src/main.rs

@@ -68,9 +68,7 @@ pub(crate) fn runner(args: RunnerArgs) -> Result<i32> {
         .file_name()
         .ok_or_else(|| anyhow!("kernel executable's parent has no file name"))?
         .to_str()
-        .ok_or_else(|| anyhow!(
-            "kernel executable's parent file name is not valid UTF-8"
-        ))?
+        .ok_or_else(|| anyhow!("kernel executable's parent file name is not valid UTF-8"))?
         .starts_with("rustdoctest");
     let is_test = is_doctest || exe_parent.ends_with("deps");