|
@@ -1,24 +1,11 @@
|
|
|
-if ! (( $+commands[rustup] && $+commands[cargo] )); then
|
|
|
- return
|
|
|
-fi
|
|
|
+print ${(%):-'%F{yellow}The `cargo` 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}/_cargo"
|
|
|
|
|
|
-# Add completions/ folder in $ZSH_CACHE_DIR
|
|
|
-comp_file="$ZSH_CACHE_DIR/completions/_cargo"
|
|
|
-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 `cargo`. Otherwise, compinit will have already done that
|
|
|
-if [[ ! -f "$comp_file" ]]; then
|
|
|
- autoload -Uz _cargo
|
|
|
- declare -A _comps
|
|
|
- _comps[cargo]=_cargo
|
|
|
-fi
|
|
|
-
|
|
|
-# Generate completion file in the background
|
|
|
-rustup completions zsh cargo >| "$comp_file" &|
|
|
|
-unset comp_file
|
|
|
+(( ${fpath[(Ie)$ZSH/plugins/rust]} )) || {
|
|
|
+ fpath=("$ZSH/plugins/rust" $fpath)
|
|
|
+ source "$ZSH/plugins/rust/rust.plugin.zsh"
|
|
|
+}
|