Hello community, here is the log from the commit of package rust for openSUSE:Factory checked in at 2018-06-15 14:32:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rust (Old) and /work/SRC/openSUSE:Factory/.rust.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rust" Fri Jun 15 14:32:45 2018 rev:29 rq:615102 version:1.26.2 Changes: -------- --- /work/SRC/openSUSE:Factory/rust/rust.changes 2018-06-02 11:49:05.762717196 +0200 +++ /work/SRC/openSUSE:Factory/.rust.new/rust.changes 2018-06-15 14:32:52.457753232 +0200 @@ -1,0 +2,16 @@ +Wed Jun 6 10:37:27 UTC 2018 - [email protected] + +- Update to version 1.26.2: + + Compatibility Notes + - The borrow checker was fixed to avoid unsoundness when using match ergonomics +- Update to version 1.26.1: + + Tools + - RLS now works on Windows + - Rustfmt stopped badly formatting text in some cases + + Compatibility Notes + - `fn main() -> impl Trait` no longer works for non-Termination trait + This reverts an accidental stabilization + - `NaN > NaN` no longer returns true in const-fn contexts + - Prohibit using turbofish for `impl Trait` in method arguments + +------------------------------------------------------------------- Old: ---- cargo-0.26.0-aarch64-unknown-linux-gnu.tar.gz cargo-0.26.0-arm-unknown-linux-gnueabihf.tar.gz cargo-0.26.0-armv7-unknown-linux-gnueabihf.tar.gz cargo-0.26.0-i686-unknown-linux-gnu.tar.gz cargo-0.26.0-powerpc64-unknown-linux-gnu.tar.gz cargo-0.26.0-powerpc64le-unknown-linux-gnu.tar.gz cargo-0.26.0-s390x-unknown-linux-gnu.tar.gz cargo-0.26.0-x86_64-unknown-linux-gnu.tar.gz rustc-1.26.0-src.tar.gz New: ---- cargo-0.27.0-aarch64-unknown-linux-gnu.tar.gz cargo-0.27.0-arm-unknown-linux-gnueabihf.tar.gz cargo-0.27.0-armv7-unknown-linux-gnueabihf.tar.gz cargo-0.27.0-i686-unknown-linux-gnu.tar.gz cargo-0.27.0-powerpc64-unknown-linux-gnu.tar.gz cargo-0.27.0-powerpc64le-unknown-linux-gnu.tar.gz cargo-0.27.0-s390x-unknown-linux-gnu.tar.gz cargo-0.27.0-x86_64-unknown-linux-gnu.tar.gz rustc-1.26.2-src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rust.spec ++++++ --- /var/tmp/diff_new_pack.TWlHH7/_old 2018-06-15 14:32:58.677525731 +0200 +++ /var/tmp/diff_new_pack.TWlHH7/_new 2018-06-15 14:32:58.681525585 +0200 @@ -18,7 +18,7 @@ %global prev_rust 1.25.0 -%global cargo_version 0.26.0 +%global cargo_version 0.27.0 %global rust_arch %{_arch} %global abi gnu %ifarch armv7hl @@ -45,7 +45,7 @@ %global rustlibdir %{common_libdir}/rustlib %bcond_with rust_bootstrap Name: rust -Version: 1.26.0 +Version: 1.26.2 Release: 0 Summary: A systems programming language License: MIT OR Apache-2.0 ++++++ cargo-0.26.0-aarch64-unknown-linux-gnu.tar.gz -> cargo-0.27.0-aarch64-unknown-linux-gnu.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.26.0-aarch64-unknown-linux-gnu/README.md new/cargo-0.27.0-aarch64-unknown-linux-gnu/README.md --- old/cargo-0.26.0-aarch64-unknown-linux-gnu/README.md 2018-03-25 18:20:36.000000000 +0200 +++ new/cargo-0.27.0-aarch64-unknown-linux-gnu/README.md 2018-05-07 20:54:00.000000000 +0200 @@ -29,7 +29,7 @@ First, you'll want to check out this repository ``` -git clone --recursive https://github.com/rust-lang/cargo +git clone https://github.com/rust-lang/cargo cd cargo ``` Binary files old/cargo-0.26.0-aarch64-unknown-linux-gnu/cargo/bin/cargo and new/cargo-0.27.0-aarch64-unknown-linux-gnu/cargo/bin/cargo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.26.0-aarch64-unknown-linux-gnu/cargo/etc/bash_completion.d/cargo new/cargo-0.27.0-aarch64-unknown-linux-gnu/cargo/etc/bash_completion.d/cargo --- old/cargo-0.26.0-aarch64-unknown-linux-gnu/cargo/etc/bash_completion.d/cargo 2018-03-25 18:20:36.000000000 +0200 +++ new/cargo-0.27.0-aarch64-unknown-linux-gnu/cargo/etc/bash_completion.d/cargo 2018-05-07 20:54:00.000000000 +0200 @@ -1,12 +1,21 @@ command -v cargo >/dev/null 2>&1 && _cargo() { - local cur prev words cword cmd + local cur prev words cword _get_comp_words_by_ref cur prev words cword COMPREPLY=() - cmd=${words[1]} + # Skip past - and + options to find the command. + local nwords=${#words[@]} + local cmd_i cmd + for (( cmd_i=1; cmd_i<$nwords; cmd_i++ )); + do + if [[ ! "${words[$cmd_i]}" =~ ^[+-] ]]; then + cmd="${words[$cmd_i]}" + break + fi + done local vcs='git hg none' local color='auto always never' @@ -57,13 +66,16 @@ local opt__version="$opt_help $opt_verbose $opt_color" local opt__yank="$opt_common $opt_lock --vers --undo --index --token" - if [[ $cword -eq 1 ]]; then + if [[ $cmd_i -ge $nwords-1 ]]; then + # Completion before or at the command. if [[ "$cur" == -* ]]; then COMPREPLY=( $( compgen -W "${opt___nocmd}" -- "$cur" ) ) + elif [[ "$cur" == +* ]]; then + COMPREPLY=( $( compgen -W "$(_toolchains)" -- "$cur" ) ) else COMPREPLY=( $( compgen -W "$__cargo_commands" -- "$cur" ) ) fi - elif [[ $cword -ge 2 ]]; then + else case "${prev}" in --vcs) COMPREPLY=( $( compgen -W "$vcs" -- "$cur" ) ) @@ -208,4 +220,27 @@ done echo "${TARGETS[@]}" } + +_toolchains(){ + local result=() + local toolchains=$(rustup toolchain list) + local channels="nightly|beta|stable|[0-9]\.[0-9]{1,2}\.[0-9]" + local date="[0-9]{4}-[0-9]{2}-[0-9]{2}" + while read line + do + # Strip " (default)" + line=${line%% *} + if [[ "$line" =~ ^($channels)(-($date))?(-.*) ]]; then + if [[ -z ${BASH_REMATCH[3]} ]]; then + result+=("+${BASH_REMATCH[1]}") + else + # channel-date + result+=("+${BASH_REMATCH[1]}-${BASH_REMATCH[3]}") + fi + result+=("+$line") + fi + done <<< "$toolchains" + echo "${result[@]}" +} + # vim:ft=sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.26.0-aarch64-unknown-linux-gnu/cargo/share/doc/cargo/README.md new/cargo-0.27.0-aarch64-unknown-linux-gnu/cargo/share/doc/cargo/README.md --- old/cargo-0.26.0-aarch64-unknown-linux-gnu/cargo/share/doc/cargo/README.md 2018-03-25 18:20:36.000000000 +0200 +++ new/cargo-0.27.0-aarch64-unknown-linux-gnu/cargo/share/doc/cargo/README.md 2018-05-07 20:54:00.000000000 +0200 @@ -29,7 +29,7 @@ First, you'll want to check out this repository ``` -git clone --recursive https://github.com/rust-lang/cargo +git clone https://github.com/rust-lang/cargo cd cargo ``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.26.0-aarch64-unknown-linux-gnu/version new/cargo-0.27.0-aarch64-unknown-linux-gnu/version --- old/cargo-0.26.0-aarch64-unknown-linux-gnu/version 2018-03-25 18:20:36.000000000 +0200 +++ new/cargo-0.27.0-aarch64-unknown-linux-gnu/version 2018-05-07 20:54:00.000000000 +0200 @@ -1 +1 @@ -0.26.0 (41480f5cc 2018-02-26) \ No newline at end of file +0.27.0 (0e7c5a931 2018-04-06) \ No newline at end of file ++++++ cargo-0.26.0-arm-unknown-linux-gnueabihf.tar.gz -> cargo-0.27.0-arm-unknown-linux-gnueabihf.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.26.0-arm-unknown-linux-gnueabihf/README.md new/cargo-0.27.0-arm-unknown-linux-gnueabihf/README.md --- old/cargo-0.26.0-arm-unknown-linux-gnueabihf/README.md 2018-03-25 18:13:38.000000000 +0200 +++ new/cargo-0.27.0-arm-unknown-linux-gnueabihf/README.md 2018-05-07 20:46:18.000000000 +0200 @@ -29,7 +29,7 @@ First, you'll want to check out this repository ``` -git clone --recursive https://github.com/rust-lang/cargo +git clone https://github.com/rust-lang/cargo cd cargo ``` Binary files old/cargo-0.26.0-arm-unknown-linux-gnueabihf/cargo/bin/cargo and new/cargo-0.27.0-arm-unknown-linux-gnueabihf/cargo/bin/cargo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.26.0-arm-unknown-linux-gnueabihf/cargo/etc/bash_completion.d/cargo new/cargo-0.27.0-arm-unknown-linux-gnueabihf/cargo/etc/bash_completion.d/cargo --- old/cargo-0.26.0-arm-unknown-linux-gnueabihf/cargo/etc/bash_completion.d/cargo 2018-03-25 18:13:38.000000000 +0200 +++ new/cargo-0.27.0-arm-unknown-linux-gnueabihf/cargo/etc/bash_completion.d/cargo 2018-05-07 20:46:18.000000000 +0200 @@ -1,12 +1,21 @@ command -v cargo >/dev/null 2>&1 && _cargo() { - local cur prev words cword cmd + local cur prev words cword _get_comp_words_by_ref cur prev words cword COMPREPLY=() - cmd=${words[1]} + # Skip past - and + options to find the command. + local nwords=${#words[@]} + local cmd_i cmd + for (( cmd_i=1; cmd_i<$nwords; cmd_i++ )); + do + if [[ ! "${words[$cmd_i]}" =~ ^[+-] ]]; then + cmd="${words[$cmd_i]}" + break + fi + done local vcs='git hg none' local color='auto always never' @@ -57,13 +66,16 @@ local opt__version="$opt_help $opt_verbose $opt_color" local opt__yank="$opt_common $opt_lock --vers --undo --index --token" - if [[ $cword -eq 1 ]]; then + if [[ $cmd_i -ge $nwords-1 ]]; then + # Completion before or at the command. if [[ "$cur" == -* ]]; then COMPREPLY=( $( compgen -W "${opt___nocmd}" -- "$cur" ) ) + elif [[ "$cur" == +* ]]; then + COMPREPLY=( $( compgen -W "$(_toolchains)" -- "$cur" ) ) else COMPREPLY=( $( compgen -W "$__cargo_commands" -- "$cur" ) ) fi - elif [[ $cword -ge 2 ]]; then + else case "${prev}" in --vcs) COMPREPLY=( $( compgen -W "$vcs" -- "$cur" ) ) @@ -208,4 +220,27 @@ done echo "${TARGETS[@]}" } + +_toolchains(){ + local result=() + local toolchains=$(rustup toolchain list) + local channels="nightly|beta|stable|[0-9]\.[0-9]{1,2}\.[0-9]" + local date="[0-9]{4}-[0-9]{2}-[0-9]{2}" + while read line + do + # Strip " (default)" + line=${line%% *} + if [[ "$line" =~ ^($channels)(-($date))?(-.*) ]]; then + if [[ -z ${BASH_REMATCH[3]} ]]; then + result+=("+${BASH_REMATCH[1]}") + else + # channel-date + result+=("+${BASH_REMATCH[1]}-${BASH_REMATCH[3]}") + fi + result+=("+$line") + fi + done <<< "$toolchains" + echo "${result[@]}" +} + # vim:ft=sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.26.0-arm-unknown-linux-gnueabihf/cargo/share/doc/cargo/README.md new/cargo-0.27.0-arm-unknown-linux-gnueabihf/cargo/share/doc/cargo/README.md --- old/cargo-0.26.0-arm-unknown-linux-gnueabihf/cargo/share/doc/cargo/README.md 2018-03-25 18:13:38.000000000 +0200 +++ new/cargo-0.27.0-arm-unknown-linux-gnueabihf/cargo/share/doc/cargo/README.md 2018-05-07 20:46:18.000000000 +0200 @@ -29,7 +29,7 @@ First, you'll want to check out this repository ``` -git clone --recursive https://github.com/rust-lang/cargo +git clone https://github.com/rust-lang/cargo cd cargo ``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.26.0-arm-unknown-linux-gnueabihf/version new/cargo-0.27.0-arm-unknown-linux-gnueabihf/version --- old/cargo-0.26.0-arm-unknown-linux-gnueabihf/version 2018-03-25 18:13:38.000000000 +0200 +++ new/cargo-0.27.0-arm-unknown-linux-gnueabihf/version 2018-05-07 20:46:18.000000000 +0200 @@ -1 +1 @@ -0.26.0 (41480f5cc 2018-02-26) \ No newline at end of file +0.27.0 (0e7c5a931 2018-04-06) \ No newline at end of file ++++++ cargo-0.26.0-armv7-unknown-linux-gnueabihf.tar.gz -> cargo-0.27.0-armv7-unknown-linux-gnueabihf.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.26.0-armv7-unknown-linux-gnueabihf/README.md new/cargo-0.27.0-armv7-unknown-linux-gnueabihf/README.md --- old/cargo-0.26.0-armv7-unknown-linux-gnueabihf/README.md 2018-03-25 18:22:50.000000000 +0200 +++ new/cargo-0.27.0-armv7-unknown-linux-gnueabihf/README.md 2018-05-07 21:13:40.000000000 +0200 @@ -29,7 +29,7 @@ First, you'll want to check out this repository ``` -git clone --recursive https://github.com/rust-lang/cargo +git clone https://github.com/rust-lang/cargo cd cargo ``` Binary files old/cargo-0.26.0-armv7-unknown-linux-gnueabihf/cargo/bin/cargo and new/cargo-0.27.0-armv7-unknown-linux-gnueabihf/cargo/bin/cargo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.26.0-armv7-unknown-linux-gnueabihf/cargo/etc/bash_completion.d/cargo new/cargo-0.27.0-armv7-unknown-linux-gnueabihf/cargo/etc/bash_completion.d/cargo --- old/cargo-0.26.0-armv7-unknown-linux-gnueabihf/cargo/etc/bash_completion.d/cargo 2018-03-25 18:22:50.000000000 +0200 +++ new/cargo-0.27.0-armv7-unknown-linux-gnueabihf/cargo/etc/bash_completion.d/cargo 2018-05-07 21:13:40.000000000 +0200 @@ -1,12 +1,21 @@ command -v cargo >/dev/null 2>&1 && _cargo() { - local cur prev words cword cmd + local cur prev words cword _get_comp_words_by_ref cur prev words cword COMPREPLY=() - cmd=${words[1]} + # Skip past - and + options to find the command. + local nwords=${#words[@]} + local cmd_i cmd + for (( cmd_i=1; cmd_i<$nwords; cmd_i++ )); + do + if [[ ! "${words[$cmd_i]}" =~ ^[+-] ]]; then + cmd="${words[$cmd_i]}" + break + fi + done local vcs='git hg none' local color='auto always never' @@ -57,13 +66,16 @@ local opt__version="$opt_help $opt_verbose $opt_color" local opt__yank="$opt_common $opt_lock --vers --undo --index --token" - if [[ $cword -eq 1 ]]; then + if [[ $cmd_i -ge $nwords-1 ]]; then + # Completion before or at the command. if [[ "$cur" == -* ]]; then COMPREPLY=( $( compgen -W "${opt___nocmd}" -- "$cur" ) ) + elif [[ "$cur" == +* ]]; then + COMPREPLY=( $( compgen -W "$(_toolchains)" -- "$cur" ) ) else COMPREPLY=( $( compgen -W "$__cargo_commands" -- "$cur" ) ) fi - elif [[ $cword -ge 2 ]]; then + else case "${prev}" in --vcs) COMPREPLY=( $( compgen -W "$vcs" -- "$cur" ) ) @@ -208,4 +220,27 @@ done echo "${TARGETS[@]}" } + +_toolchains(){ + local result=() + local toolchains=$(rustup toolchain list) + local channels="nightly|beta|stable|[0-9]\.[0-9]{1,2}\.[0-9]" + local date="[0-9]{4}-[0-9]{2}-[0-9]{2}" + while read line + do + # Strip " (default)" + line=${line%% *} + if [[ "$line" =~ ^($channels)(-($date))?(-.*) ]]; then + if [[ -z ${BASH_REMATCH[3]} ]]; then + result+=("+${BASH_REMATCH[1]}") + else + # channel-date + result+=("+${BASH_REMATCH[1]}-${BASH_REMATCH[3]}") + fi + result+=("+$line") + fi + done <<< "$toolchains" + echo "${result[@]}" +} + # vim:ft=sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.26.0-armv7-unknown-linux-gnueabihf/cargo/share/doc/cargo/README.md new/cargo-0.27.0-armv7-unknown-linux-gnueabihf/cargo/share/doc/cargo/README.md --- old/cargo-0.26.0-armv7-unknown-linux-gnueabihf/cargo/share/doc/cargo/README.md 2018-03-25 18:22:50.000000000 +0200 +++ new/cargo-0.27.0-armv7-unknown-linux-gnueabihf/cargo/share/doc/cargo/README.md 2018-05-07 21:13:40.000000000 +0200 @@ -29,7 +29,7 @@ First, you'll want to check out this repository ``` -git clone --recursive https://github.com/rust-lang/cargo +git clone https://github.com/rust-lang/cargo cd cargo ``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.26.0-armv7-unknown-linux-gnueabihf/version new/cargo-0.27.0-armv7-unknown-linux-gnueabihf/version --- old/cargo-0.26.0-armv7-unknown-linux-gnueabihf/version 2018-03-25 18:22:50.000000000 +0200 +++ new/cargo-0.27.0-armv7-unknown-linux-gnueabihf/version 2018-05-07 21:13:40.000000000 +0200 @@ -1 +1 @@ -0.26.0 (41480f5cc 2018-02-26) \ No newline at end of file +0.27.0 (0e7c5a931 2018-04-06) \ No newline at end of file ++++++ cargo-0.26.0-i686-unknown-linux-gnu.tar.gz -> cargo-0.27.0-i686-unknown-linux-gnu.tar.gz ++++++ /work/SRC/openSUSE:Factory/rust/cargo-0.26.0-i686-unknown-linux-gnu.tar.gz /work/SRC/openSUSE:Factory/.rust.new/cargo-0.27.0-i686-unknown-linux-gnu.tar.gz differ: char 14, line 1 ++++++ cargo-0.26.0-powerpc64-unknown-linux-gnu.tar.gz -> cargo-0.27.0-powerpc64-unknown-linux-gnu.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.26.0-powerpc64-unknown-linux-gnu/README.md new/cargo-0.27.0-powerpc64-unknown-linux-gnu/README.md --- old/cargo-0.26.0-powerpc64-unknown-linux-gnu/README.md 2018-03-25 18:24:25.000000000 +0200 +++ new/cargo-0.27.0-powerpc64-unknown-linux-gnu/README.md 2018-05-07 20:49:13.000000000 +0200 @@ -29,7 +29,7 @@ First, you'll want to check out this repository ``` -git clone --recursive https://github.com/rust-lang/cargo +git clone https://github.com/rust-lang/cargo cd cargo ``` Binary files old/cargo-0.26.0-powerpc64-unknown-linux-gnu/cargo/bin/cargo and new/cargo-0.27.0-powerpc64-unknown-linux-gnu/cargo/bin/cargo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.26.0-powerpc64-unknown-linux-gnu/cargo/etc/bash_completion.d/cargo new/cargo-0.27.0-powerpc64-unknown-linux-gnu/cargo/etc/bash_completion.d/cargo --- old/cargo-0.26.0-powerpc64-unknown-linux-gnu/cargo/etc/bash_completion.d/cargo 2018-03-25 18:24:25.000000000 +0200 +++ new/cargo-0.27.0-powerpc64-unknown-linux-gnu/cargo/etc/bash_completion.d/cargo 2018-05-07 20:49:13.000000000 +0200 @@ -1,12 +1,21 @@ command -v cargo >/dev/null 2>&1 && _cargo() { - local cur prev words cword cmd + local cur prev words cword _get_comp_words_by_ref cur prev words cword COMPREPLY=() - cmd=${words[1]} + # Skip past - and + options to find the command. + local nwords=${#words[@]} + local cmd_i cmd + for (( cmd_i=1; cmd_i<$nwords; cmd_i++ )); + do + if [[ ! "${words[$cmd_i]}" =~ ^[+-] ]]; then + cmd="${words[$cmd_i]}" + break + fi + done local vcs='git hg none' local color='auto always never' @@ -57,13 +66,16 @@ local opt__version="$opt_help $opt_verbose $opt_color" local opt__yank="$opt_common $opt_lock --vers --undo --index --token" - if [[ $cword -eq 1 ]]; then + if [[ $cmd_i -ge $nwords-1 ]]; then + # Completion before or at the command. if [[ "$cur" == -* ]]; then COMPREPLY=( $( compgen -W "${opt___nocmd}" -- "$cur" ) ) + elif [[ "$cur" == +* ]]; then + COMPREPLY=( $( compgen -W "$(_toolchains)" -- "$cur" ) ) else COMPREPLY=( $( compgen -W "$__cargo_commands" -- "$cur" ) ) fi - elif [[ $cword -ge 2 ]]; then + else case "${prev}" in --vcs) COMPREPLY=( $( compgen -W "$vcs" -- "$cur" ) ) @@ -208,4 +220,27 @@ done echo "${TARGETS[@]}" } + +_toolchains(){ + local result=() + local toolchains=$(rustup toolchain list) + local channels="nightly|beta|stable|[0-9]\.[0-9]{1,2}\.[0-9]" + local date="[0-9]{4}-[0-9]{2}-[0-9]{2}" + while read line + do + # Strip " (default)" + line=${line%% *} + if [[ "$line" =~ ^($channels)(-($date))?(-.*) ]]; then + if [[ -z ${BASH_REMATCH[3]} ]]; then + result+=("+${BASH_REMATCH[1]}") + else + # channel-date + result+=("+${BASH_REMATCH[1]}-${BASH_REMATCH[3]}") + fi + result+=("+$line") + fi + done <<< "$toolchains" + echo "${result[@]}" +} + # vim:ft=sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.26.0-powerpc64-unknown-linux-gnu/cargo/share/doc/cargo/README.md new/cargo-0.27.0-powerpc64-unknown-linux-gnu/cargo/share/doc/cargo/README.md --- old/cargo-0.26.0-powerpc64-unknown-linux-gnu/cargo/share/doc/cargo/README.md 2018-03-25 18:24:25.000000000 +0200 +++ new/cargo-0.27.0-powerpc64-unknown-linux-gnu/cargo/share/doc/cargo/README.md 2018-05-07 20:49:13.000000000 +0200 @@ -29,7 +29,7 @@ First, you'll want to check out this repository ``` -git clone --recursive https://github.com/rust-lang/cargo +git clone https://github.com/rust-lang/cargo cd cargo ``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.26.0-powerpc64-unknown-linux-gnu/version new/cargo-0.27.0-powerpc64-unknown-linux-gnu/version --- old/cargo-0.26.0-powerpc64-unknown-linux-gnu/version 2018-03-25 18:24:25.000000000 +0200 +++ new/cargo-0.27.0-powerpc64-unknown-linux-gnu/version 2018-05-07 20:49:13.000000000 +0200 @@ -1 +1 @@ -0.26.0 (41480f5cc 2018-02-26) \ No newline at end of file +0.27.0 (0e7c5a931 2018-04-06) \ No newline at end of file ++++++ cargo-0.26.0-powerpc64le-unknown-linux-gnu.tar.gz -> cargo-0.27.0-powerpc64le-unknown-linux-gnu.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.26.0-powerpc64le-unknown-linux-gnu/README.md new/cargo-0.27.0-powerpc64le-unknown-linux-gnu/README.md --- old/cargo-0.26.0-powerpc64le-unknown-linux-gnu/README.md 2018-03-25 18:23:25.000000000 +0200 +++ new/cargo-0.27.0-powerpc64le-unknown-linux-gnu/README.md 2018-05-07 20:45:14.000000000 +0200 @@ -29,7 +29,7 @@ First, you'll want to check out this repository ``` -git clone --recursive https://github.com/rust-lang/cargo +git clone https://github.com/rust-lang/cargo cd cargo ``` Binary files old/cargo-0.26.0-powerpc64le-unknown-linux-gnu/cargo/bin/cargo and new/cargo-0.27.0-powerpc64le-unknown-linux-gnu/cargo/bin/cargo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.26.0-powerpc64le-unknown-linux-gnu/cargo/etc/bash_completion.d/cargo new/cargo-0.27.0-powerpc64le-unknown-linux-gnu/cargo/etc/bash_completion.d/cargo --- old/cargo-0.26.0-powerpc64le-unknown-linux-gnu/cargo/etc/bash_completion.d/cargo 2018-03-25 18:23:25.000000000 +0200 +++ new/cargo-0.27.0-powerpc64le-unknown-linux-gnu/cargo/etc/bash_completion.d/cargo 2018-05-07 20:45:14.000000000 +0200 @@ -1,12 +1,21 @@ command -v cargo >/dev/null 2>&1 && _cargo() { - local cur prev words cword cmd + local cur prev words cword _get_comp_words_by_ref cur prev words cword COMPREPLY=() - cmd=${words[1]} + # Skip past - and + options to find the command. + local nwords=${#words[@]} + local cmd_i cmd + for (( cmd_i=1; cmd_i<$nwords; cmd_i++ )); + do + if [[ ! "${words[$cmd_i]}" =~ ^[+-] ]]; then + cmd="${words[$cmd_i]}" + break + fi + done local vcs='git hg none' local color='auto always never' @@ -57,13 +66,16 @@ local opt__version="$opt_help $opt_verbose $opt_color" local opt__yank="$opt_common $opt_lock --vers --undo --index --token" - if [[ $cword -eq 1 ]]; then + if [[ $cmd_i -ge $nwords-1 ]]; then + # Completion before or at the command. if [[ "$cur" == -* ]]; then COMPREPLY=( $( compgen -W "${opt___nocmd}" -- "$cur" ) ) + elif [[ "$cur" == +* ]]; then + COMPREPLY=( $( compgen -W "$(_toolchains)" -- "$cur" ) ) else COMPREPLY=( $( compgen -W "$__cargo_commands" -- "$cur" ) ) fi - elif [[ $cword -ge 2 ]]; then + else case "${prev}" in --vcs) COMPREPLY=( $( compgen -W "$vcs" -- "$cur" ) ) @@ -208,4 +220,27 @@ done echo "${TARGETS[@]}" } + +_toolchains(){ + local result=() + local toolchains=$(rustup toolchain list) + local channels="nightly|beta|stable|[0-9]\.[0-9]{1,2}\.[0-9]" + local date="[0-9]{4}-[0-9]{2}-[0-9]{2}" + while read line + do + # Strip " (default)" + line=${line%% *} + if [[ "$line" =~ ^($channels)(-($date))?(-.*) ]]; then + if [[ -z ${BASH_REMATCH[3]} ]]; then + result+=("+${BASH_REMATCH[1]}") + else + # channel-date + result+=("+${BASH_REMATCH[1]}-${BASH_REMATCH[3]}") + fi + result+=("+$line") + fi + done <<< "$toolchains" + echo "${result[@]}" +} + # vim:ft=sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.26.0-powerpc64le-unknown-linux-gnu/cargo/share/doc/cargo/README.md new/cargo-0.27.0-powerpc64le-unknown-linux-gnu/cargo/share/doc/cargo/README.md --- old/cargo-0.26.0-powerpc64le-unknown-linux-gnu/cargo/share/doc/cargo/README.md 2018-03-25 18:23:25.000000000 +0200 +++ new/cargo-0.27.0-powerpc64le-unknown-linux-gnu/cargo/share/doc/cargo/README.md 2018-05-07 20:45:14.000000000 +0200 @@ -29,7 +29,7 @@ First, you'll want to check out this repository ``` -git clone --recursive https://github.com/rust-lang/cargo +git clone https://github.com/rust-lang/cargo cd cargo ``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.26.0-powerpc64le-unknown-linux-gnu/version new/cargo-0.27.0-powerpc64le-unknown-linux-gnu/version --- old/cargo-0.26.0-powerpc64le-unknown-linux-gnu/version 2018-03-25 18:23:25.000000000 +0200 +++ new/cargo-0.27.0-powerpc64le-unknown-linux-gnu/version 2018-05-07 20:45:14.000000000 +0200 @@ -1 +1 @@ -0.26.0 (41480f5cc 2018-02-26) \ No newline at end of file +0.27.0 (0e7c5a931 2018-04-06) \ No newline at end of file ++++++ cargo-0.26.0-s390x-unknown-linux-gnu.tar.gz -> cargo-0.27.0-s390x-unknown-linux-gnu.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.26.0-s390x-unknown-linux-gnu/README.md new/cargo-0.27.0-s390x-unknown-linux-gnu/README.md --- old/cargo-0.26.0-s390x-unknown-linux-gnu/README.md 2018-03-25 18:23:01.000000000 +0200 +++ new/cargo-0.27.0-s390x-unknown-linux-gnu/README.md 2018-05-07 20:58:10.000000000 +0200 @@ -29,7 +29,7 @@ First, you'll want to check out this repository ``` -git clone --recursive https://github.com/rust-lang/cargo +git clone https://github.com/rust-lang/cargo cd cargo ``` Binary files old/cargo-0.26.0-s390x-unknown-linux-gnu/cargo/bin/cargo and new/cargo-0.27.0-s390x-unknown-linux-gnu/cargo/bin/cargo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.26.0-s390x-unknown-linux-gnu/cargo/etc/bash_completion.d/cargo new/cargo-0.27.0-s390x-unknown-linux-gnu/cargo/etc/bash_completion.d/cargo --- old/cargo-0.26.0-s390x-unknown-linux-gnu/cargo/etc/bash_completion.d/cargo 2018-03-25 18:23:01.000000000 +0200 +++ new/cargo-0.27.0-s390x-unknown-linux-gnu/cargo/etc/bash_completion.d/cargo 2018-05-07 20:58:10.000000000 +0200 @@ -1,12 +1,21 @@ command -v cargo >/dev/null 2>&1 && _cargo() { - local cur prev words cword cmd + local cur prev words cword _get_comp_words_by_ref cur prev words cword COMPREPLY=() - cmd=${words[1]} + # Skip past - and + options to find the command. + local nwords=${#words[@]} + local cmd_i cmd + for (( cmd_i=1; cmd_i<$nwords; cmd_i++ )); + do + if [[ ! "${words[$cmd_i]}" =~ ^[+-] ]]; then + cmd="${words[$cmd_i]}" + break + fi + done local vcs='git hg none' local color='auto always never' @@ -57,13 +66,16 @@ local opt__version="$opt_help $opt_verbose $opt_color" local opt__yank="$opt_common $opt_lock --vers --undo --index --token" - if [[ $cword -eq 1 ]]; then + if [[ $cmd_i -ge $nwords-1 ]]; then + # Completion before or at the command. if [[ "$cur" == -* ]]; then COMPREPLY=( $( compgen -W "${opt___nocmd}" -- "$cur" ) ) + elif [[ "$cur" == +* ]]; then + COMPREPLY=( $( compgen -W "$(_toolchains)" -- "$cur" ) ) else COMPREPLY=( $( compgen -W "$__cargo_commands" -- "$cur" ) ) fi - elif [[ $cword -ge 2 ]]; then + else case "${prev}" in --vcs) COMPREPLY=( $( compgen -W "$vcs" -- "$cur" ) ) @@ -208,4 +220,27 @@ done echo "${TARGETS[@]}" } + +_toolchains(){ + local result=() + local toolchains=$(rustup toolchain list) + local channels="nightly|beta|stable|[0-9]\.[0-9]{1,2}\.[0-9]" + local date="[0-9]{4}-[0-9]{2}-[0-9]{2}" + while read line + do + # Strip " (default)" + line=${line%% *} + if [[ "$line" =~ ^($channels)(-($date))?(-.*) ]]; then + if [[ -z ${BASH_REMATCH[3]} ]]; then + result+=("+${BASH_REMATCH[1]}") + else + # channel-date + result+=("+${BASH_REMATCH[1]}-${BASH_REMATCH[3]}") + fi + result+=("+$line") + fi + done <<< "$toolchains" + echo "${result[@]}" +} + # vim:ft=sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.26.0-s390x-unknown-linux-gnu/cargo/share/doc/cargo/README.md new/cargo-0.27.0-s390x-unknown-linux-gnu/cargo/share/doc/cargo/README.md --- old/cargo-0.26.0-s390x-unknown-linux-gnu/cargo/share/doc/cargo/README.md 2018-03-25 18:23:01.000000000 +0200 +++ new/cargo-0.27.0-s390x-unknown-linux-gnu/cargo/share/doc/cargo/README.md 2018-05-07 20:58:10.000000000 +0200 @@ -29,7 +29,7 @@ First, you'll want to check out this repository ``` -git clone --recursive https://github.com/rust-lang/cargo +git clone https://github.com/rust-lang/cargo cd cargo ``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.26.0-s390x-unknown-linux-gnu/version new/cargo-0.27.0-s390x-unknown-linux-gnu/version --- old/cargo-0.26.0-s390x-unknown-linux-gnu/version 2018-03-25 18:23:01.000000000 +0200 +++ new/cargo-0.27.0-s390x-unknown-linux-gnu/version 2018-05-07 20:58:10.000000000 +0200 @@ -1 +1 @@ -0.26.0 (41480f5cc 2018-02-26) \ No newline at end of file +0.27.0 (0e7c5a931 2018-04-06) \ No newline at end of file ++++++ cargo-0.26.0-x86_64-unknown-linux-gnu.tar.gz -> cargo-0.27.0-x86_64-unknown-linux-gnu.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.26.0-x86_64-unknown-linux-gnu/README.md new/cargo-0.27.0-x86_64-unknown-linux-gnu/README.md --- old/cargo-0.26.0-x86_64-unknown-linux-gnu/README.md 2018-03-25 18:06:02.000000000 +0200 +++ new/cargo-0.27.0-x86_64-unknown-linux-gnu/README.md 2018-05-07 20:53:55.000000000 +0200 @@ -29,7 +29,7 @@ First, you'll want to check out this repository ``` -git clone --recursive https://github.com/rust-lang/cargo +git clone https://github.com/rust-lang/cargo cd cargo ``` Binary files old/cargo-0.26.0-x86_64-unknown-linux-gnu/cargo/bin/cargo and new/cargo-0.27.0-x86_64-unknown-linux-gnu/cargo/bin/cargo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.26.0-x86_64-unknown-linux-gnu/cargo/etc/bash_completion.d/cargo new/cargo-0.27.0-x86_64-unknown-linux-gnu/cargo/etc/bash_completion.d/cargo --- old/cargo-0.26.0-x86_64-unknown-linux-gnu/cargo/etc/bash_completion.d/cargo 2018-03-25 18:06:02.000000000 +0200 +++ new/cargo-0.27.0-x86_64-unknown-linux-gnu/cargo/etc/bash_completion.d/cargo 2018-05-07 20:53:55.000000000 +0200 @@ -1,12 +1,21 @@ command -v cargo >/dev/null 2>&1 && _cargo() { - local cur prev words cword cmd + local cur prev words cword _get_comp_words_by_ref cur prev words cword COMPREPLY=() - cmd=${words[1]} + # Skip past - and + options to find the command. + local nwords=${#words[@]} + local cmd_i cmd + for (( cmd_i=1; cmd_i<$nwords; cmd_i++ )); + do + if [[ ! "${words[$cmd_i]}" =~ ^[+-] ]]; then + cmd="${words[$cmd_i]}" + break + fi + done local vcs='git hg none' local color='auto always never' @@ -57,13 +66,16 @@ local opt__version="$opt_help $opt_verbose $opt_color" local opt__yank="$opt_common $opt_lock --vers --undo --index --token" - if [[ $cword -eq 1 ]]; then + if [[ $cmd_i -ge $nwords-1 ]]; then + # Completion before or at the command. if [[ "$cur" == -* ]]; then COMPREPLY=( $( compgen -W "${opt___nocmd}" -- "$cur" ) ) + elif [[ "$cur" == +* ]]; then + COMPREPLY=( $( compgen -W "$(_toolchains)" -- "$cur" ) ) else COMPREPLY=( $( compgen -W "$__cargo_commands" -- "$cur" ) ) fi - elif [[ $cword -ge 2 ]]; then + else case "${prev}" in --vcs) COMPREPLY=( $( compgen -W "$vcs" -- "$cur" ) ) @@ -208,4 +220,27 @@ done echo "${TARGETS[@]}" } + +_toolchains(){ + local result=() + local toolchains=$(rustup toolchain list) + local channels="nightly|beta|stable|[0-9]\.[0-9]{1,2}\.[0-9]" + local date="[0-9]{4}-[0-9]{2}-[0-9]{2}" + while read line + do + # Strip " (default)" + line=${line%% *} + if [[ "$line" =~ ^($channels)(-($date))?(-.*) ]]; then + if [[ -z ${BASH_REMATCH[3]} ]]; then + result+=("+${BASH_REMATCH[1]}") + else + # channel-date + result+=("+${BASH_REMATCH[1]}-${BASH_REMATCH[3]}") + fi + result+=("+$line") + fi + done <<< "$toolchains" + echo "${result[@]}" +} + # vim:ft=sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.26.0-x86_64-unknown-linux-gnu/cargo/share/doc/cargo/README.md new/cargo-0.27.0-x86_64-unknown-linux-gnu/cargo/share/doc/cargo/README.md --- old/cargo-0.26.0-x86_64-unknown-linux-gnu/cargo/share/doc/cargo/README.md 2018-03-25 18:06:02.000000000 +0200 +++ new/cargo-0.27.0-x86_64-unknown-linux-gnu/cargo/share/doc/cargo/README.md 2018-05-07 20:53:55.000000000 +0200 @@ -29,7 +29,7 @@ First, you'll want to check out this repository ``` -git clone --recursive https://github.com/rust-lang/cargo +git clone https://github.com/rust-lang/cargo cd cargo ``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cargo-0.26.0-x86_64-unknown-linux-gnu/version new/cargo-0.27.0-x86_64-unknown-linux-gnu/version --- old/cargo-0.26.0-x86_64-unknown-linux-gnu/version 2018-03-25 18:06:02.000000000 +0200 +++ new/cargo-0.27.0-x86_64-unknown-linux-gnu/version 2018-05-07 20:53:55.000000000 +0200 @@ -1 +1 @@ -0.26.0 (41480f5cc 2018-02-26) \ No newline at end of file +0.27.0 (0e7c5a931 2018-04-06) \ No newline at end of file ++++++ rustc-1.26.0-src.tar.gz -> rustc-1.26.2-src.tar.gz ++++++ /work/SRC/openSUSE:Factory/rust/rustc-1.26.0-src.tar.gz /work/SRC/openSUSE:Factory/.rust.new/rustc-1.26.2-src.tar.gz differ: char 13, line 1
