rustfmt now runs and reformats files (need to opt out explicitly)
#!/bin/bash
-# Copyright 2017 The Grin Developers
+# Copyright 2018 The Grin Developers
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# See the License for the specific language governing permissions and
# limitations under the License.
-cargo +nightly fmt -- --version &>/dev/null
+rustfmt --version &>/dev/null
if [ $? != 0 ]; then
- printf "[pre_commit] \033[0;31merror\033[0m: \"cargo +nightly fmt\" not available?\n"
+ printf "[pre_commit] \033[0;31merror\033[0m: \"rustfmt\" not available. \n"
+ printf "[pre_commit] \033[0;31merror\033[0m: rustfmt can be installed via - \n"
+ printf "[pre_commit] $ rustup component add rustfmt-preview \n"
exit 1
fi
@@ -24,9 +26,11 @@ result=0
problem_files=()
printf "[pre_commit] rustfmt "
+
for file in $(git diff --name-only --cached); do
if [ ${file: -3} == ".rs" ]; then
- cargo +nightly fmt -- --skip-children --write-mode=diff $file &>/dev/null
+ # first collect all the files that need reformatting
+ rustfmt --skip-children --write-mode=diff $file &>/dev/null
if [ $? != 0 ]; then
problem_files+=($file)
result=1
@@ -34,15 +38,20 @@ for file in $(git diff --name-only --cached); do
fi
done
+# now reformat all the files that need reformatting
+for file in ${problem_files[@]}; do
+ rustfmt --skip-children --write-mode=overwrite $file
+done
+
+# and let the user know what just happened (and which files were affected)
+printf "\033[0;32mok\033[0m \n"
if [ $result != 0 ]; then
- printf "\033[0;31mfail\033[0m \n"
- printf "[pre_commit] the following files need formatting: \n"
+ # printf "\033[0;31mrustfmt\033[0m \n"
+ printf "[pre_commit] the following files were rustfmt'd (not yet committed): \n"
for file in ${problem_files[@]}; do
- printf " cargo +nightly fmt -- $file\n"
+ printf "\033[0;31m $file\033[0m \n"
done
-else
- printf "\033[0;32mok\033[0m \n"
fi
exit 0
