mirror of
https://chromium.googlesource.com/crosvm/crosvm
synced 2025-02-05 18:20:34 +00:00
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 <dverkamp@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1865371 Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Dylan Reid <dgreid@chromium.org> Reviewed-by: Zach Reizner <zachr@chromium.org>
This commit is contained in:
parent
3be01bd505
commit
1769b63686
1 changed files with 2 additions and 17 deletions
19
bin/fmt
19
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 "$@" --
|
||||
|
|
Loading…
Reference in a new issue