From 38136cdbca98ddf13f7001dfd187dfce5939f261 Mon Sep 17 00:00:00 2001
From: Eric Swanson <eric.swanson@dfinity.org>
Date: Mon, 23 Aug 2021 16:03:12 -0700
Subject: [PATCH] chore: Pin clap to 3.0.0-beta.2

Avoids errors like this:

error[E0658]: arbitrary expressions in key-value attributes are unstable
 --> /Users/ericswanson/.cargo/registry/src/github.com-1ecc6299db9ec823/clap-3.0.0-beta.4/src/lib.rs:8:10
  |
8 | #![doc = include_str!("../README.md")]
  |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  |
  = note: see issue #78835 <https://github.com/rust-lang/rust/issues/78835> for more information

   Compiling binread v2.1.1
   Compiling logos v0.12.0
error[E0658]: use of unstable library feature 'osstring_ascii'
   --> /Users/ericswanson/.cargo/registry/src/github.com-1ecc6299db9ec823/clap-3.0.0-beta.4/src/parse/matches/matched_arg.rs:130:19
    |
130 |                 v.eq_ignore_ascii_case(val)
    |                   ^^^^^^^^^^^^^^^^^^^^
    |
    = note: see issue #70516 <https://github.com/rust-lang/rust/issues/70516> for more information
---
 Cargo.lock             | 5 +++++
 icx-asset/Cargo.toml   | 3 ++-
 icx-cert/Cargo.toml    | 3 ++-
 icx-proxy/Cargo.toml   | 3 ++-
 icx/Cargo.toml         | 3 ++-
 zzz-release/Cargo.toml | 3 ++-
 6 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6abbec9c..9db20c16 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -960,6 +960,7 @@ dependencies = [
  "anyhow",
  "candid",
  "clap",
+ "clap_derive",
  "garcon",
  "hex",
  "humantime",
@@ -981,6 +982,7 @@ dependencies = [
  "candid",
  "chrono",
  "clap",
+ "clap_derive",
  "delay",
  "garcon",
  "humantime",
@@ -1007,6 +1009,7 @@ dependencies = [
  "base64",
  "chrono",
  "clap",
+ "clap_derive",
  "hex",
  "ic-agent",
  "leb128",
@@ -1023,6 +1026,7 @@ version = "0.6.0"
 dependencies = [
  "anyhow",
  "clap",
+ "clap_derive",
  "garcon",
  "hex",
  "hyper",
@@ -2801,6 +2805,7 @@ dependencies = [
  "anyhow",
  "cargo_metadata",
  "clap",
+ "clap_derive",
  "git2",
  "toml-parse",
 ]
diff --git a/icx-asset/Cargo.toml b/icx-asset/Cargo.toml
index 23b55f4f..0cd35998 100644
--- a/icx-asset/Cargo.toml
+++ b/icx-asset/Cargo.toml
@@ -18,7 +18,8 @@ include = ["src", "Cargo.toml", "../LICENSE", "README.md"]
 anyhow = "1.0.34"
 candid = "0.7.4"
 chrono = "0.4.19"
-clap = "3.0.0-beta.2"
+clap = "=3.0.0-beta.2"
+clap_derive = "=3.0.0-beta.2"
 delay = "0.3.1"
 garcon = "0.2.2"
 humantime = "2.0.1"
diff --git a/icx-cert/Cargo.toml b/icx-cert/Cargo.toml
index 1e60a299..037a3962 100644
--- a/icx-cert/Cargo.toml
+++ b/icx-cert/Cargo.toml
@@ -17,7 +17,8 @@ include = ["src", "Cargo.toml", "../LICENSE", "README.md"]
 [dependencies]
 anyhow = "1.0"
 base64 = "0.13"
-clap = "3.0.0-beta.2"
+clap = "=3.0.0-beta.2"
+clap_derive = "=3.0.0-beta.2"
 chrono = "0.4.19"
 hex = "0.4.2"
 ic-agent = { path = "../ic-agent", version = "0.8" }
diff --git a/icx-proxy/Cargo.toml b/icx-proxy/Cargo.toml
index 7793188d..cb3ab2e7 100644
--- a/icx-proxy/Cargo.toml
+++ b/icx-proxy/Cargo.toml
@@ -18,7 +18,8 @@ path = "src/main.rs"
 
 [dependencies]
 anyhow = "1.0.34"
-clap = "3.0.0-beta.2"
+clap = "=3.0.0-beta.2"
+clap_derive = "=3.0.0-beta.2"
 garcon = { version = "0.2.3", features = ["async"] }
 hex = "0.4.3"
 hyper = { version = "0.14.11", features = ["full"] }
diff --git a/icx/Cargo.toml b/icx/Cargo.toml
index 355fac6d..ea27ec44 100644
--- a/icx/Cargo.toml
+++ b/icx/Cargo.toml
@@ -19,7 +19,8 @@ path = "src/main.rs"
 [dependencies]
 anyhow = { version = "1.0", features = ["backtrace"] }
 candid = "0.7.4"
-clap = "3.0.0-beta.1"
+clap = "=3.0.0-beta.2"
+clap_derive = "=3.0.0-beta.2"
 garcon = { version = "0.2.3", features = ["async"] }
 hex = "0.4.2"
 humantime = "2.0.1"
diff --git a/zzz-release/Cargo.toml b/zzz-release/Cargo.toml
index 9d49a437..432760b2 100644
--- a/zzz-release/Cargo.toml
+++ b/zzz-release/Cargo.toml
@@ -8,6 +8,7 @@ edition = "2018"
 [dependencies]
 anyhow = "1.0.40"
 cargo_metadata = "0.14.0"
-clap = "3.0.0-beta.2"
+clap = "=3.0.0-beta.2"
+clap_derive = "=3.0.0-beta.2"
 git2 = "0.13.20"
 toml-parse = "0.2.11"