From 2c7784de02a1a7c74fb9f8d7ba989f928edc19f0 Mon Sep 17 00:00:00 2001 From: Jason Heath Date: Fri, 20 Sep 2024 10:23:38 -0400 Subject: [PATCH] Fixes fmt, aligns Makefile with CI/CD pipeline Buildkite failed on rust fmt step, this fixes that error. Also aligns rust fmt call in our Makefile with the one used in buildkit. - Call to fmt in our Makefile was - cargo +$(RUSTFMT_TOOLCHAIN) fmt - Call in buildkite is - cargo +nightly-2024-04-22 fmt --all -- --check - Call to fmt in our Makefile is now - cargo +$(RUSTFMT_TOOLCHAIN) fmt --all -- --check Signed-off-by: Jason Heath --- Makefile | 2 +- components/core/src/util/posix_perm.rs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2439e65446..072db2d521 100644 --- a/Makefile +++ b/Makefile @@ -205,7 +205,7 @@ $(foreach component,$(ALL),$(eval $(call CLEAN,$(component)))) RUSTFMT_TOOLCHAIN := $(shell cat RUSTFMT_VERSION) define FMT fmt-$1: image ## formats the $1 component - $(run) sh -c 'cd components/$1 && cargo +$(RUSTFMT_TOOLCHAIN) fmt' + $(run) sh -c 'cd components/$1 && cargo +$(RUSTFMT_TOOLCHAIN) fmt --all -- --check' .PHONY: fmt-$1 endef diff --git a/components/core/src/util/posix_perm.rs b/components/core/src/util/posix_perm.rs index 8367863de3..5b52385d17 100644 --- a/components/core/src/util/posix_perm.rs +++ b/components/core/src/util/posix_perm.rs @@ -174,7 +174,6 @@ mod tests { #[test] fn exercise_set_umask_0022() { - // From `man 2 umask` on a Linux box. // // RETURN VALUE