Update to clap 4.1.x (#116)

Minimum Supported Rust Version (MSRV) is now Rust 1.64.0

Cargo.toml

@@ -2,7 +2,7 @@
 name = "ego"
 version = "1.1.6"
 edition = "2021"
-rust-version = "1.60.0"
+rust-version = "1.64.0"
 
 # Metadata
 authors = ["Marti Raudsepp <[email protected]>"]
@@ -19,7 +19,7 @@ categories = ["command-line-utilities"]
 users = "0.11.0"
 simple-error = "0.2.3"
 posix-acl = "1.1.0"
-clap = "~4.0.32"
+clap = "~4.1.4"
 log = { version = "0.4.17", features = ["std"] }
 ansi_term = "0.12.1"
 shell-words = "1.1.0"
@@ -28,5 +28,5 @@ shell-words = "1.1.0"
 default = []
 
 [dev-dependencies]
-clap_complete = "~4.0.7"
+clap_complete = "~4.1.1"
 snapbox = "0.4.4"

README.md

@@ -81,11 +81,15 @@ For sudo, add the following to `/etc/sudoers` (replace `<myname>` with your own
 Changelog
 ---------
 
+##### UNRELEASED
+* Updated to clap 4.1.x (#116)
+* Minimum Supported Rust Version (MSRV) is now 1.64.0 (#116)
+
 ##### 1.1.6 (2023-01-21)
 * Updated to clap 4.0.x (#101) and many other dependency updates
 * Fixes for new clippy lints (#95, #93, #111)
 * Use `snapbox` instead of hand-coded snapshot testing (#102)
-* MSRV was determined to be Rust 1.60.0 (#113)
+* Minimum Supported Rust Version (MSRV) was determined to be 1.60.0 (#113)
 
 ##### 1.1.5 (2022-01-02)
 * Document xhost requirement, improve xhost error reporting (#76)

src/snapshots/ego.help

@@ -11,4 +11,4 @@ Options:
       --machinectl       Use 'machinectl' to change user (default, if available)
       --machinectl-bare  Use 'machinectl' but skip xdg-desktop-portal setup
   -v, --verbose...       Verbose output. Use multiple times for more output.
-  -h, --help             Print help information
+  -h, --help             Print help

varia/ego-completion.bash

@@ -1,5 +1,5 @@
 _ego() {
-    local i cur prev opts cmds
+    local i cur prev opts cmd
     COMPREPLY=()
     cur="${COMP_WORDS[COMP_CWORD]}"
     prev="${COMP_WORDS[COMP_CWORD-1]}"

varia/ego-completion.fish

@@ -3,4 +3,4 @@ complete -c ego -l sudo -d 'Use \'sudo\' to change user'
 complete -c ego -l machinectl -d 'Use \'machinectl\' to change user (default, if available)'
 complete -c ego -l machinectl-bare -d 'Use \'machinectl\' but skip xdg-desktop-portal setup'
 complete -c ego -s v -l verbose -d 'Verbose output. Use multiple times for more output.'
-complete -c ego -s h -l help -d 'Print help information'
+complete -c ego -s h -l help -d 'Print help'

varia/ego-completion.zsh

@@ -22,8 +22,8 @@ _ego() {
 '--machinectl-bare[Use '\''machinectl'\'' but skip xdg-desktop-portal setup]' \
 '*-v[Verbose output. Use multiple times for more output.]' \
 '*--verbose[Verbose output. Use multiple times for more output.]' \
-'-h[Print help information]' \
-'--help[Print help information]' \
+'-h[Print help]' \
+'--help[Print help]' \
 '*::command -- Command name and arguments to run (default\: user shell):_cmdambivalent' \
 && ret=0
 }