feat: migrate to latest clap (#24)

migrate to latest clap

Author: Mydayyy

Cargo.lock

@@ -21,7 +21,7 @@ name = "pbcli"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = { version = "3.0.0-rc.1", features = ["derive"] }
+clap = { version = "4.5.29", features = ["derive"] }
 reqwest = { version = "0.12", features = ["blocking", "json"] }
 serde = { version = "1.0.130", features = ["derive"] }
 serde_json = "1.0.69"

Cargo.toml

@@ -10,28 +10,28 @@ Project home page: https://github.com/Mydayyy/pbcli";
 
 #[derive(Debug, Parser, Clone)]
 #[cfg_attr(feature = "uniffi", derive(uniffi::Record))]
-#[clap(setting = clap::AppSettings::AllArgsOverrideSelf, version = env ! ("CARGO_PKG_VERSION"), author = "Mydayyy <dev@mydayyy.eu>", about = ABOUT
-)]
-#[clap(term_width(if let Some((terminal_size::Width(w), _)) = terminal_size::terminal_size() { w as usize } else { 120 }
-))]
+#[clap( version = env ! ("CARGO_PKG_VERSION"), author = "Mydayyy <dev@mydayyy.eu>", about = ABOUT)]
+#[clap(term_width(if let Some((terminal_size::Width(w), _)) = terminal_size::terminal_size() { w as usize } else { 120 }))]
 #[clap(rename_all = "kebab-case")]
+#[command(args_override_self = true)]
 pub struct Opts {
-    #[clap(required_unless_present("host"), parse(try_from_str))]
+    #[clap(required_unless_present("host"))]
     pub url: Option<Url>,
 
     #[cfg_attr(feature = "uniffi", uniffi(default = None))]
-    #[clap(long, parse(try_from_str))]
+    #[clap(long)]
     pub host: Option<Url>,
 
-    #[clap(long, arg_enum, default_value = "plaintext")]
+    #[clap(long, value_enum, default_value = "plaintext")]
     pub format: PasteFormat,
 
     #[cfg_attr(feature = "uniffi", uniffi(default = "1week"))]
     #[clap(long, default_value = "1week")]
     pub expire: String,
 
     #[cfg_attr(feature = "uniffi", uniffi(default = None))]
-    #[clap(long, parse(try_from_str = parse_size))]
+    #[clap(long)]
+    #[arg(value_parser = |x: &str| parse_size(x))] // closure: https://github.com/clap-rs/clap/issues/4939
     #[clap(help(
         "Prompt if the paste exceeds the given size. Fail in non-interactive environments."
     ))]
@@ -63,23 +63,23 @@ pub struct Opts {
     pub comment_to: Option<String>,
 
     #[cfg_attr(feature = "uniffi", uniffi(default = None))]
-    #[clap(long, parse(from_os_str), value_name = "FILE")]
+    #[clap(long, value_name = "FILE")]
     pub download: Option<std::path::PathBuf>,
     #[cfg_attr(feature = "uniffi", uniffi(default = false))]
     #[clap(long)]
     #[clap(help("overwrite the file given with --download if it already exists"))]
     pub overwrite: bool,
 
     #[cfg_attr(feature = "uniffi", uniffi(default = None))]
-    #[clap(long, parse(from_os_str), value_name = "FILE")]
+    #[clap(long, value_name = "FILE")]
     pub upload: Option<std::path::PathBuf>,
 
     #[cfg_attr(feature = "uniffi", uniffi(default = None))]
     #[clap(long)]
     pub password: Option<String>,
 
     #[cfg_attr(feature = "uniffi", uniffi(default = None))]
-    #[clap(long, requires_all(& ["oidc-client-id", "oidc-username", "oidc-password"]))]
+    #[clap(long, requires_all(& ["oidc_client_id", "oidc_username", "oidc_password"]))]
     #[clap(help("oidc token endpoint from which to obtain an access token"))]
     pub oidc_token_url: Option<String>,
 

src/opts.rs

@@ -20,7 +20,7 @@ pub enum CompressionType {
     Zlib,
 }
 
-#[derive(Default, clap::ArgEnum, Deserialize, Debug, Serialize, Clone, Copy)]
+#[derive(Default, clap::ValueEnum, Deserialize, Debug, Serialize, Clone, Copy)]
 #[cfg_attr(feature = "uniffi", derive(uniffi::Enum))]
 pub enum PasteFormat {
     #[default]