Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 21:33:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

completions/rustup: Filter out installed components from rustup component add

Browse source
This commit is contained in:
Mahmoud Al-Qudsi 2024-05-08 18:47:15 -05:00
parent 671d128a3e
commit 2ca92cd52d
1 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
share/completions/rustup.fish
View file

@ -24,13 +24,24 @@ set -l rustup_show \
# rustup does not really expose a mechanism of retrieving a list of all valid components without the archs appended # rustup does not really expose a mechanism of retrieving a list of all valid components without the archs appended
# Just print the list of installable x86_64-unknown-linux-gnu components for everyone # Just print the list of installable x86_64-unknown-linux-gnu components for everyone
function __rustup_components function __rustup_components
rustup component list | string match -r "\S+" | string replace -rf -- "-x86_64-unknown-linux-gnu.*" "" rustup component list | string match -r "\S+" | string replace -rf -- "-x86_64-unknown-linux-gnu.*" "" | sort -u
end end
# function __rustup_installable_components function __rustup_installed_components
# set -l not_installed (comm -2 -3 (printf "%s\n" $__rustup_components | psub -F) (rustup component list --installed | psub -F) 2>/dev/null) # If the user has supplied `--toolchain foo`, use it to filter the list
# __rustup_strip_common_suffix_strict $not_installed set -l toolchain (commandline -j | string replace -rf ".*\s--toolchain\s+(\S+)\s.*" '$1')
# end set -l toolchain_filter
if string match -qr . -- $toolchain
set toolchain_filter "--toolchain $toolchain"
end
rustup component list --installed $toolchain_filter | string replace -r -- (printf -- "-%s\n" (__rustup_targets) | string join "|") "" | sort -u
end
function __rustup_installable_components
comm -2 -3 (__rustup_components | psub -F) (__rustup_installed_components | psub -F)
end
# All *valid* target triples, retrieved from source # All *valid* target triples, retrieved from source
function __rustup_triples function __rustup_triples
@ -204,19 +215,6 @@ function __rustup_installable_toolchains
2>/dev/null 2>/dev/null
end end
function __rustup_installed_components
# If the user has supplied `--toolchain foo`, use it to filter the list
set -l toolchain (commandline -j | string replace -rf ".*\s--toolchain\s+(\S+)\s.*" '$1')
set -l toolchain_filter
if string match -qr . -- $toolchain
set toolchain_filter "--toolchain $toolchain"
end
set -l installed (rustup component list --installed $toolchain_filter)
__rustup_strip_common_suffix_strict $installed
end
function __rustup_targets function __rustup_targets
rustup target list | string replace -rf "^(\S+).*" '$1' rustup target list | string replace -rf "^(\S+).*" '$1'
end end
@ -263,7 +261,7 @@ complete -c rustup -n "__fish_seen_subcommand_from toolchain; and __fish_prev_ar
complete -c rustup -n "__fish_seen_subcommand_from component; and __fish_prev_arg_in remove uninstall" \ complete -c rustup -n "__fish_seen_subcommand_from component; and __fish_prev_arg_in remove uninstall" \
-xa "(__rustup_installed_components)" -xa "(__rustup_installed_components)"
complete -c rustup -n "__fish_seen_subcommand_from component; and __fish_prev_arg_in add install" \ complete -c rustup -n "__fish_seen_subcommand_from component; and __fish_prev_arg_in add install" \
-xa "(__rustup_components)" -xa "(__rustup_installable_components)"
complete -c rustup -n "__fish_seen_subcommand_from target; and __fish_prev_arg_in add install" \ complete -c rustup -n "__fish_seen_subcommand_from target; and __fish_prev_arg_in add install" \
-xa "(__rustup_installable_targets)" -xa "(__rustup_installable_targets)"