Skip to content

Commit d84d554

Browse files
borsbors
committed
Auto merge of #2772 - knight42:patch, r=alexcrichton
Improve autocompletion 1. Add path completion to manifest-path options 2. Support subcommand metadata
2 parents 099ad28 + c7e2986 commit d84d554

File tree

1 file changed

+28
-15
lines changed

1 file changed

+28
-15
lines changed

‎src/etc/_cargo

+28-15
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ _arguments \
1616

1717
case $state in
1818
args)
19-
#TODO: add path completion to manifest-path options
2019
case $words[1] in
2120
bench)
2221
_arguments \
@@ -40,7 +39,7 @@ case $state in
4039
'(-h, --help)'{-h,--help}'[show help message]' \
4140
'(-j, --jobs)'{-j,--jobs}'[number of jobs to run in parallel]' \
4241
"${command_scope_spec[@]}" \
43-
'--manifest-path=[path to manifest]: :files -/' \
42+
'--manifest-path=[path to manifest]: :_files -/' \
4443
'--no-default-features[do not build the default features]' \
4544
'(-p,--package)'{-p=,--package=}'[package to build]:packages:_get_package_names' \
4645
'--release=[build in release mode]' \
@@ -53,7 +52,7 @@ case $state in
5352
clean)
5453
_arguments \
5554
'(-h, --help)'{-h,--help}'[show help message]' \
56-
'--manifest-path=[path to manifest]' \
55+
'--manifest-path=[path to manifest]: :_files -/' \
5756
'(-p,--package)'{-p=,--package=}'[package to clean]:packages:_get_package_names' \
5857
'(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
5958
'--release[whether or not to clean release artifacts]' \
@@ -67,7 +66,7 @@ case $state in
6766
'--features=[space separated feature list]' \
6867
'(-h, --help)'{-h,--help}'[show help message]' \
6968
'(-j, --jobs)'{-j,--jobs}'[number of jobs to run in parallel]' \
70-
'--manifest-path=[path to manifest]' \
69+
'--manifest-path=[path to manifest]: :_files -/' \
7170
'--no-deps[do not build docs for dependencies]' \
7271
'--no-default-features[do not build the default features]' \
7372
'--open[open docs in browser after the build]' \
@@ -82,7 +81,7 @@ case $state in
8281
fetch)
8382
_arguments \
8483
'(-h, --help)'{-h,--help}'[show help message]' \
85-
'--manifest-path=[path to manifest]' \
84+
'--manifest-path=[path to manifest]: :_files -/' \
8685
'(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
8786
'(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
8887
'--color=:colorization option:(auto always never)' \
@@ -91,7 +90,7 @@ case $state in
9190
generate-lockfile)
9291
_arguments \
9392
'(-h, --help)'{-h,--help}'[show help message]' \
94-
'--manifest-path=[path to manifest]' \
93+
'--manifest-path=[path to manifest]: :_files -/' \
9594
'(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
9695
'(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
9796
'--color=:colorization option:(auto always never)' \
@@ -148,7 +147,7 @@ case $state in
148147
locate-project)
149148
_arguments \
150149
'(-h, --help)'{-h,--help}'[show help message]' \
151-
'--manifest-path=[path to manifest]' \
150+
'--manifest-path=[path to manifest]: :_files -/' \
152151
;;
153152

154153
login)
@@ -160,6 +159,19 @@ case $state in
160159
'--color=:colorization option:(auto always never)' \
161160
;;
162161

162+
metadata)
163+
_arguments \
164+
'(-h, --help)'{-h,--help}'[show help message]' \
165+
'(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
166+
'(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
167+
"--no-deps[output information only about the root package and don't fetch dependencies]" \
168+
'--no-default-features[do not include the default feature]' \
169+
'--manifest-path=[path to manifest]: :_files -/' \
170+
'--features=[space separated feature list]' \
171+
'--format-version=[format version(default: 1)]' \
172+
'--color=:colorization option:(auto always never)' \
173+
;;
174+
163175
new)
164176
_arguments \
165177
'--bin[use binary template]' \
@@ -188,7 +200,7 @@ case $state in
188200
_arguments \
189201
'(-h, --help)'{-h,--help}'[show help message]' \
190202
'(-l, --list)'{-l,--list}'[print files included in a package without making one]' \
191-
'--manifest-path=[path to manifest]' \
203+
'--manifest-path=[path to manifest]: :_files -/' \
192204
'--no-metadata[ignore warnings about a lack of human-usable metadata]' \
193205
'--no-verify[do not build to verify contents]' \
194206
'(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
@@ -199,7 +211,7 @@ case $state in
199211
pkgid)
200212
_arguments \
201213
'(-h, --help)'{-h,--help}'[show help message]' \
202-
'--manifest-path=[path to manifest]' \
214+
'--manifest-path=[path to manifest]: :_files -/' \
203215
'(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
204216
'(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
205217
'--color=:colorization option:(auto always never)' \
@@ -209,7 +221,7 @@ case $state in
209221
_arguments \
210222
'(-h, --help)'{-h,--help}'[show help message]' \
211223
'--host=[Host to set the token for]' \
212-
'--manifest-path=[path to manifest]' \
224+
'--manifest-path=[path to manifest]: :_files -/' \
213225
'--no-verify[Do not verify tarball until before publish]' \
214226
'(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
215227
'--token[token to use when uploading]' \
@@ -220,7 +232,7 @@ case $state in
220232
read-manifest)
221233
_arguments \
222234
'(-h, --help)'{-h,--help}'[show help message]' \
223-
'--manifest-path=[path to manifest]' \
235+
'--manifest-path=[path to manifest]: :_files -/' \
224236
'(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
225237
'--color=:colorization option:(auto always never)' \
226238
;;
@@ -231,7 +243,7 @@ case $state in
231243
'--features=[space separated feature list]' \
232244
'(-h, --help)'{-h,--help}'[show help message]' \
233245
'(-j, --jobs)'{-j,--jobs}'[number of jobs to run in parallel]' \
234-
'--manifest-path=[path to manifest]' \
246+
'--manifest-path=[path to manifest]: :_files -/' \
235247
'--bin=[name of the bin target]' \
236248
'--no-default-features[do not build the default features]' \
237249
'(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
@@ -291,7 +303,7 @@ case $state in
291303
'--features=[space separated feature list]' \
292304
'(-h, --help)'{-h,--help}'[show help message]' \
293305
'(-j, --jobs)'{-j,--jobs}'[number of jobs to run in parallel]' \
294-
'--manifest-path=[path to manifest]' \
306+
'--manifest-path=[path to manifest]: :_files -/' \
295307
'--test=[test name]: :_test_names' \
296308
'--no-default-features[do not build the default features]' \
297309
'--no-fail-fast[run all tests regardless of failure]' \
@@ -319,7 +331,7 @@ case $state in
319331
_arguments \
320332
'--aggressive=[force dependency update]' \
321333
'(-h, --help)'{-h,--help}'[show help message]' \
322-
'--manifest-path=[path to manifest]' \
334+
'--manifest-path=[path to manifest]: :_files -/' \
323335
'(-p,--package)'{-p=,--package=}'[package to update]:packages:__get_package_names' \
324336
'--precise=[update single dependency to PRECISE]: :' \
325337
'(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
@@ -330,7 +342,7 @@ case $state in
330342
verify-project)
331343
_arguments \
332344
'(-h, --help)'{-h,--help}'[show help message]' \
333-
'--manifest-path=[path to manifest]' \
345+
'--manifest-path=[path to manifest]: :_files -/' \
334346
'(-q, --quiet)'{-q,--quiet}'[no output printed to stdout]' \
335347
'(-v, --verbose)'{-v,--verbose}'[use verbose output]' \
336348
'--color=:colorization option:(auto always never)' \
@@ -373,6 +385,7 @@ local -a commands;commands=(
373385
'install:install a Rust binary'
374386
'locate-project:print "Cargo.toml" location'
375387
'login:login to remote server'
388+
'metadata:the metadata for a project in json'
376389
'new:create a new project'
377390
'owner:manage the owners of a crate on the registry'
378391
'package:assemble local package into a distributable tarball'

0 commit comments

Comments
 (0)