Skip to content

Commit

Permalink
Don't require rustfmt on beta
Browse files Browse the repository at this point in the history
  • Loading branch information
oli-obk committed May 17, 2019
1 parent 64a9f56 commit 28bde06
Showing 1 changed file with 0 additions and 25 deletions.
25 changes: 0 additions & 25 deletions ci/base-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ export CARGO_TARGET_DIR=`pwd`/target/

# Perform various checks for lint registration
./util/dev update_lints --check
cargo +nightly fmt --all -- --check

# Check running clippy-driver without cargo
(
Expand All @@ -50,29 +49,5 @@ cargo +nightly fmt --all -- --check
# TODO: CLIPPY_CONF_DIR / CARGO_MANIFEST_DIR
)

# make sure tests are formatted

# some lints are sensitive to formatting, exclude some files
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 | grep "\.rs$"` ; do
rustfmt ${file} --check
if [ $? -ne 0 ]; then
echo "${file} needs reformatting!"
tests_need_reformatting="true"
fi
done

set -ex # reset

if [ "${tests_need_reformatting}" == "true" ] ; then
echo "Tests need reformatting!"
exit 2
fi

# switch back to master
# rustup override set master

0 comments on commit 28bde06

Please sign in to comment.