diff --git a/share/completions/cargo.fish b/share/completions/cargo.fish
index df387ff86..17f360a4c 100644
--- a/share/completions/cargo.fish
+++ b/share/completions/cargo.fish
@@ -57,7 +57,7 @@ function __fish_cargo_packages
             command $python -Sc "import sys, json"\n"print(*[x['name'] for x in json.load(sys.stdin)['packages']], sep='\n')"
     end
 end
-complete -c cargo -n '__fish_seen_subcommand_from run test build debug check clippy' -s p -l package \
+complete -c cargo -n '__fish_seen_subcommand_from r run t test b build debug c check clippy' -s p -l package \
     -xa "(__fish_cargo_packages)"
 
 ## --- AUTO-GENERATED WITH `cargo complete fish` ---
@@ -143,80 +143,80 @@ complete -c cargo -n "__fish_seen_subcommand_from bench" -s v -l verbose -d 'Use
 complete -c cargo -n "__fish_seen_subcommand_from bench" -l frozen -d 'Require Cargo.lock and cache are up to date'
 complete -c cargo -n "__fish_seen_subcommand_from bench" -l locked -d 'Require Cargo.lock is up to date'
 complete -c cargo -n "__fish_seen_subcommand_from bench" -l offline -d 'Run without accessing the network'
-complete -c cargo -n "__fish_seen_subcommand_from build" -s p -l package -d 'Package to build (see `cargo help pkgid`)'
-complete -c cargo -n "__fish_seen_subcommand_from build" -l exclude -d 'Exclude packages from the build'
-complete -c cargo -n "__fish_seen_subcommand_from build" -s j -l jobs -d 'Number of parallel jobs, defaults to # of CPUs'
-complete -c cargo -n "__fish_seen_subcommand_from build" -l bin -d 'Build only the specified binary'
-complete -c cargo -n "__fish_seen_subcommand_from build" -l example -d 'Build only the specified example'
-complete -c cargo -n "__fish_seen_subcommand_from build" -l test -d 'Build only the specified test target'
-complete -c cargo -n "__fish_seen_subcommand_from build" -l bench -d 'Build only the specified bench target'
-complete -c cargo -n "__fish_seen_subcommand_from build" -l profile -d 'Build artifacts with the specified profile'
-complete -c cargo -n "__fish_seen_subcommand_from build" -l features -d 'Space or comma separated list of features to activate' -xa "(__fish_cargo_features)"
-complete -c cargo -n "__fish_seen_subcommand_from build" -l target -d 'Build for the target triple' -xa "(__fish_cargo_targets)"
-complete -c cargo -n "__fish_seen_subcommand_from build" -l target-dir -d 'Directory for all generated artifacts'
-complete -c cargo -n "__fish_seen_subcommand_from build" -l out-dir -d 'Copy final artifacts to this directory (unstable)'
-complete -c cargo -n "__fish_seen_subcommand_from build" -l manifest-path -d 'Path to Cargo.toml'
-complete -c cargo -n "__fish_seen_subcommand_from build" -l message-format -d 'Error format'
-complete -c cargo -n "__fish_seen_subcommand_from build" -l color -d 'Coloring: auto, always, never'
-complete -c cargo -n "__fish_seen_subcommand_from build" -l config -d 'Override a configuration value (unstable)'
-complete -c cargo -n "__fish_seen_subcommand_from build" -s Z -d 'Unstable (nightly-only) flags to Cargo, see \'cargo -Z help\' for details'
-complete -c cargo -n "__fish_seen_subcommand_from build" -s q -l quiet -d 'No output printed to stdout'
-complete -c cargo -n "__fish_seen_subcommand_from build" -l workspace -d 'Build all packages in the workspace'
-complete -c cargo -n "__fish_seen_subcommand_from build" -l lib -d 'Build only this package\'s library'
-complete -c cargo -n "__fish_seen_subcommand_from build" -l bins -d 'Build all binaries'
-complete -c cargo -n "__fish_seen_subcommand_from build" -l examples -d 'Build all examples'
-complete -c cargo -n "__fish_seen_subcommand_from build" -l tests -d 'Build all tests'
-complete -c cargo -n "__fish_seen_subcommand_from build" -l benches -d 'Build all benches'
-complete -c cargo -n "__fish_seen_subcommand_from build" -l all-targets -d 'Build all targets'
-complete -c cargo -n "__fish_seen_subcommand_from build" -l release -d 'Build artifacts in release mode, with optimizations'
-complete -c cargo -n "__fish_seen_subcommand_from build" -l all-features -d 'Activate all available features'
-complete -c cargo -n "__fish_seen_subcommand_from build" -l no-default-features -d 'Do not activate the `default` feature'
-complete -c cargo -n "__fish_seen_subcommand_from build" -l ignore-rust-version -d 'Ignore `rust-version` specification in packages (unstable)'
-complete -c cargo -n "__fish_seen_subcommand_from build" -l build-plan -d 'Output the build plan in JSON (unstable)'
-complete -c cargo -n "__fish_seen_subcommand_from build" -l unit-graph -d 'Output build graph in JSON (unstable)'
-complete -c cargo -n "__fish_seen_subcommand_from build" -l future-incompat-report -d 'Output a future incompatibility report after build (unstable)'
-complete -c cargo -n "__fish_seen_subcommand_from build" -s h -l help -d 'Prints help information'
-complete -c cargo -n "__fish_seen_subcommand_from build" -s V -l version -d 'Prints version information'
-complete -c cargo -n "__fish_seen_subcommand_from build" -s v -l verbose -d 'Use verbose output (-vv very verbose/build.rs output)'
-complete -c cargo -n "__fish_seen_subcommand_from build" -l frozen -d 'Require Cargo.lock and cache are up to date'
-complete -c cargo -n "__fish_seen_subcommand_from build" -l locked -d 'Require Cargo.lock is up to date'
-complete -c cargo -n "__fish_seen_subcommand_from build" -l offline -d 'Run without accessing the network'
-complete -c cargo -n "__fish_seen_subcommand_from check" -s p -l package -d 'Package(s) to check'
-complete -c cargo -n "__fish_seen_subcommand_from check" -l exclude -d 'Exclude packages from the check'
-complete -c cargo -n "__fish_seen_subcommand_from check" -s j -l jobs -d 'Number of parallel jobs, defaults to # of CPUs'
-complete -c cargo -n "__fish_seen_subcommand_from check" -l bin -d 'Check only the specified binary'
-complete -c cargo -n "__fish_seen_subcommand_from check" -l example -d 'Check only the specified example'
-complete -c cargo -n "__fish_seen_subcommand_from check" -l test -d 'Check only the specified test target'
-complete -c cargo -n "__fish_seen_subcommand_from check" -l bench -d 'Check only the specified bench target'
-complete -c cargo -n "__fish_seen_subcommand_from check" -l profile -d 'Check artifacts with the specified profile'
-complete -c cargo -n "__fish_seen_subcommand_from check" -l features -d 'Space or comma separated list of features to activate' -xa "(__fish_cargo_features)"
-complete -c cargo -n "__fish_seen_subcommand_from check" -l target -d 'Check for the target triple' -xa "(__fish_cargo_targets)"
-complete -c cargo -n "__fish_seen_subcommand_from check" -l target-dir -d 'Directory for all generated artifacts'
-complete -c cargo -n "__fish_seen_subcommand_from check" -l manifest-path -d 'Path to Cargo.toml'
-complete -c cargo -n "__fish_seen_subcommand_from check" -l message-format -d 'Error format'
-complete -c cargo -n "__fish_seen_subcommand_from check" -l color -d 'Coloring: auto, always, never'
-complete -c cargo -n "__fish_seen_subcommand_from check" -l config -d 'Override a configuration value (unstable)'
-complete -c cargo -n "__fish_seen_subcommand_from check" -s Z -d 'Unstable (nightly-only) flags to Cargo, see \'cargo -Z help\' for details'
-complete -c cargo -n "__fish_seen_subcommand_from check" -s q -l quiet -d 'No output printed to stdout'
-complete -c cargo -n "__fish_seen_subcommand_from check" -l workspace -d 'Check all packages in the workspace'
-complete -c cargo -n "__fish_seen_subcommand_from check" -l lib -d 'Check only this package\'s library'
-complete -c cargo -n "__fish_seen_subcommand_from check" -l bins -d 'Check all binaries'
-complete -c cargo -n "__fish_seen_subcommand_from check" -l examples -d 'Check all examples'
-complete -c cargo -n "__fish_seen_subcommand_from check" -l tests -d 'Check all tests'
-complete -c cargo -n "__fish_seen_subcommand_from check" -l benches -d 'Check all benches'
-complete -c cargo -n "__fish_seen_subcommand_from check" -l all-targets -d 'Check all targets'
-complete -c cargo -n "__fish_seen_subcommand_from check" -l release -d 'Check artifacts in release mode, with optimizations'
-complete -c cargo -n "__fish_seen_subcommand_from check" -l all-features -d 'Activate all available features'
-complete -c cargo -n "__fish_seen_subcommand_from check" -l no-default-features -d 'Do not activate the `default` feature'
-complete -c cargo -n "__fish_seen_subcommand_from check" -l ignore-rust-version -d 'Ignore `rust-version` specification in packages (unstable)'
-complete -c cargo -n "__fish_seen_subcommand_from check" -l unit-graph -d 'Output build graph in JSON (unstable)'
-complete -c cargo -n "__fish_seen_subcommand_from check" -l future-incompat-report -d 'Output a future incompatibility report after build (unstable)'
-complete -c cargo -n "__fish_seen_subcommand_from check" -s h -l help -d 'Prints help information'
-complete -c cargo -n "__fish_seen_subcommand_from check" -s V -l version -d 'Prints version information'
-complete -c cargo -n "__fish_seen_subcommand_from check" -s v -l verbose -d 'Use verbose output (-vv very verbose/build.rs output)'
-complete -c cargo -n "__fish_seen_subcommand_from check" -l frozen -d 'Require Cargo.lock and cache are up to date'
-complete -c cargo -n "__fish_seen_subcommand_from check" -l locked -d 'Require Cargo.lock is up to date'
-complete -c cargo -n "__fish_seen_subcommand_from check" -l offline -d 'Run without accessing the network'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -s p -l package -d 'Package to build (see `cargo help pkgid`)'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -l exclude -d 'Exclude packages from the build'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -s j -l jobs -d 'Number of parallel jobs, defaults to # of CPUs'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -l bin -d 'Build only the specified binary'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -l example -d 'Build only the specified example'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -l test -d 'Build only the specified test target'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -l bench -d 'Build only the specified bench target'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -l profile -d 'Build artifacts with the specified profile'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -l features -d 'Space or comma separated list of features to activate' -xa "(__fish_cargo_features)"
+complete -c cargo -n "__fish_seen_subcommand_from b build" -l target -d 'Build for the target triple' -xa "(__fish_cargo_targets)"
+complete -c cargo -n "__fish_seen_subcommand_from b build" -l target-dir -d 'Directory for all generated artifacts'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -l out-dir -d 'Copy final artifacts to this directory (unstable)'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -l manifest-path -d 'Path to Cargo.toml'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -l message-format -d 'Error format'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -l color -d 'Coloring: auto, always, never'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -l config -d 'Override a configuration value (unstable)'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -s Z -d 'Unstable (nightly-only) flags to Cargo, see \'cargo -Z help\' for details'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -s q -l quiet -d 'No output printed to stdout'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -l workspace -d 'Build all packages in the workspace'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -l lib -d 'Build only this package\'s library'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -l bins -d 'Build all binaries'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -l examples -d 'Build all examples'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -l tests -d 'Build all tests'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -l benches -d 'Build all benches'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -l all-targets -d 'Build all targets'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -l release -d 'Build artifacts in release mode, with optimizations'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -l all-features -d 'Activate all available features'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -l no-default-features -d 'Do not activate the `default` feature'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -l ignore-rust-version -d 'Ignore `rust-version` specification in packages (unstable)'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -l build-plan -d 'Output the build plan in JSON (unstable)'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -l unit-graph -d 'Output build graph in JSON (unstable)'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -l future-incompat-report -d 'Output a future incompatibility report after build (unstable)'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -s h -l help -d 'Prints help information'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -s V -l version -d 'Prints version information'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -s v -l verbose -d 'Use verbose output (-vv very verbose/build.rs output)'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -l frozen -d 'Require Cargo.lock and cache are up to date'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -l locked -d 'Require Cargo.lock is up to date'
+complete -c cargo -n "__fish_seen_subcommand_from b build" -l offline -d 'Run without accessing the network'
+complete -c cargo -n "__fish_seen_subcommand_from c check" -s p -l package -d 'Package(s) to check'
+complete -c cargo -n "__fish_seen_subcommand_from c check" -l exclude -d 'Exclude packages from the check'
+complete -c cargo -n "__fish_seen_subcommand_from c check" -s j -l jobs -d 'Number of parallel jobs, defaults to # of CPUs'
+complete -c cargo -n "__fish_seen_subcommand_from c check" -l bin -d 'Check only the specified binary'
+complete -c cargo -n "__fish_seen_subcommand_from c check" -l example -d 'Check only the specified example'
+complete -c cargo -n "__fish_seen_subcommand_from c check" -l test -d 'Check only the specified test target'
+complete -c cargo -n "__fish_seen_subcommand_from c check" -l bench -d 'Check only the specified bench target'
+complete -c cargo -n "__fish_seen_subcommand_from c check" -l profile -d 'Check artifacts with the specified profile'
+complete -c cargo -n "__fish_seen_subcommand_from c check" -l features -d 'Space or comma separated list of features to activate' -xa "(__fish_cargo_features)"
+complete -c cargo -n "__fish_seen_subcommand_from c check" -l target -d 'Check for the target triple' -xa "(__fish_cargo_targets)"
+complete -c cargo -n "__fish_seen_subcommand_from c check" -l target-dir -d 'Directory for all generated artifacts'
+complete -c cargo -n "__fish_seen_subcommand_from c check" -l manifest-path -d 'Path to Cargo.toml'
+complete -c cargo -n "__fish_seen_subcommand_from c check" -l message-format -d 'Error format'
+complete -c cargo -n "__fish_seen_subcommand_from c check" -l color -d 'Coloring: auto, always, never'
+complete -c cargo -n "__fish_seen_subcommand_from c check" -l config -d 'Override a configuration value (unstable)'
+complete -c cargo -n "__fish_seen_subcommand_from c check" -s Z -d 'Unstable (nightly-only) flags to Cargo, see \'cargo -Z help\' for details'
+complete -c cargo -n "__fish_seen_subcommand_from c check" -s q -l quiet -d 'No output printed to stdout'
+complete -c cargo -n "__fish_seen_subcommand_from c check" -l workspace -d 'Check all packages in the workspace'
+complete -c cargo -n "__fish_seen_subcommand_from c check" -l lib -d 'Check only this package\'s library'
+complete -c cargo -n "__fish_seen_subcommand_from c check" -l bins -d 'Check all binaries'
+complete -c cargo -n "__fish_seen_subcommand_from c check" -l examples -d 'Check all examples'
+complete -c cargo -n "__fish_seen_subcommand_from c check" -l tests -d 'Check all tests'
+complete -c cargo -n "__fish_seen_subcommand_from c check" -l benches -d 'Check all benches'
+complete -c cargo -n "__fish_seen_subcommand_from c check" -l all-targets -d 'Check all targets'
+complete -c cargo -n "__fish_seen_subcommand_from c check" -l release -d 'Check artifacts in release mode, with optimizations'
+complete -c cargo -n "__fish_seen_subcommand_from c check" -l all-features -d 'Activate all available features'
+complete -c cargo -n "__fish_seen_subcommand_from c check" -l no-default-features -d 'Do not activate the `default` feature'
+complete -c cargo -n "__fish_seen_subcommand_from c check" -l ignore-rust-version -d 'Ignore `rust-version` specification in packages (unstable)'
+complete -c cargo -n "__fish_seen_subcommand_from c check" -l unit-graph -d 'Output build graph in JSON (unstable)'
+complete -c cargo -n "__fish_seen_subcommand_from c check" -l future-incompat-report -d 'Output a future incompatibility report after build (unstable)'
+complete -c cargo -n "__fish_seen_subcommand_from c check" -s h -l help -d 'Prints help information'
+complete -c cargo -n "__fish_seen_subcommand_from c check" -s V -l version -d 'Prints version information'
+complete -c cargo -n "__fish_seen_subcommand_from c check" -s v -l verbose -d 'Use verbose output (-vv very verbose/build.rs output)'
+complete -c cargo -n "__fish_seen_subcommand_from c check" -l frozen -d 'Require Cargo.lock and cache are up to date'
+complete -c cargo -n "__fish_seen_subcommand_from c check" -l locked -d 'Require Cargo.lock is up to date'
+complete -c cargo -n "__fish_seen_subcommand_from c check" -l offline -d 'Run without accessing the network'
 complete -c cargo -n "__fish_seen_subcommand_from clean" -s p -l package -d 'Package to clean artifacts for'
 complete -c cargo -n "__fish_seen_subcommand_from clean" -l manifest-path -d 'Path to Cargo.toml'
 complete -c cargo -n "__fish_seen_subcommand_from clean" -l target -d 'Target triple to clean output for' -xa "(__fish_cargo_targets)"
@@ -243,37 +243,37 @@ complete -c cargo -n "__fish_seen_subcommand_from complete" -s v -l verbose -d '
 complete -c cargo -n "__fish_seen_subcommand_from complete" -l frozen -d 'Require Cargo.lock and cache are up to date'
 complete -c cargo -n "__fish_seen_subcommand_from complete" -l locked -d 'Require Cargo.lock is up to date'
 complete -c cargo -n "__fish_seen_subcommand_from complete" -l offline -d 'Run without accessing the network'
-complete -c cargo -n "__fish_seen_subcommand_from doc" -s p -l package -d 'Package to document'
-complete -c cargo -n "__fish_seen_subcommand_from doc" -l exclude -d 'Exclude packages from the build'
-complete -c cargo -n "__fish_seen_subcommand_from doc" -s j -l jobs -d 'Number of parallel jobs, defaults to # of CPUs'
-complete -c cargo -n "__fish_seen_subcommand_from doc" -l bin -d 'Document only the specified binary'
-complete -c cargo -n "__fish_seen_subcommand_from doc" -l profile -d 'Build artifacts with the specified profile'
-complete -c cargo -n "__fish_seen_subcommand_from doc" -l features -d 'Space or comma separated list of features to activate' -xa "(__fish_cargo_features)"
-complete -c cargo -n "__fish_seen_subcommand_from doc" -l target -d 'Build for the target triple' -xa "(__fish_cargo_targets)"
-complete -c cargo -n "__fish_seen_subcommand_from doc" -l target-dir -d 'Directory for all generated artifacts'
-complete -c cargo -n "__fish_seen_subcommand_from doc" -l manifest-path -d 'Path to Cargo.toml'
-complete -c cargo -n "__fish_seen_subcommand_from doc" -l message-format -d 'Error format'
-complete -c cargo -n "__fish_seen_subcommand_from doc" -l color -d 'Coloring: auto, always, never'
-complete -c cargo -n "__fish_seen_subcommand_from doc" -l config -d 'Override a configuration value (unstable)'
-complete -c cargo -n "__fish_seen_subcommand_from doc" -s Z -d 'Unstable (nightly-only) flags to Cargo, see \'cargo -Z help\' for details'
-complete -c cargo -n "__fish_seen_subcommand_from doc" -s q -l quiet -d 'No output printed to stdout'
-complete -c cargo -n "__fish_seen_subcommand_from doc" -l open -d 'Opens the docs in a browser after the operation'
-complete -c cargo -n "__fish_seen_subcommand_from doc" -l workspace -d 'Document all packages in the workspace'
-complete -c cargo -n "__fish_seen_subcommand_from doc" -l no-deps -d 'Don\'t build documentation for dependencies'
-complete -c cargo -n "__fish_seen_subcommand_from doc" -l document-private-items -d 'Document private items'
-complete -c cargo -n "__fish_seen_subcommand_from doc" -l lib -d 'Document only this package\'s library'
-complete -c cargo -n "__fish_seen_subcommand_from doc" -l bins -d 'Document all binaries'
-complete -c cargo -n "__fish_seen_subcommand_from doc" -l release -d 'Build artifacts in release mode, with optimizations'
-complete -c cargo -n "__fish_seen_subcommand_from doc" -l all-features -d 'Activate all available features'
-complete -c cargo -n "__fish_seen_subcommand_from doc" -l no-default-features -d 'Do not activate the `default` feature'
-complete -c cargo -n "__fish_seen_subcommand_from doc" -l ignore-rust-version -d 'Ignore `rust-version` specification in packages (unstable)'
-complete -c cargo -n "__fish_seen_subcommand_from doc" -l unit-graph -d 'Output build graph in JSON (unstable)'
-complete -c cargo -n "__fish_seen_subcommand_from doc" -s h -l help -d 'Prints help information'
-complete -c cargo -n "__fish_seen_subcommand_from doc" -s V -l version -d 'Prints version information'
-complete -c cargo -n "__fish_seen_subcommand_from doc" -s v -l verbose -d 'Use verbose output (-vv very verbose/build.rs output)'
-complete -c cargo -n "__fish_seen_subcommand_from doc" -l frozen -d 'Require Cargo.lock and cache are up to date'
-complete -c cargo -n "__fish_seen_subcommand_from doc" -l locked -d 'Require Cargo.lock is up to date'
-complete -c cargo -n "__fish_seen_subcommand_from doc" -l offline -d 'Run without accessing the network'
+complete -c cargo -n "__fish_seen_subcommand_from d doc" -s p -l package -d 'Package to document'
+complete -c cargo -n "__fish_seen_subcommand_from d doc" -l exclude -d 'Exclude packages from the build'
+complete -c cargo -n "__fish_seen_subcommand_from d doc" -s j -l jobs -d 'Number of parallel jobs, defaults to # of CPUs'
+complete -c cargo -n "__fish_seen_subcommand_from d doc" -l bin -d 'Document only the specified binary'
+complete -c cargo -n "__fish_seen_subcommand_from d doc" -l profile -d 'Build artifacts with the specified profile'
+complete -c cargo -n "__fish_seen_subcommand_from d doc" -l features -d 'Space or comma separated list of features to activate' -xa "(__fish_cargo_features)"
+complete -c cargo -n "__fish_seen_subcommand_from d doc" -l target -d 'Build for the target triple' -xa "(__fish_cargo_targets)"
+complete -c cargo -n "__fish_seen_subcommand_from d doc" -l target-dir -d 'Directory for all generated artifacts'
+complete -c cargo -n "__fish_seen_subcommand_from d doc" -l manifest-path -d 'Path to Cargo.toml'
+complete -c cargo -n "__fish_seen_subcommand_from d doc" -l message-format -d 'Error format'
+complete -c cargo -n "__fish_seen_subcommand_from d doc" -l color -d 'Coloring: auto, always, never'
+complete -c cargo -n "__fish_seen_subcommand_from d doc" -l config -d 'Override a configuration value (unstable)'
+complete -c cargo -n "__fish_seen_subcommand_from d doc" -s Z -d 'Unstable (nightly-only) flags to Cargo, see \'cargo -Z help\' for details'
+complete -c cargo -n "__fish_seen_subcommand_from d doc" -s q -l quiet -d 'No output printed to stdout'
+complete -c cargo -n "__fish_seen_subcommand_from d doc" -l open -d 'Opens the docs in a browser after the operation'
+complete -c cargo -n "__fish_seen_subcommand_from d doc" -l workspace -d 'Document all packages in the workspace'
+complete -c cargo -n "__fish_seen_subcommand_from d doc" -l no-deps -d 'Don\'t build documentation for dependencies'
+complete -c cargo -n "__fish_seen_subcommand_from d doc" -l document-private-items -d 'Document private items'
+complete -c cargo -n "__fish_seen_subcommand_from d doc" -l lib -d 'Document only this package\'s library'
+complete -c cargo -n "__fish_seen_subcommand_from d doc" -l bins -d 'Document all binaries'
+complete -c cargo -n "__fish_seen_subcommand_from d doc" -l release -d 'Build artifacts in release mode, with optimizations'
+complete -c cargo -n "__fish_seen_subcommand_from d doc" -l all-features -d 'Activate all available features'
+complete -c cargo -n "__fish_seen_subcommand_from d doc" -l no-default-features -d 'Do not activate the `default` feature'
+complete -c cargo -n "__fish_seen_subcommand_from d doc" -l ignore-rust-version -d 'Ignore `rust-version` specification in packages (unstable)'
+complete -c cargo -n "__fish_seen_subcommand_from d doc" -l unit-graph -d 'Output build graph in JSON (unstable)'
+complete -c cargo -n "__fish_seen_subcommand_from d doc" -s h -l help -d 'Prints help information'
+complete -c cargo -n "__fish_seen_subcommand_from d doc" -s V -l version -d 'Prints version information'
+complete -c cargo -n "__fish_seen_subcommand_from d doc" -s v -l verbose -d 'Use verbose output (-vv very verbose/build.rs output)'
+complete -c cargo -n "__fish_seen_subcommand_from d doc" -l frozen -d 'Require Cargo.lock and cache are up to date'
+complete -c cargo -n "__fish_seen_subcommand_from d doc" -l locked -d 'Require Cargo.lock is up to date'
+complete -c cargo -n "__fish_seen_subcommand_from d doc" -l offline -d 'Run without accessing the network'
 complete -c cargo -n "__fish_seen_subcommand_from fetch" -l manifest-path -d 'Path to Cargo.toml'
 complete -c cargo -n "__fish_seen_subcommand_from fetch" -l target -d 'Fetch dependencies for the target triple' -xa "(__fish_cargo_targets)"
 complete -c cargo -n "__fish_seen_subcommand_from fetch" -l color -d 'Coloring: auto, always, never'
@@ -547,31 +547,31 @@ complete -c cargo -n "__fish_seen_subcommand_from read-manifest" -s v -l verbose
 complete -c cargo -n "__fish_seen_subcommand_from read-manifest" -l frozen -d 'Require Cargo.lock and cache are up to date'
 complete -c cargo -n "__fish_seen_subcommand_from read-manifest" -l locked -d 'Require Cargo.lock is up to date'
 complete -c cargo -n "__fish_seen_subcommand_from read-manifest" -l offline -d 'Run without accessing the network'
-complete -c cargo -n "__fish_seen_subcommand_from run" -l bin -d 'Name of the bin target to run'
-complete -c cargo -n "__fish_seen_subcommand_from run" -l example -d 'Name of the example target to run'
-complete -c cargo -n "__fish_seen_subcommand_from run" -s p -l package -d 'Package with the target to run'
-complete -c cargo -n "__fish_seen_subcommand_from run" -s j -l jobs -d 'Number of parallel jobs, defaults to # of CPUs'
-complete -c cargo -n "__fish_seen_subcommand_from run" -l profile -d 'Build artifacts with the specified profile'
-complete -c cargo -n "__fish_seen_subcommand_from run" -l features -d 'Space or comma separated list of features to activate' -xa "(__fish_cargo_features)"
-complete -c cargo -n "__fish_seen_subcommand_from run" -l target -d 'Build for the target triple' -xa "(__fish_cargo_targets)"
-complete -c cargo -n "__fish_seen_subcommand_from run" -l target-dir -d 'Directory for all generated artifacts'
-complete -c cargo -n "__fish_seen_subcommand_from run" -l manifest-path -d 'Path to Cargo.toml'
-complete -c cargo -n "__fish_seen_subcommand_from run" -l message-format -d 'Error format'
-complete -c cargo -n "__fish_seen_subcommand_from run" -l color -d 'Coloring: auto, always, never'
-complete -c cargo -n "__fish_seen_subcommand_from run" -l config -d 'Override a configuration value (unstable)'
-complete -c cargo -n "__fish_seen_subcommand_from run" -s Z -d 'Unstable (nightly-only) flags to Cargo, see \'cargo -Z help\' for details'
-complete -c cargo -n "__fish_seen_subcommand_from run" -s q -l quiet -d 'No output printed to stdout'
-complete -c cargo -n "__fish_seen_subcommand_from run" -l release -d 'Build artifacts in release mode, with optimizations'
-complete -c cargo -n "__fish_seen_subcommand_from run" -l all-features -d 'Activate all available features'
-complete -c cargo -n "__fish_seen_subcommand_from run" -l no-default-features -d 'Do not activate the `default` feature'
-complete -c cargo -n "__fish_seen_subcommand_from run" -l unit-graph -d 'Output build graph in JSON (unstable)'
-complete -c cargo -n "__fish_seen_subcommand_from run" -l ignore-rust-version -d 'Ignore `rust-version` specification in packages (unstable)'
-complete -c cargo -n "__fish_seen_subcommand_from run" -s h -l help -d 'Prints help information'
-complete -c cargo -n "__fish_seen_subcommand_from run" -s V -l version -d 'Prints version information'
-complete -c cargo -n "__fish_seen_subcommand_from run" -s v -l verbose -d 'Use verbose output (-vv very verbose/build.rs output)'
-complete -c cargo -n "__fish_seen_subcommand_from run" -l frozen -d 'Require Cargo.lock and cache are up to date'
-complete -c cargo -n "__fish_seen_subcommand_from run" -l locked -d 'Require Cargo.lock is up to date'
-complete -c cargo -n "__fish_seen_subcommand_from run" -l offline -d 'Run without accessing the network'
+complete -c cargo -n "__fish_seen_subcommand_from r run" -l bin -d 'Name of the bin target to run'
+complete -c cargo -n "__fish_seen_subcommand_from r run" -l example -d 'Name of the example target to run'
+complete -c cargo -n "__fish_seen_subcommand_from r run" -s p -l package -d 'Package with the target to run'
+complete -c cargo -n "__fish_seen_subcommand_from r run" -s j -l jobs -d 'Number of parallel jobs, defaults to # of CPUs'
+complete -c cargo -n "__fish_seen_subcommand_from r run" -l profile -d 'Build artifacts with the specified profile'
+complete -c cargo -n "__fish_seen_subcommand_from r run" -l features -d 'Space or comma separated list of features to activate' -xa "(__fish_cargo_features)"
+complete -c cargo -n "__fish_seen_subcommand_from r run" -l target -d 'Build for the target triple' -xa "(__fish_cargo_targets)"
+complete -c cargo -n "__fish_seen_subcommand_from r run" -l target-dir -d 'Directory for all generated artifacts'
+complete -c cargo -n "__fish_seen_subcommand_from r run" -l manifest-path -d 'Path to Cargo.toml'
+complete -c cargo -n "__fish_seen_subcommand_from r run" -l message-format -d 'Error format'
+complete -c cargo -n "__fish_seen_subcommand_from r run" -l color -d 'Coloring: auto, always, never'
+complete -c cargo -n "__fish_seen_subcommand_from r run" -l config -d 'Override a configuration value (unstable)'
+complete -c cargo -n "__fish_seen_subcommand_from r run" -s Z -d 'Unstable (nightly-only) flags to Cargo, see \'cargo -Z help\' for details'
+complete -c cargo -n "__fish_seen_subcommand_from r run" -s q -l quiet -d 'No output printed to stdout'
+complete -c cargo -n "__fish_seen_subcommand_from r run" -l release -d 'Build artifacts in release mode, with optimizations'
+complete -c cargo -n "__fish_seen_subcommand_from r run" -l all-features -d 'Activate all available features'
+complete -c cargo -n "__fish_seen_subcommand_from r run" -l no-default-features -d 'Do not activate the `default` feature'
+complete -c cargo -n "__fish_seen_subcommand_from r run" -l unit-graph -d 'Output build graph in JSON (unstable)'
+complete -c cargo -n "__fish_seen_subcommand_from r run" -l ignore-rust-version -d 'Ignore `rust-version` specification in packages (unstable)'
+complete -c cargo -n "__fish_seen_subcommand_from r run" -s h -l help -d 'Prints help information'
+complete -c cargo -n "__fish_seen_subcommand_from r run" -s V -l version -d 'Prints version information'
+complete -c cargo -n "__fish_seen_subcommand_from r run" -s v -l verbose -d 'Use verbose output (-vv very verbose/build.rs output)'
+complete -c cargo -n "__fish_seen_subcommand_from r run" -l frozen -d 'Require Cargo.lock and cache are up to date'
+complete -c cargo -n "__fish_seen_subcommand_from r run" -l locked -d 'Require Cargo.lock is up to date'
+complete -c cargo -n "__fish_seen_subcommand_from r run" -l offline -d 'Run without accessing the network'
 complete -c cargo -n "__fish_seen_subcommand_from rustc" -s p -l package -d 'Package to build'
 complete -c cargo -n "__fish_seen_subcommand_from rustc" -s j -l jobs -d 'Number of parallel jobs, defaults to # of CPUs'
 complete -c cargo -n "__fish_seen_subcommand_from rustc" -l bin -d 'Build only the specified binary'
@@ -654,45 +654,45 @@ complete -c cargo -n "__fish_seen_subcommand_from search" -s v -l verbose -d 'Us
 complete -c cargo -n "__fish_seen_subcommand_from search" -l frozen -d 'Require Cargo.lock and cache are up to date'
 complete -c cargo -n "__fish_seen_subcommand_from search" -l locked -d 'Require Cargo.lock is up to date'
 complete -c cargo -n "__fish_seen_subcommand_from search" -l offline -d 'Run without accessing the network'
-complete -c cargo -n "__fish_seen_subcommand_from test" -l bin -d 'Test only the specified binary'
-complete -c cargo -n "__fish_seen_subcommand_from test" -l example -d 'Test only the specified example'
-complete -c cargo -n "__fish_seen_subcommand_from test" -l test -d 'Test only the specified test target'
-complete -c cargo -n "__fish_seen_subcommand_from test" -l bench -d 'Test only the specified bench target'
-complete -c cargo -n "__fish_seen_subcommand_from test" -s p -l package -d 'Package to run tests for'
-complete -c cargo -n "__fish_seen_subcommand_from test" -l exclude -d 'Exclude packages from the test'
-complete -c cargo -n "__fish_seen_subcommand_from test" -s j -l jobs -d 'Number of parallel jobs, defaults to # of CPUs'
-complete -c cargo -n "__fish_seen_subcommand_from test" -l profile -d 'Build artifacts with the specified profile'
-complete -c cargo -n "__fish_seen_subcommand_from test" -l features -d 'Space or comma separated list of features to activate' -xa "(__fish_cargo_features)"
-complete -c cargo -n "__fish_seen_subcommand_from test" -l target -d 'Build for the target triple' -xa "(__fish_cargo_targets)"
-complete -c cargo -n "__fish_seen_subcommand_from test" -l target-dir -d 'Directory for all generated artifacts'
-complete -c cargo -n "__fish_seen_subcommand_from test" -l manifest-path -d 'Path to Cargo.toml'
-complete -c cargo -n "__fish_seen_subcommand_from test" -l message-format -d 'Error format'
-complete -c cargo -n "__fish_seen_subcommand_from test" -l color -d 'Coloring: auto, always, never'
-complete -c cargo -n "__fish_seen_subcommand_from test" -l config -d 'Override a configuration value (unstable)'
-complete -c cargo -n "__fish_seen_subcommand_from test" -s Z -d 'Unstable (nightly-only) flags to Cargo, see \'cargo -Z help\' for details'
-complete -c cargo -n "__fish_seen_subcommand_from test" -s q -l quiet -d 'Display one character per test instead of one line'
-complete -c cargo -n "__fish_seen_subcommand_from test" -l lib -d 'Test only this package\'s library unit tests'
-complete -c cargo -n "__fish_seen_subcommand_from test" -l bins -d 'Test all binaries'
-complete -c cargo -n "__fish_seen_subcommand_from test" -l examples -d 'Test all examples'
-complete -c cargo -n "__fish_seen_subcommand_from test" -l tests -d 'Test all tests'
-complete -c cargo -n "__fish_seen_subcommand_from test" -l benches -d 'Test all benches'
-complete -c cargo -n "__fish_seen_subcommand_from test" -l all-targets -d 'Test all targets'
-complete -c cargo -n "__fish_seen_subcommand_from test" -l doc -d 'Test only this library\'s documentation'
-complete -c cargo -n "__fish_seen_subcommand_from test" -l no-run -d 'Compile, but don\'t run tests'
-complete -c cargo -n "__fish_seen_subcommand_from test" -l no-fail-fast -d 'Run all tests regardless of failure'
-complete -c cargo -n "__fish_seen_subcommand_from test" -l workspace -d 'Test all packages in the workspace'
-complete -c cargo -n "__fish_seen_subcommand_from test" -l release -d 'Build artifacts in release mode, with optimizations'
-complete -c cargo -n "__fish_seen_subcommand_from test" -l all-features -d 'Activate all available features'
-complete -c cargo -n "__fish_seen_subcommand_from test" -l no-default-features -d 'Do not activate the `default` feature'
-complete -c cargo -n "__fish_seen_subcommand_from test" -l ignore-rust-version -d 'Ignore `rust-version` specification in packages (unstable)'
-complete -c cargo -n "__fish_seen_subcommand_from test" -l unit-graph -d 'Output build graph in JSON (unstable)'
-complete -c cargo -n "__fish_seen_subcommand_from test" -l future-incompat-report -d 'Outputs a future incompatibility report at the end of the build (unstable)'
-complete -c cargo -n "__fish_seen_subcommand_from test" -s h -l help -d 'Prints help information'
-complete -c cargo -n "__fish_seen_subcommand_from test" -s V -l version -d 'Prints version information'
-complete -c cargo -n "__fish_seen_subcommand_from test" -s v -l verbose -d 'Use verbose output (-vv very verbose/build.rs output)'
-complete -c cargo -n "__fish_seen_subcommand_from test" -l frozen -d 'Require Cargo.lock and cache are up to date'
-complete -c cargo -n "__fish_seen_subcommand_from test" -l locked -d 'Require Cargo.lock is up to date'
-complete -c cargo -n "__fish_seen_subcommand_from test" -l offline -d 'Run without accessing the network'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -l bin -d 'Test only the specified binary'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -l example -d 'Test only the specified example'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -l test -d 'Test only the specified test target'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -l bench -d 'Test only the specified bench target'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -s p -l package -d 'Package to run tests for'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -l exclude -d 'Exclude packages from the test'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -s j -l jobs -d 'Number of parallel jobs, defaults to # of CPUs'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -l profile -d 'Build artifacts with the specified profile'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -l features -d 'Space or comma separated list of features to activate' -xa "(__fish_cargo_features)"
+complete -c cargo -n "__fish_seen_subcommand_from t test" -l target -d 'Build for the target triple' -xa "(__fish_cargo_targets)"
+complete -c cargo -n "__fish_seen_subcommand_from t test" -l target-dir -d 'Directory for all generated artifacts'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -l manifest-path -d 'Path to Cargo.toml'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -l message-format -d 'Error format'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -l color -d 'Coloring: auto, always, never'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -l config -d 'Override a configuration value (unstable)'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -s Z -d 'Unstable (nightly-only) flags to Cargo, see \'cargo -Z help\' for details'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -s q -l quiet -d 'Display one character per test instead of one line'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -l lib -d 'Test only this package\'s library unit tests'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -l bins -d 'Test all binaries'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -l examples -d 'Test all examples'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -l tests -d 'Test all tests'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -l benches -d 'Test all benches'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -l all-targets -d 'Test all targets'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -l doc -d 'Test only this library\'s documentation'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -l no-run -d 'Compile, but don\'t run tests'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -l no-fail-fast -d 'Run all tests regardless of failure'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -l workspace -d 'Test all packages in the workspace'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -l release -d 'Build artifacts in release mode, with optimizations'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -l all-features -d 'Activate all available features'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -l no-default-features -d 'Do not activate the `default` feature'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -l ignore-rust-version -d 'Ignore `rust-version` specification in packages (unstable)'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -l unit-graph -d 'Output build graph in JSON (unstable)'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -l future-incompat-report -d 'Outputs a future incompatibility report at the end of the build (unstable)'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -s h -l help -d 'Prints help information'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -s V -l version -d 'Prints version information'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -s v -l verbose -d 'Use verbose output (-vv very verbose/build.rs output)'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -l frozen -d 'Require Cargo.lock and cache are up to date'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -l locked -d 'Require Cargo.lock is up to date'
+complete -c cargo -n "__fish_seen_subcommand_from t test" -l offline -d 'Run without accessing the network'
 complete -c cargo -n "__fish_seen_subcommand_from tree" -l manifest-path -d 'Path to Cargo.toml'
 complete -c cargo -n "__fish_seen_subcommand_from tree" -s p -l package -d 'Package to be used as the root of the tree'
 complete -c cargo -n "__fish_seen_subcommand_from tree" -l exclude -d 'Exclude specific workspace members'