Drop structopt and use clap v4

hayatoito · hayatoito · commit 088059f2b196 · 2022-11-02T10:41:38.000+09:00
diff --git a/webbundle-bench/Cargo.toml b/webbundle-bench/Cargo.toml
@@ -11,7 +11,7 @@ version = "0.1.0"
 [dependencies]
 anyhow = "1.0.57"
 askama = "0.11.1"
+clap = { version = "4", features = ["derive"] }
 env_logger = "0.9.0"
 log = "0.4.17"
-structopt = "0.3.26"
 webbundle = { path = "../webbundle", version = "^0.3.2" }
diff --git a/webbundle-bench/src/main.rs b/webbundle-bench/src/main.rs
@@ -2,18 +2,18 @@ use std::path::{Path, PathBuf};
 
 use anyhow::Result;
 use askama::Template;
-use structopt::StructOpt;
+use clap::Parser;
 
-#[derive(StructOpt, Debug)]
+#[derive(Parser, Debug)]
 struct Cli {
     //github.com/ The output directory
-    #[structopt(short = "o", long = "out", default_value = "out")]
+    #[arg(short = 'o', long, default_value = "out")]
     out: String,
     //github.com/ The module tree depth
-    #[structopt(short = "d", long = "depth", default_value = "4")]
+    #[arg(short = 'd', long, default_value = "4")]
     depth: u32,
     //github.com/ The module tree width at each level
-    #[structopt(short = "b", long = "branches", default_value = "4")]
+    #[arg(short = 'b', long, default_value = "4")]
     branches: u32,
 }
 
@@ -243,7 +243,7 @@ struct IndexTemplate {
 
 fn main() -> Result<()> {
     env_logger::init();
-    let args = Cli::from_args();
+    let args = Cli::parse();
     let benchmark = Benchmark::new(&args);
     benchmark.build(&args)
 }
diff --git a/webbundle-cli/Cargo.toml b/webbundle-cli/Cargo.toml
@@ -9,7 +9,7 @@ repository = "https://github.com/google/webbundle"
 version = "0.3.2"
 
 [dependencies]
-structopt = "0.3.26"
+clap = { version = "4", features = ["derive"] }
 env_logger = "0.9.0"
 log = "0.4.17"
 chrono = "0.4.19"
diff --git a/webbundle-cli/src/main.rs b/webbundle-cli/src/main.rs
@@ -14,36 +14,32 @@
 
 use anyhow::{ensure, Context as _};
 use chrono::Local;
+use clap::Parser;
 use serde::Serialize;
 use std::fs::File;
 use std::io::{BufWriter, Read as _, Write as _};
 use std::path::{Component, Path, PathBuf};
-use structopt::clap::arg_enum;
-use structopt::StructOpt;
 use url::Url;
 use webbundle::{Bundle, Result, Version};
 
-#[derive(StructOpt)]
+#[derive(Parser)]
 struct Cli {
-    #[structopt(subcommand)]
+    #[clap(subcommand)]
     cmd: Command,
 }
 
-arg_enum! {
-    #[allow(non_camel_case_types)]
-    pub enum Format {
-        plain,
-        json,
-        debug,
-    }
+#[derive(Parser, Clone, clap::ValueEnum)]
+enum Format {
+    Plain,
+    Json,
+    Debug,
 }
 
-#[derive(StructOpt)]
+#[derive(Parser)]
 enum Command {
     //github.com/ Example: webbundle create example.wbn foo
-    #[structopt(name = "create")]
     Create {
-        #[structopt(short = "p", long = "primary-url")]
+        #[arg(short = 'p', long)]
         primary_url: Option<String>,
         //github.com/ File name
         file: String,
@@ -52,14 +48,12 @@ enum Command {
         // TODO: Support version
     },
     //github.com/ List the contents briefly
-    #[structopt(name = "list")]
     List {
         file: String,
-        #[structopt(long = "format", possible_values(&Format::variants()))]
+        #[arg(long, value_enum)]
         format: Option<Format>,
     },
     //github.com/ Extract the contents
-    #[structopt(name = "extract")]
     Extract { file: String },
 }
 
@@ -82,9 +76,9 @@ fn env_logger_init() {
 
 fn list(bundle: &Bundle, format: Option<Format>) {
     match format {
-        None | Some(Format::plain) => list_plain(bundle),
-        Some(Format::json) => list_json(bundle),
-        Some(Format::debug) => list_debug(bundle),
+        None | Some(Format::Plain) => list_plain(bundle),
+        Some(Format::Json) => list_json(bundle),
+        Some(Format::Debug) => list_debug(bundle),
     }
 }
 
@@ -270,7 +264,7 @@ fn extract(bundle: &Bundle) -> Result<()> {
 #[tokio::main]
 async fn main() -> Result<()> {
     env_logger_init();
-    let args = Cli::from_args();
+    let args = Cli::parse();
     match args.cmd {
         Command::Create {
             primary_url,
diff --git a/webbundle-server/Cargo.toml b/webbundle-server/Cargo.toml
@@ -12,11 +12,11 @@ version = "0.3.0"
 anyhow = "1.0.52"
 axum = "0.4.4"
 axum-extra = "0.1.1"
+clap = { version = "4", features = ["derive"] }
 headers = "0.3.5"
 http = "0.2.6"
 mime = "0.3.16"
 serde = { version = "1.0.133", features = ["derive"] }
-structopt = "0.3.26"
 tokio = { version = "1.15.0", features = ["macros"] }
 tracing = "0.1.29"
 tower-http = { version = "0.2.0", features = ["fs", "trace"] }
diff --git a/webbundle-server/src/main.rs b/webbundle-server/src/main.rs
@@ -5,22 +5,22 @@ use axum::{
     Router,
 };
 use axum_extra::middleware::{self, Next};
+use clap::Parser;
 use headers::{ContentLength, HeaderMapExt as _};
 use http::{header, HeaderValue, Request, Response, StatusCode};
 use std::fmt::Write as _;
-use structopt::StructOpt;
 use tower::ServiceBuilder;
 use tower_http::{services::ServeDir, trace::TraceLayer};
 use webbundle::{Bundle, Version};
 
-#[derive(StructOpt, Debug)]
+#[derive(Parser, Debug)]
 struct Cli {
     // TODO: Support https.
-    // #[structopt(long = "https")]
+    // #[arg]
     // https: bool,
-    #[structopt(short = "p", long = "port", default_value = "8000")]
+    #[arg(short, long, default_value = "8000")]
     port: u16,
-    #[structopt(long = "bind-all")]
+    #[arg(long)]
     //github.com/ Bind all interfaces (default: only localhost - "127.0.0.1"),
     bind_all: bool,
 }
@@ -32,7 +32,7 @@ async fn main() {
         std::env::set_var("RUST_LOG", "my_http_server=debug,tower_http=debug")
     }
     tracing_subscriber::fmt::init();
-    let args = Cli::from_args();
+    let args = Cli::parse();
 
     let app = Router::new()
         .nest("/wbn", get(webbundle_serve))
