Check for cargo fmt rather than checking for rustfmt directly.
This commit is contained in:
@@ -22,13 +22,13 @@ function banner {
|
|||||||
|
|
||||||
# Run rustfmt if we have it.
|
# Run rustfmt if we have it.
|
||||||
banner "Rust formatting"
|
banner "Rust formatting"
|
||||||
if type rustfmt > /dev/null; then
|
if cargo +stable fmt -- --version > /dev/null ; then
|
||||||
if ! "$topdir/format-all.sh" --check ; then
|
if ! "$topdir/format-all.sh" --check ; then
|
||||||
echo "Formatting diffs detected! Run \"cargo fmt --all\" to correct."
|
echo "Formatting diffs detected! Run \"cargo fmt --all\" to correct."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "rustfmt not available; formatting not checked!"
|
echo "cargo-fmt not available; formatting not checked!"
|
||||||
echo
|
echo
|
||||||
echo "If you are using rustup, rustfmt can be installed via"
|
echo "If you are using rustup, rustfmt can be installed via"
|
||||||
echo "\"rustup component add --toolchain=stable rustfmt-preview\", or see"
|
echo "\"rustup component add --toolchain=stable rustfmt-preview\", or see"
|
||||||
|
|||||||
Reference in New Issue
Block a user