Pin clap to 3.0.0.beta2

This commit is contained in:
Dheepak Krishnamurthy 2021-08-16 12:30:55 -06:00
parent 6b550ac1d7
commit 4c5d74d1d4
7 changed files with 43 additions and 39 deletions

30
Cargo.lock generated
View file

@ -285,9 +285,9 @@ dependencies = [
[[package]] [[package]]
name = "clap" name = "clap"
version = "3.0.0-beta.4" version = "3.0.0-beta.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcd70aa5597dbc42f7217a543f9ef2768b2ef823ba29036072d30e1d88e98406" checksum = "4bd1061998a501ee7d4b6d449020df3266ca3124b941ec56cf2005c3779ca142"
dependencies = [ dependencies = [
"atty", "atty",
"bitflags", "bitflags",
@ -298,6 +298,7 @@ dependencies = [
"strsim 0.10.0", "strsim 0.10.0",
"termcolor", "termcolor",
"textwrap", "textwrap",
"unicode-width",
"vec_map", "vec_map",
] ]
@ -316,9 +317,9 @@ dependencies = [
[[package]] [[package]]
name = "clap_generate" name = "clap_generate"
version = "3.0.0-beta.4" version = "3.0.0-beta.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d9b1abef93569f290952eff3c4a0a92d6767bb5158db095b4dc9a512b1c3643" checksum = "adf420f8b687b628d2915ccfd43a660c437a170432e3fbcb66944e8717a0d68f"
dependencies = [ dependencies = [
"clap", "clap",
] ]
@ -980,9 +981,9 @@ checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
[[package]] [[package]]
name = "os_str_bytes" name = "os_str_bytes"
version = "3.1.0" version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6acbef58a60fe69ab50510a55bc8cdd4d6cf2283d27ad338f54cb52747a9cf2d" checksum = "afb2e1c3ee07430c2cf76151675e583e0f19985fa6efae47d6848a3e2c824f85"
[[package]] [[package]]
name = "parking" name = "parking"
@ -1143,9 +1144,9 @@ dependencies = [
[[package]] [[package]]
name = "rand_hc" name = "rand_hc"
version = "0.3.0" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
dependencies = [ dependencies = [
"rand_core", "rand_core",
] ]
@ -1445,20 +1446,21 @@ dependencies = [
[[package]] [[package]]
name = "textwrap" name = "textwrap"
version = "0.14.2" version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80" checksum = "203008d98caf094106cfaba70acfed15e18ed3ddb7d94e49baec153a2b462789"
dependencies = [ dependencies = [
"unicode-width", "unicode-width",
] ]
[[package]] [[package]]
name = "time" name = "time"
version = "0.1.43" version = "0.1.44"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
dependencies = [ dependencies = [
"libc", "libc",
"wasi",
"winapi", "winapi",
] ]
@ -1548,9 +1550,9 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
[[package]] [[package]]
name = "wasi" name = "wasi"
version = "0.10.2+wasi-snapshot-preview1" version = "0.10.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
[[package]] [[package]]
name = "wasm-bindgen" name = "wasm-bindgen"

View file

@ -23,7 +23,7 @@ async-std = { version = "1.9.0", features = ["attributes", "unstable"] }
better-panic = "0.2.0" better-panic = "0.2.0"
cassowary = "0.3.0" cassowary = "0.3.0"
chrono = "0.4.19" chrono = "0.4.19"
clap = "3.0.0-beta.4" clap = "=3.0.0-beta.2"
crossterm = { version = "0.20.0", optional = true, default-features = false, features = ["event-stream"] } crossterm = { version = "0.20.0", optional = true, default-features = false, features = ["event-stream"] }
dirs = "3.0.2" dirs = "3.0.2"
futures = "0.3.16" futures = "0.3.16"
@ -45,10 +45,6 @@ unicode-truncate = "0.2.0"
unicode-width = "0.1.8" unicode-width = "0.1.8"
uuid = { version = "0.8.2", features = ["serde", "v4"] } uuid = { version = "0.8.2", features = ["serde", "v4"] }
[build-dependencies]
clap = "3.0.0-beta.4"
clap_generate = "3.0.0-beta.4"
[package.metadata.rpm] [package.metadata.rpm]
package = "taskwarrior-tui" package = "taskwarrior-tui"
@ -60,3 +56,7 @@ taskwarrior-tui = { path = "/usr/bin/taskwarrior-tui" }
[profile.release] [profile.release]
debug = true debug = true
[build-dependencies]
clap = "=3.0.0-beta.2"
clap_generate = "=3.0.0-beta.2"

View file

@ -8,8 +8,8 @@ fn main() {
let name = app.get_name().to_string(); let name = app.get_name().to_string();
let outdir = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("completions/"); let outdir = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("completions/");
dbg!(&outdir); dbg!(&outdir);
generate_to::<Bash, _, _>(&mut app, &name, &outdir).unwrap(); generate_to::<Bash, _, _>(&mut app, &name, &outdir);
generate_to::<Zsh, _, _>(&mut app, &name, &outdir).unwrap(); generate_to::<Zsh, _, _>(&mut app, &name, &outdir);
generate_to::<Fish, _, _>(&mut app, &name, &outdir).unwrap(); generate_to::<Fish, _, _>(&mut app, &name, &outdir);
generate_to::<PowerShell, _, _>(&mut app, &name, &outdir).unwrap(); generate_to::<PowerShell, _, _>(&mut app, &name, &outdir);
} }

View file

@ -19,17 +19,19 @@ _taskwarrior-tui() {
'--config=[Sets a custom config file]' \ '--config=[Sets a custom config file]' \
'-r+[Sets default report]' \ '-r+[Sets default report]' \
'--report=[Sets default report]' \ '--report=[Sets default report]' \
'-h[Print help information]' \ '-h[Prints help information]' \
'--help[Print help information]' \ '--help[Prints help information]' \
'-V[Print version information]' \ '-V[Prints version information]' \
'--version[Print version information]' \ '--version[Prints version information]' \
&& ret=0 && ret=0
} }
(( $+functions[_taskwarrior-tui_commands] )) || (( $+functions[_taskwarrior-tui_commands] )) ||
_taskwarrior-tui_commands() { _taskwarrior-tui_commands() {
local commands; commands=() local commands; commands=(
)
_describe -t commands 'taskwarrior-tui commands' commands "$@" _describe -t commands 'taskwarrior-tui commands' commands "$@"
} }

View file

@ -24,10 +24,10 @@ Register-ArgumentCompleter -Native -CommandName 'taskwarrior-tui' -ScriptBlock {
[CompletionResult]::new('--config', 'config', [CompletionResultType]::ParameterName, 'Sets a custom config file') [CompletionResult]::new('--config', 'config', [CompletionResultType]::ParameterName, 'Sets a custom config file')
[CompletionResult]::new('-r', 'r', [CompletionResultType]::ParameterName, 'Sets default report') [CompletionResult]::new('-r', 'r', [CompletionResultType]::ParameterName, 'Sets default report')
[CompletionResult]::new('--report', 'report', [CompletionResultType]::ParameterName, 'Sets default report') [CompletionResult]::new('--report', 'report', [CompletionResultType]::ParameterName, 'Sets default report')
[CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Print help information') [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information')
[CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Print help information') [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Prints help information')
[CompletionResult]::new('-V', 'V', [CompletionResultType]::ParameterName, 'Print version information') [CompletionResult]::new('-V', 'V', [CompletionResultType]::ParameterName, 'Prints version information')
[CompletionResult]::new('--version', 'version', [CompletionResultType]::ParameterName, 'Print version information') [CompletionResult]::new('--version', 'version', [CompletionResultType]::ParameterName, 'Prints version information')
break break
} }
}) })

View file

@ -20,7 +20,7 @@ _taskwarrior-tui() {
case "${cmd}" in case "${cmd}" in
taskwarrior__tui) taskwarrior__tui)
opts=" -h -V -c -r --help --version --config --report " opts=" -c -r -h -V --config --report --help --version "
if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") ) COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
return 0 return 0

View file

@ -1,4 +1,4 @@
complete -c taskwarrior-tui -s c -l config -d 'Sets a custom config file' -r complete -c taskwarrior-tui -n "__fish_use_subcommand" -s c -l config -d 'Sets a custom config file' -r
complete -c taskwarrior-tui -s r -l report -d 'Sets default report' -r complete -c taskwarrior-tui -n "__fish_use_subcommand" -s r -l report -d 'Sets default report' -r
complete -c taskwarrior-tui -s h -l help -d 'Print help information' complete -c taskwarrior-tui -n "__fish_use_subcommand" -s h -l help -d 'Prints help information'
complete -c taskwarrior-tui -s V -l version -d 'Print version information' complete -c taskwarrior-tui -n "__fish_use_subcommand" -s V -l version -d 'Prints version information'