From 4fb92a7d2dfe6836e4577ccbfb94b389d449db0b Mon Sep 17 00:00:00 2001
From: Jesse Braham <jesse@beta7.io>
Date: Thu, 9 Dec 2021 07:39:47 -0800
Subject: [PATCH 1/2] Update clap dependency and address the breaking changes

---
 cargo-espflash/Cargo.toml  |  3 ++-
 cargo-espflash/src/main.rs | 26 +++++++++++++++-----------
 espflash/Cargo.toml        |  3 ++-
 espflash/src/cli/clap.rs   |  2 +-
 espflash/src/main.rs       | 15 ++++++++-------
 5 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/cargo-espflash/Cargo.toml b/cargo-espflash/Cargo.toml
index fee76801..2646260b 100644
--- a/cargo-espflash/Cargo.toml
+++ b/cargo-espflash/Cargo.toml
@@ -27,7 +27,8 @@ categories = [
 [dependencies]
 cargo_metadata = "0.14"
 cargo_toml = "0.10"
-clap = "3.0.0-beta.5"
+clap = "3.0.0-rc.1"
+clap_derive = "3.0.0-rc.1"
 crossterm = "0.22"
 espflash = { version = "1", path = "../espflash" }
 miette = { version = "3", features = ["fancy"] }
diff --git a/cargo-espflash/src/main.rs b/cargo-espflash/src/main.rs
index 7b2a8735..9c9c2ca5 100644
--- a/cargo-espflash/src/main.rs
+++ b/cargo-espflash/src/main.rs
@@ -1,21 +1,25 @@
-use crate::cargo_config::CargoConfig;
-use crate::error::NoTargetError;
-use crate::{cargo_config::parse_cargo_config, error::UnsupportedTargetError};
+use std::{
+    fs,
+    path::PathBuf,
+    process::{exit, Command, ExitStatus, Stdio},
+    str::FromStr,
+};
+
 use cargo_metadata::Message;
-use clap::{AppSettings, Parser};
-use error::Error;
+use clap::{AppSettings, Parser as _};
+use clap_derive::Parser;
 use espflash::{
     cli::{clap::*, connect, monitor::monitor},
     Chip, Config, FirmwareImage, ImageFormatId, PartitionTable,
 };
 use miette::{IntoDiagnostic, Result, WrapErr};
-use package_metadata::CargoEspFlashMeta;
-use std::{
-    fs,
-    path::PathBuf,
-    process::{exit, Command, ExitStatus, Stdio},
-    str::FromStr,
+
+use crate::{
+    cargo_config::{parse_cargo_config, CargoConfig},
+    error::{Error, NoTargetError, UnsupportedTargetError},
+    package_metadata::CargoEspFlashMeta,
 };
+
 mod cargo_config;
 mod error;
 mod package_metadata;
diff --git a/espflash/Cargo.toml b/espflash/Cargo.toml
index adb88c97..96f49e16 100644
--- a/espflash/Cargo.toml
+++ b/espflash/Cargo.toml
@@ -20,7 +20,8 @@ binread = "2"
 bytemuck = { version = "1", features = ["derive"] }
 indicatif = "0.16"
 md5 = "0.7"
-clap = "3.0.0-beta.5"
+clap = "3.0.0-rc.1"
+clap_derive = "3.0.0-rc.1"
 serialport = "4"
 sha2 = "0.9"
 slip-codec = "0.3"
diff --git a/espflash/src/cli/clap.rs b/espflash/src/cli/clap.rs
index 3d503217..070ded4c 100644
--- a/espflash/src/cli/clap.rs
+++ b/espflash/src/cli/clap.rs
@@ -1,4 +1,4 @@
-use clap::Parser;
+use clap_derive::Parser;
 
 #[derive(Parser)]
 pub struct ConnectArgs {
diff --git a/espflash/src/main.rs b/espflash/src/main.rs
index 1ea139e3..04021d5b 100644
--- a/espflash/src/main.rs
+++ b/espflash/src/main.rs
@@ -1,16 +1,17 @@
-use clap::{AppSettings, IntoApp, Parser};
-use espflash::cli::monitor::monitor;
-use espflash::{
-    cli::{clap::*, connect},
-    Chip, Config, Error, FirmwareImage, ImageFormatId, PartitionTable,
-};
-use miette::{IntoDiagnostic, Result, WrapErr};
 use std::{
     fs::{self, read, read_to_string},
     mem::swap,
     str::FromStr,
 };
 
+use clap::{AppSettings, IntoApp, Parser as _};
+use clap_derive::Parser;
+use espflash::{
+    cli::{clap::*, connect, monitor::monitor},
+    Chip, Config, Error, FirmwareImage, ImageFormatId, PartitionTable,
+};
+use miette::{IntoDiagnostic, Result, WrapErr};
+
 #[derive(Parser)]
 #[clap(global_setting = AppSettings::PropagateVersion)]
 #[clap(version = env!("CARGO_PKG_VERSION"))]

From 0ab740d8fe4f5ebf5186c58b4d0cc34543cd1845 Mon Sep 17 00:00:00 2001
From: Robin Appelman <robin@icewind.nl>
Date: Sat, 11 Dec 2021 15:46:45 +0100
Subject: [PATCH 2/2] use 'derive' feature for clap instead of depending
 directly on clap_derive

---
 espflash/Cargo.toml      | 3 +--
 espflash/src/cli/clap.rs | 2 +-
 espflash/src/main.rs     | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/espflash/Cargo.toml b/espflash/Cargo.toml
index 96f49e16..c8670647 100644
--- a/espflash/Cargo.toml
+++ b/espflash/Cargo.toml
@@ -20,8 +20,7 @@ binread = "2"
 bytemuck = { version = "1", features = ["derive"] }
 indicatif = "0.16"
 md5 = "0.7"
-clap = "3.0.0-rc.1"
-clap_derive = "3.0.0-rc.1"
+clap = { version = "3.0.0-rc.1", features = ["derive"] }
 serialport = "4"
 sha2 = "0.9"
 slip-codec = "0.3"
diff --git a/espflash/src/cli/clap.rs b/espflash/src/cli/clap.rs
index 070ded4c..3d503217 100644
--- a/espflash/src/cli/clap.rs
+++ b/espflash/src/cli/clap.rs
@@ -1,4 +1,4 @@
-use clap_derive::Parser;
+use clap::Parser;
 
 #[derive(Parser)]
 pub struct ConnectArgs {
diff --git a/espflash/src/main.rs b/espflash/src/main.rs
index 04021d5b..c32618d8 100644
--- a/espflash/src/main.rs
+++ b/espflash/src/main.rs
@@ -4,8 +4,7 @@ use std::{
     str::FromStr,
 };
 
-use clap::{AppSettings, IntoApp, Parser as _};
-use clap_derive::Parser;
+use clap::{AppSettings, IntoApp, Parser};
 use espflash::{
     cli::{clap::*, connect, monitor::monitor},
     Chip, Config, Error, FirmwareImage, ImageFormatId, PartitionTable,