Merge ce84456118 into cae2e45193

Closes #12900

lib/cli.zsh

@@ -1,6 +1,7 @@
 #!/usr/bin/env zsh
 
 function omz {
+  setopt localoptions noksharrays
   [[ $# -gt 0 ]] || {
     _omz::help
     return 1

plugins/git-town/README.md

@@ -0,0 +1,24 @@
+# Git-Town plugin
+
+This plugin adds completion and aliases for the `git-town` command. More information
+at https://www.git-town.com.
+
+Enable git-town plugin in your zshrc file:
+```
+plugins=(... git-town)
+```
+
+## Aliases
+
+More information about `git-town` commands:
+https://github.com/Originate/git-town#commands
+
+| Alias   | Command                    | Description                            |
+|---------|----------------------------|----------------------------------------|
+| `gt`    | `git town`                 | Git-Town command                       |
+| `gtab`  | `git town abort`           | Aborts the last run git-town command   |
+| `gtc`   | `git town continue`        | Restarts last after resolved conflict  |
+| `gth`   | `git town hack`            | New feature branch off main branch     |
+| `gtsy`  | `git town sync`            | Updates current branch w/ all changes  |
+| `gtnpr` | `git town new-pull-request`| Create a new pull request              |
+| `gtsh`  | `git town ship`            | Delivers feature branch and removes it |

plugins/git-town/git-town.plugin.zsh

@@ -0,0 +1,23 @@
+#!zsh
+#
+# Installation
+# ------------
+#
+# WIP
+
+#Alias
+| `gt`    | `git town`                 | Git-Town command                       |
+| `gtab`  | `git town abort`           | Aborts the last run git-town command   |
+| `gtc`   | `git town continue`        | Restarts last after resolved conflict  |
+| `gth`   | `git town hack`            | New feature branch off main branch     |
+| `gtsy`  | `git town sync`            | Updates current branch w/ all changes  |
+| `gtnpr` | `git town new-pull-request`| Create a new pull request              |
+| `gtsh`  | `git town ship`            | Delivers feature branch and removes it |
+
+alias gt='git town'
+alias gta='git town abort'
+alias gtc='git town continue'
+alias gth='git town hack'
+alias gtsy='git town sync'
+alias gtnpr='git town new-pull-request'
+alias gtsh='git town ship'

plugins/rust/rust.plugin.zsh

@@ -22,5 +22,5 @@ fi
 rustup completions zsh >| "$ZSH_CACHE_DIR/completions/_rustup" &|
 cat >| "$ZSH_CACHE_DIR/completions/_cargo" <<'EOF'
 #compdef cargo
-source "$(rustc +${${(z)$(rustup default)}[1]} --print sysroot)"/share/zsh/site-functions/_cargo
+source "$(rustup run ${${(z)$(rustup default)}[1]} rustc --print sysroot)"/share/zsh/site-functions/_cargo
 EOF