Remove the cli::clap module altogether

Author: jessebraham

cargo-espflash/src/main.rs

@@ -9,11 +9,8 @@ use cargo_metadata::Message;
 use clap::{AppSettings, Parser};
 use espflash::{
     cli::{
-        board_info,
-        clap::{ConnectOpts, FlashOpts},
-        connect, flash_elf_image,
-        monitor::monitor,
-        save_elf_as_image,
+        board_info, connect, flash_elf_image, monitor::monitor, save_elf_as_image, ConnectOpts,
+        FlashOpts,
     },
     Chip, Config, ImageFormatId,
 };
@@ -60,7 +57,6 @@ pub enum SubCommand {
     SaveImage(SaveImageOpts),
 }
 
-/// Build the specified project/package using the provided options
 #[derive(Parser)]
 pub struct BuildOpts {
     /// Build the application using the release profile

espflash/src/cli/clap.rs

@@ -7,23 +7,47 @@ use std::{
     path::{Path, PathBuf},
 };
 
+use clap::Parser;
 use config::Config;
 use miette::{IntoDiagnostic, Result, WrapErr};
 use serialport::{FlowControl, SerialPortType};
 
-use self::clap::ConnectOpts;
 use crate::{
     cli::serial::get_serial_port_info, error::Error, Chip, FirmwareImage, Flasher, ImageFormatId,
     PartitionTable,
 };
 
-pub mod clap;
 pub mod config;
 pub mod monitor;
 
 mod line_endings;
 mod serial;
 
+#[derive(Parser)]
+pub struct ConnectOpts {
+    /// Serial port connected to target device
+    pub serial: Option<String>,
+    /// Baud rate at which to flash target device
+    #[clap(long)]
+    pub speed: Option<u32>,
+}
+
+#[derive(Parser)]
+pub struct FlashOpts {
+    /// Load the application to RAM instead of Flash
+    #[clap(long)]
+    pub ram: bool,
+    /// Path to a binary (.bin) bootloader file
+    #[clap(long)]
+    pub bootloader: Option<PathBuf>,
+    /// Path to a CSV file containing partition table
+    #[clap(long)]
+    pub partition_table: Option<PathBuf>,
+    /// Open a serial monitor after flashing
+    #[clap(long)]
+    pub monitor: bool,
+}
+
 pub fn connect(opts: &ConnectOpts, config: &Config) -> Result<Flasher> {
     let port_info = get_serial_port_info(opts, config)?;
 

espflash/src/cli/mod.rs

@@ -3,7 +3,7 @@ use dialoguer::{theme::ColorfulTheme, Confirm, Select};
 use miette::{IntoDiagnostic, Result};
 use serialport::{available_ports, SerialPortInfo, SerialPortType};
 
-use super::{clap::ConnectOpts, config::Config};
+use super::{config::Config, ConnectOpts};
 use crate::{cli::config::UsbDevice, error::Error};
 
 pub fn get_serial_port_info(

espflash/src/cli/serial.rs

@@ -3,11 +3,8 @@ use std::{fs, mem::swap, path::PathBuf, str::FromStr};
 use clap::{AppSettings, IntoApp, Parser};
 use espflash::{
     cli::{
-        board_info,
-        clap::{ConnectOpts, FlashOpts},
-        connect, flash_elf_image,
-        monitor::monitor,
-        save_elf_as_image,
+        board_info, connect, flash_elf_image, monitor::monitor, save_elf_as_image, ConnectOpts,
+        FlashOpts,
     },
     Chip, Config, ImageFormatId,
 };