[arrow] branch master updated: ARROW-3969: [Rust] Format using stable rustfmt

[we...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wesm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new d3d7669  ARROW-3969: [Rust] Format using stable rustfmt
d3d7669 is described below

commit d3d7669221ee0c714d3095388d769c99d3e51b2b
Author: Andy Grove <an...@gmail.com>
AuthorDate: Sun Dec 9 14:45:15 2018 -0600

    ARROW-3969: [Rust] Format using stable rustfmt
    
    Author: Andy Grove <an...@gmail.com>
    
    Closes #3138 from andygrove/ARROW-3969 and squashes the following commits:
    
    99b6256b6 <Andy Grove> move rustfmt installation into travis_install_cargo
    55ab06fee <Andy Grove> Be more explicit and don't assume order of stable vs nightly builds
    5fed7dbc2 <Andy Grove> simplify
    cca7da3ab <Andy Grove> oops, wrong command
    9b2e5b771 <Andy Grove> Format using stable rustfmt
---
 ci/travis_install_cargo.sh | 1 +
 ci/travis_script_rust.sh   | 9 ++-------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/ci/travis_install_cargo.sh b/ci/travis_install_cargo.sh
index f433033..e4a6b3b 100755
--- a/ci/travis_install_cargo.sh
+++ b/ci/travis_install_cargo.sh
@@ -21,6 +21,7 @@ set -e
 
 # ensure that both toolchains are installed
 rustup install stable
+rustup component add rustfmt
 rustup install nightly
 
 pip install 'travis-cargo<0.2' --user
diff --git a/ci/travis_script_rust.sh b/ci/travis_script_rust.sh
index 02a32cd..55cce8f 100755
--- a/ci/travis_script_rust.sh
+++ b/ci/travis_script_rust.sh
@@ -26,13 +26,8 @@ pushd $RUST_DIR
 # show activated toolchain
 rustup show
 
-# check code formatting only for Rust nightly
-if [ $RUSTUP_TOOLCHAIN == "nightly" ]
-then
-  # raises on any formatting errors
-  rustup component add rustfmt-preview
-  cargo fmt --all -- --check
-fi
+# raises on any formatting errors
+cargo +stable fmt --all -- --check
 
 # raises on any warnings
 cargo rustc -- -D warnings