Fix build errors from rebase, resolve some clippy warnings

Author: jessebraham

cargo-espflash/src/main.rs

@@ -168,9 +168,9 @@ fn flash(
         args.connect_args.use_stub = true;
     }
 
-    let mut flasher = connect(&args.connect_args, &config)?;
+    let mut flasher = connect(&args.connect_args, config)?;
 
-    let build_ctx = build(&args.build_args, &cargo_config, flasher.chip())
+    let build_ctx = build(&args.build_args, cargo_config, flasher.chip())
         .wrap_err("Failed to build project")?;
 
     // Print the board information once the project has successfully built. We do
@@ -225,7 +225,7 @@ fn flash(
             flasher.into_serial(),
             Some(&elf_data),
             pid,
-            opts.connect_opts.monitor_speed.unwrap_or(115200),
+            args.connect_args.monitor_baud.unwrap_or(115_200),
         )
         .into_diagnostic()?;
     }
@@ -399,7 +399,7 @@ fn save_image(
     cargo_config: &CargoConfig,
     metadata: &CargoEspFlashMeta,
 ) -> Result<()> {
-    let build_ctx = build(&args.build_args, &cargo_config, args.save_image_args.chip)?;
+    let build_ctx = build(&args.build_args, cargo_config, args.save_image_args.chip)?;
     let elf_data = fs::read(build_ctx.artifact_path).into_diagnostic()?;
 
     let bootloader = args

espflash/src/bin/espflash.rs

@@ -162,7 +162,7 @@ fn flash(mut args: FlashArgs, config: &Config) -> Result<()> {
             flasher.into_serial(),
             Some(&elf_data),
             pid,
-            opts.connect_opts.monitor_speed.unwrap_or(115200),
+            args.connect_args.monitor_baud.unwrap_or(115_200),
         )
         .into_diagnostic()?;
     }

espflash/src/cli/mod.rs

@@ -172,7 +172,7 @@ pub fn serial_monitor(args: ConnectArgs, config: &Config) -> Result<()> {
         flasher.into_serial(),
         None,
         pid,
-        opts.monitor_speed.unwrap_or(115200),
+        args.monitor_baud.unwrap_or(115_200),
     )
     .into_diagnostic()?;
 

espflash/src/image_format/mod.rs

@@ -20,7 +20,6 @@ pub enum ImageFormatType {
     Esp8266,
     IdfBoot,
     DirectBoot,
-    McuBoot,
 }
 
 impl FromStr for ImageFormatType {
@@ -33,7 +32,6 @@ impl FromStr for ImageFormatType {
             "esp8266" => Ok(Esp8266),
             "idf-boot" => Ok(IdfBoot),
             "direct-boot" => Ok(DirectBoot),
-            "mcu-boot" => Ok(McuBoot),
             _ => Err(Error::UnknownImageFormat(s.to_string())),
         }
     }