Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-02-01 08:51:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

rustfmt now runs and reformats files (need to opt out explicitly) (#743)

Browse source
This commit is contained in:
Antioch Peverell 2018-03-03 14:10:15 -05:00 committed by Ignotus Peverell
parent 4c34c9ab52
commit 19565aea3d
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
.hooks/pre-commit
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# Copyright 2017 The Grin Developers # Copyright 2018 The Grin Developers
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@ -14,9 +14,11 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
cargo +nightly fmt -- --version &>/dev/null rustfmt --version &>/dev/null
if [ $? != 0 ]; then 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 exit 1
fi fi
@ -24,9 +26,11 @@ result=0
problem_files=() problem_files=()
printf "[pre_commit] rustfmt " printf "[pre_commit] rustfmt "
for file in $(git diff --name-only --cached); do for file in $(git diff --name-only --cached); do
if [ ${file: -3} == ".rs" ]; then 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 if [ $? != 0 ]; then
problem_files+=($file) problem_files+=($file)
result=1 result=1
@ -34,15 +38,20 @@ for file in $(git diff --name-only --cached); do
fi fi
done 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 if [ $result != 0 ]; then
printf "\033[0;31mfail\033[0m \n" # printf "\033[0;31mrustfmt\033[0m \n"
printf "[pre_commit] the following files need formatting: \n" printf "[pre_commit] the following files were rustfmt'd (not yet committed): \n"
for file in ${problem_files[@]}; do for file in ${problem_files[@]}; do
printf " cargo +nightly fmt -- $file\n" printf "\033[0;31m $file\033[0m \n"
done done
else
printf "\033[0;32mok\033[0m \n"
fi fi
exit 0 exit 0