From 07c052a1c1460dd302710d42484a993746a93faf Mon Sep 17 00:00:00 2001 From: Adam Wright Date: Mon, 15 Feb 2016 18:54:15 -0800 Subject: [PATCH] Individually format crates, use -q --- hooks/pre-commit | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/hooks/pre-commit b/hooks/pre-commit index a72e35f..76294cc 100755 --- a/hooks/pre-commit +++ b/hooks/pre-commit @@ -51,17 +51,22 @@ else printf "${SUCCESS}\n" fi -printf "${PREFIX} Running rustfmt ... " -find tarpc/src -name "*.rs" -print0 | xargs -0 rustfmt --write-mode=overwrite &>/dev/null -FMTRESULT=$? -if [ "${TARPC_SKIP_RUSTFMT}" == 1 ]; then - printf "${SKIPPED}\n" -elif [ ${FMTRESULT} != 0 ]; then - FAILED=1 - printf "${FAILURE}\n" -else - printf "${SUCCESS}\n" -fi +function fmt() { + printf "${PREFIX} Running rustfmt on $1 ... " + (cd $1 && cargo-fmt -q) + FMTRESULT=$? + if [ "${TARPC_SKIP_RUSTFMT}" == 1 ]; then + printf "${SKIPPED}\n" + elif [ ${FMTRESULT} != 0 ]; then + FAILED=1 + printf "${FAILURE}\n" + else + printf "${SUCCESS}\n" + fi +} + +fmt tarpc +fmt tarpc_examples printf "${PREFIX} Checking for bad whitespace ... " git diff-index --check --cached $against -- &>/dev/null