Merge remote-tracking branch 'chhschou/master' into staging_065

Conflicts were:
- powerlevel9k.zsh-theme and test/segments/rust_version.spec:
rust_version Segment changed (#641) on master and colors got
names (#703) on next.
This commit is contained in:
Dominik Ritter 2018-06-07 00:44:47 +02:00
commit e763fa14b0
3 changed files with 6 additions and 5 deletions

View file

@ -1273,9 +1273,9 @@ prompt_root_indicator() {
prompt_rust_version() {
local rust_version
rust_version=$(rustc --version 2>&1 | grep -oe "^rustc\s*[^ ]*" | grep -o '[0-9.a-z\\\-]*$')
if [[ -n "$rust_version" ]]; then
"$1_prompt_segment" "$0" "$2" "darkorange" "$DEFAULT_COLOR" "Rust $rust_version" 'RUST_ICON'
"$1_prompt_segment" "$0" "$2" "darkorange" "$DEFAULT_COLOR" "$rust_version" 'RUST_ICON'
fi
}