diff --git a/Cargo.lock b/Cargo.lock index 6eb077d..9935250 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -40,9 +40,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.0.32" +version = "4.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7db700bc935f9e43e88d00b0850dae18a63773cfbec6d8e070fccf7fef89a39" +checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76" dependencies = [ "bitflags", "clap_lex", @@ -53,9 +53,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.0.7" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10861370d2ba66b0f5989f83ebf35db6421713fd92351790e7fdd6c36774c56b" +checksum = "3d6540eedc41f8a5a76cf3d8d458057dcdf817be4158a55b5f861f7a5483de75" dependencies = [ "clap", ] diff --git a/Cargo.toml b/Cargo.toml index 42bb1ff..a1fec6e 100644 --- a/Cargo.toml +++ b/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 "] @@ -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" diff --git a/README.md b/README.md index 0603ccf..ffd9047 100644 --- a/README.md +++ b/README.md @@ -81,11 +81,15 @@ For sudo, add the following to `/etc/sudoers` (replace `` 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) diff --git a/src/snapshots/ego.help b/src/snapshots/ego.help index 88db3ee..3b5e246 100644 --- a/src/snapshots/ego.help +++ b/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 diff --git a/varia/ego-completion.bash b/varia/ego-completion.bash index 48d32fc..703b26f 100644 --- a/varia/ego-completion.bash +++ b/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]}" diff --git a/varia/ego-completion.fish b/varia/ego-completion.fish index fd02112..612dec0 100644 --- a/varia/ego-completion.fish +++ b/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' diff --git a/varia/ego-completion.zsh b/varia/ego-completion.zsh index 6201f33..553506f 100644 --- a/varia/ego-completion.zsh +++ b/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 }