Run cargo clippy --fix

Author: phil-opp

src/args/build.rs

@@ -32,7 +32,7 @@ impl BuildCommand {
                 Ok(())
             };
 
-            let mut arg_iter = args.into_iter();
+            let mut arg_iter = args;
             while let Some(arg) = arg_iter.next() {
                 match arg.as_ref() {
                     "--help" | "-h" => {

src/args/runner.rs

@@ -21,12 +21,12 @@ impl RunnerCommand {
         let mut quiet = false;
         let mut runner_args = None;
 
-        let mut arg_iter = args.into_iter().fuse();
+        let mut arg_iter = args.fuse();
 
         loop {
             if executable.is_some() {
                 let args: Vec<_> = arg_iter.collect();
-                if args.len() > 0 {
+                if !args.is_empty() {
                     runner_args = Some(args);
                 }
                 break;

src/bin/cargo-bootimage.rs

@@ -40,7 +40,7 @@ fn build(args: BuildArgs) -> Result<()> {
     let quiet = args.quiet();
 
     let executables = builder.build_kernel(&args.cargo_args(), quiet)?;
-    if executables.len() == 0 {
+    if executables.is_empty() {
         return Err(anyhow!("no executables built"));
     }
 

src/builder/mod.rs

@@ -166,9 +166,9 @@ impl Builder {
                     .replace(PathBuf::from(executable))
                     .is_some()
                 {
-                    Err(BootloaderError::BootloaderInvalid(
+                    return Err(BootloaderError::BootloaderInvalid(
                         "bootloader has multiple executables".into(),
-                    ))?;
+                    ).into());
                 }
             }
         }

src/config.rs

@@ -67,7 +67,7 @@ fn read_config_inner(manifest_path: &Path) -> Result<Config> {
     for (key, value) in metadata {
         match (key.as_str(), value.clone()) {
             ("test-timeout", Value::Integer(timeout)) if timeout.is_negative() => {
-                Err(anyhow!("test-timeout must not be negative"))?
+                return Err(anyhow!("test-timeout must not be negative"))
             }
             ("test-timeout", Value::Integer(timeout)) => {
                 config.test_timeout = Some(timeout as u32);
@@ -80,7 +80,7 @@ fn read_config_inner(manifest_path: &Path) -> Result<Config> {
                 for value in array {
                     match value {
                         Value::String(s) => command.push(s),
-                        _ => Err(anyhow!("run-command must be a list of strings"))?,
+                        _ => return Err(anyhow!("run-command must be a list of strings")),
                     }
                 }
                 config.run_command = Some(command);
@@ -90,7 +90,7 @@ fn read_config_inner(manifest_path: &Path) -> Result<Config> {
                 for value in array {
                     match value {
                         Value::String(s) => args.push(s),
-                        _ => Err(anyhow!("run-args must be a list of strings"))?,
+                        _ => return Err(anyhow!("run-args must be a list of strings")),
                     }
                 }
                 config.run_args = Some(args);
@@ -100,17 +100,17 @@ fn read_config_inner(manifest_path: &Path) -> Result<Config> {
                 for value in array {
                     match value {
                         Value::String(s) => args.push(s),
-                        _ => Err(anyhow!("test-args must be a list of strings"))?,
+                        _ => return Err(anyhow!("test-args must be a list of strings")),
                     }
                 }
                 config.test_args = Some(args);
             }
-            (key, value) => Err(anyhow!(
+            (key, value) => return Err(anyhow!(
                 "unexpected `package.metadata.bootimage` \
                  key `{}` with value `{}`",
                 key,
                 value
-            ))?,
+            )),
         }
     }
     Ok(config.into())

src/main.rs

@@ -104,10 +104,8 @@ pub(crate) fn runner(args: RunnerArgs) -> Result<i32> {
         if let Some(args) = config.test_args {
             run_command.extend(args);
         }
-    } else {
-        if let Some(args) = config.run_args {
-            run_command.extend(args);
-        }
+    } else if let Some(args) = config.run_args {
+        run_command.extend(args);
     }
     if let Some(args) = args.runner_args {
         run_command.extend(args);