From 1769b63686e054917576ec02e66c3991b78578ce Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Wed, 16 Oct 2019 16:07:17 -0700 Subject: [PATCH] bin/fmt: remove use of `cargo fmt` This simplifies our formatting script so that it does not need any of the Cargo metadata to run; the new version just finds all Rust files (*.rs) and runs `rustfmt` on them individually. BUG=None TEST=bin/fmt TEST=bin/fmt --check Change-Id: I45aaee497d4f1dfcc03b3e2c5c2f27feb974dc80 Signed-off-by: Daniel Verkamp Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1865371 Tested-by: kokoro Reviewed-by: Dylan Reid Reviewed-by: Zach Reizner --- bin/fmt | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/bin/fmt b/bin/fmt index 39eac2c2f3..69d11406df 100755 --- a/bin/fmt +++ b/bin/fmt @@ -4,7 +4,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -# Run `cargo fmt` on all Rust code contained in crosvm. This is different from +# Run `rustfmt` on all Rust code contained in crosvm. This is different from # `cargo fmt --all` which formats multiple crates but a single workspace only. # Crosvm consists of multiple workspaces. # @@ -26,19 +26,4 @@ cd "$(dirname "${BASH_SOURCE[0]}")" # Jump up to root directory of crosvm repo. cd .. -# Keep track of whether any cargo fmt invocation exited with error. -EXIT=0 - -FIND_CARGO_TOMLS="$(find "$PWD" -name Cargo.toml)" - -while read path_to_cargo_toml; do - cd "$(dirname "$path_to_cargo_toml")" - - if grep --quiet '\[workspace\]' Cargo.toml; then - if ! cargo fmt --all -- "$@"; then - EXIT=1 - fi - fi -done <<< "$FIND_CARGO_TOMLS" - -exit $EXIT +find . -name '*.rs' -print0 | xargs -0 rustfmt "$@" --