Merge pull request #216 from ducaale/clap3

Replace Structopt with Clap v3

.github/workflows/ci.yaml

@@ -39,7 +39,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.46.0 # minimum supported rust version
+          toolchain: 1.54.0 # minimum supported rust version
           target: ${{ matrix.job.target }}
           override: true
       - uses: actions-rs/cargo@v1

.github/workflows/release.yaml

@@ -36,7 +36,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.46.0 # minimum supported rust version
+          toolchain: 1.54.0 # minimum supported rust version
           target: ${{ matrix.job.target }}
           override: true
       - uses: actions-rs/cargo@v1

Cargo.toml

@@ -15,6 +15,8 @@ exclude = ["assets/xhs", "assets/xhs.1.gz"]
 anyhow = "1.0.38"
 atty = "0.2"
 chardetng = "0.1.15"
+clap = { version = "3.0.0", features = ["derive", "wrap_help"] }
+clap_complete = "3.0.0"
 cookie_crate = { version = "0.15", package = "cookie" }
 cookie_store = { version = "0.15.0" }
 digest_auth = "0.3.0"
@@ -37,7 +39,6 @@ rpassword = "5.0.0"
 serde = "1.0"
 serde_json = { version = "1.0", features = ["preserve_order"] }
 serde_urlencoded = "0.7.0"
-structopt = { version = "0.3.2", features = ["wrap_help"] }
 termcolor = "1.1.2"
 time = "0.2.26"
 url = "2.2.2"

README.md

@@ -37,7 +37,7 @@ iwr -useb https://github.com/ducaale/xh/master/install.ps1 | iex
 | macOS           | MacPorts   | `sudo port install xh`  |
 | Windows         | Scoop      | `scoop install xh`      |
 
-\* Make sure that you have Rust 1.46 or later installed
+\* Make sure that you have Rust 1.54 or later installed
 
 \*\* You will need to add the apt repository from https://apt.cli.rs/
 

clippy.toml

@@ -1 +1 @@
-msrv = "1.46.0"
+msrv = "1.54.0"

generate.sh

@@ -13,7 +13,3 @@ XH_HELP2MAN=1 help2man \
   'cargo run --all-features --'
 
 cargo run --all-features -- generate_completions completions
-
-# Subcommand check is unnecessary: https://github.com/clap-rs/clap/pull/2359
-sed 's/ -n "__fish_use_subcommand"//g' completions/xh.fish > completions/xh.fish.new
-mv completions/xh.fish.new completions/xh.fish