From 6cfd3bb51190963752e9b7c25f8c4a65f58aa580 Mon Sep 17 00:00:00 2001
From: Andrew Jones <ascjones@gmail.com>
Date: Mon, 3 Oct 2022 18:40:06 +0100
Subject: [PATCH] Upgrade clap to v4 (#678)

---
 cli/Cargo.toml                    | 2 +-
 cli/src/commands/codegen.rs       | 4 ++--
 cli/src/commands/compatibility.rs | 4 ++--
 cli/src/commands/metadata.rs      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 8ce09cffb75d5..f0409edd14027 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -20,7 +20,7 @@ subxt-codegen = { version = "0.24.0", path = "../codegen" }
 # perform node compatibility
 subxt-metadata = { version = "0.24.0", path = "../metadata" }
 # parse command line args
-clap = { version = "3.2.22", features = ["derive"] }
+clap = { version = "4.0.8", features = ["derive"] }
 # colourful error reports
 color-eyre = "0.6.1"
 # serialize the metadata
diff --git a/cli/src/commands/codegen.rs b/cli/src/commands/codegen.rs
index b252e48aaaf21..6a3366defc2b6 100644
--- a/cli/src/commands/codegen.rs
+++ b/cli/src/commands/codegen.rs
@@ -25,10 +25,10 @@ use subxt_codegen::DerivesRegistry;
 #[derive(Debug, ClapParser)]
 pub struct Opts {
     /// The url of the substrate node to query for metadata for codegen.
-    #[clap(name = "url", long, parse(try_from_str))]
+    #[clap(name = "url", long, value_parser)]
     url: Option<Uri>,
     /// The path to the encoded metadata file.
-    #[clap(short, long, parse(from_os_str))]
+    #[clap(short, long, value_parser)]
     file: Option<PathBuf>,
     /// Additional derives
     #[clap(long = "derive")]
diff --git a/cli/src/commands/compatibility.rs b/cli/src/commands/compatibility.rs
index 8a600b8b9fe9b..fcf73c5ef2bdd 100644
--- a/cli/src/commands/compatibility.rs
+++ b/cli/src/commands/compatibility.rs
@@ -29,13 +29,13 @@ use subxt_metadata::{
 #[derive(Debug, ClapParser)]
 pub struct Opts {
     /// Urls of the substrate nodes to verify for metadata compatibility.
-    #[clap(name = "nodes", long, use_delimiter = true, parse(try_from_str))]
+    #[clap(name = "nodes", long, use_value_delimiter = true, value_parser)]
     nodes: Vec<Uri>,
     /// Check the compatibility of metadata for a particular pallet.
     ///
     /// ### Note
     /// The validation will omit the full metadata check and focus instead on the pallet.
-    #[clap(long, parse(try_from_str))]
+    #[clap(long, value_parser)]
     pallet: Option<String>,
 }
 
diff --git a/cli/src/commands/metadata.rs b/cli/src/commands/metadata.rs
index 0a2845a02d080..a2f9890bc39c8 100644
--- a/cli/src/commands/metadata.rs
+++ b/cli/src/commands/metadata.rs
@@ -31,7 +31,7 @@ pub struct Opts {
     #[clap(
         name = "url",
         long,
-        parse(try_from_str),
+        value_parser,
         default_value = "http://localhost:9933"
     )]
     url: Uri,