-# Copyright 2014-2018 The Rust Project Developers. See the COPYRIGHT
-# file at the top-level directory of this distribution and at
-# http://rust-lang.org/COPYRIGHT.
-#
-# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-# option. This file may not be copied, modified, or distributed
-# except according to those terms.
-
-
set -ex
echo "Running clippy base tests"
./util/dev update_lints --check
cargo +nightly fmt --all -- --check
-
-#avoid loop spam
-set +x
# make sure tests are formatted
# some lints are sensitive to formatting, exclude some files
-needs_formatting=false
+tests_need_reformatting="false"
+# switch to nightly
+rustup override set nightly
+# avoid loop spam and allow cmds with exit status != 0
+set +ex
+
for file in `find tests -not -path "tests/ui/methods.rs" -not -path "tests/ui/format.rs" -not -path "tests/ui/formatting.rs" -not -path "tests/ui/empty_line_after_outer_attribute.rs" -not -path "tests/ui/double_parens.rs" -not -path "tests/ui/doc.rs" -not -path "tests/ui/unused_unit.rs" | grep "\.rs$"` ; do
-rustfmt ${file} --check || echo "${file} needs reformatting!" ; needs_formatting=true
+ rustfmt ${file} --check
+ if [ $? -ne 0 ]; then
+ echo "${file} needs reformatting!"
+ tests_need_reformatting="true"
+ fi
done
-if [ "${needs_reformatting}" = true ] ; then
+set -ex # reset
+
+if [ "${tests_need_reformatting}" == "true" ] ; then
echo "Tests need reformatting!"
exit 2
fi
-set -x
+
+# switch back to master
+rustup override set master