From 90cbfaff5570680851e835e6481a6f45effd29b4 Mon Sep 17 00:00:00 2001
From: Lann Martin <lann.martin@fermyon.com>
Date: Thu, 27 Apr 2023 08:33:00 -0400
Subject: [PATCH] fix: Upgrade clap and suppress clippy error

Clap generated code was broken by a new clippy warning in Rust 1.69.
This was partially fixed in clap 3.2.24 along with a clippy exception.

Signed-off-by: Lann Martin <lann.martin@fermyon.com>
---
 Cargo.lock              | 18 +++++++++---------
 Cargo.toml              |  2 +-
 src/commands/plugins.rs |  3 +++
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c78abba42..3f7810c88 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -611,13 +611,13 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "3.2.23"
+version = "3.2.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5"
+checksum = "eef2b3ded6a26dfaec672a742c93c8cf6b689220324da509ec5caa20de55dc83"
 dependencies = [
  "atty",
  "bitflags 1.3.2",
- "clap_derive 3.2.18",
+ "clap_derive 3.2.24",
  "clap_lex 0.2.4",
  "indexmap",
  "once_cell",
@@ -643,9 +643,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "3.2.18"
+version = "3.2.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65"
+checksum = "d756c5824fc5c0c1ee8e36000f576968dbcb2081def956c83fad6f40acd46f96"
 dependencies = [
  "heck 0.4.1",
  "proc-macro-error",
@@ -2237,7 +2237,7 @@ source = "git+https://github.com/deislabs/hippo-cli?tag=v0.16.1#73315f55fadd2bb0
 dependencies = [
  "anyhow",
  "async-trait",
- "clap 3.2.23",
+ "clap 3.2.24",
  "colored",
  "dialoguer 0.9.0",
  "dirs 4.0.0",
@@ -4899,7 +4899,7 @@ dependencies = [
  "bytes",
  "cargo-target-dep",
  "chrono",
- "clap 3.2.23",
+ "clap 3.2.24",
  "cloud",
  "cloud-openapi",
  "comfy-table",
@@ -5250,7 +5250,7 @@ version = "1.2.0-pre0"
 dependencies = [
  "anyhow",
  "async-trait",
- "clap 3.2.23",
+ "clap 3.2.24",
  "ctrlc",
  "dirs 4.0.0",
  "futures",
@@ -5284,7 +5284,7 @@ version = "1.2.0-pre0"
 dependencies = [
  "anyhow",
  "async-trait",
- "clap 3.2.23",
+ "clap 3.2.24",
  "criterion",
  "futures",
  "futures-util",
diff --git a/Cargo.toml b/Cargo.toml
index 9161e0703..1aa025666 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,7 +17,7 @@ async-trait = "0.1"
 bindle = { workspace = true }
 bytes = "1.1"
 chrono = "0.4"
-clap = { version = "3.1.15", features = ["derive", "env"] }
+clap = { version = "3.2.24", features = ["derive", "env"] }
 cloud = { path = "crates/cloud" }
 cloud-openapi = { git = "https://github.com/fermyon/cloud-openapi" }
 comfy-table = "5.0"
diff --git a/src/commands/plugins.rs b/src/commands/plugins.rs
index f75c6b6d0..b3b120afa 100644
--- a/src/commands/plugins.rs
+++ b/src/commands/plugins.rs
@@ -1,3 +1,6 @@
+// Needed for clap derive: https://github.com/clap-rs/clap/issues/4857
+#![allow(clippy::almost_swapped)]
+
 use anyhow::{anyhow, Context, Result};
 use clap::{Parser, Subcommand};
 use semver::Version;