From 89a740be2d5487c96f01e4eaae7e280caf555019 Mon Sep 17 00:00:00 2001 From: Carlo Sala Date: Wed, 6 Oct 2021 22:43:09 +0200 Subject: refactor(rust)!: merge `cargo` and `rustup` plugins into `rust` plugin (#10270) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BREAKING CHANGE: `cargo` and `rustup` plugins have been moved to the `rust` plugin since they're part of the Rust toolchain. If you're using these, update your .zshrc file to use `rust` instead. Closes #10270 Co-authored-by: Marc Cornellà --- plugins/rustup/rustup.plugin.zsh | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) (limited to 'plugins/rustup/rustup.plugin.zsh') diff --git a/plugins/rustup/rustup.plugin.zsh b/plugins/rustup/rustup.plugin.zsh index af8cf03a2..0ca745b7e 100644 --- a/plugins/rustup/rustup.plugin.zsh +++ b/plugins/rustup/rustup.plugin.zsh @@ -1,24 +1,11 @@ -if (( ! $+commands[rustup] )); then - return -fi +print ${(%):-'%F{yellow}The `rustup` plugin is deprecated and has been moved to the `rust` plugin.'} +print ${(%):-'Please update your .zshrc to use the `%Brust%b` plugin instead.%f'} # Remove old generated completion file -# TODO: 2021-09-15: remove this line +# TODO: 2021-12-28: remove this line command rm -f "${0:A:h}/_rustup" -# Add completions/ folder in $ZSH_CACHE_DIR -comp_file="$ZSH_CACHE_DIR/completions/_rustup" -command mkdir -p "${comp_file:h}" -(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath) - -# If the completion file doesn't exist yet, we need to autoload it and -# bind it to `rustup`. Otherwise, compinit will have already done that -if [[ ! -f "$comp_file" ]]; then - autoload -Uz _rustup - declare -A _comps - _comps[rustup]=_rustup -fi - -# Generate completion file in the background -rustup completions zsh >| "$comp_file" &| -unset comp_file +(( ${fpath[(Ie)$ZSH/plugins/rust]} )) || { + fpath=("$ZSH/plugins/rust" $fpath) + source "$ZSH/plugins/rust/rust.plugin.zsh" +} -- cgit v1.2.3-70-g09d2