Commit 397a479b authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: simplify rustfmt target 



There is no need to prune the rust/alloc directory because it was
removed by commit 9d0441ba ("rust: alloc: remove our fork of the
`alloc` crate").

There is no need to prune the rust/test directory because no '*.rs'
files are generated within it.

To avoid forking the 'grep -Fv generated' process, filter out generated
files using the option, ! -name '*generated*'.

Now that the '-path ... -prune' option is no longer used, there is no
need to use the absolute path. Searching in $(srctree), which can be
a relative path, is sufficient.

The comment mentions the use case where $(srctree) is '..', that is,
$(objtree) is a sub-directory of $(srctree). In this scenario, all
'*.rs' files under $(objtree) are generated files and filters out by
the '*generated*' pattern.

Add $(RCS_FIND_IGNORE) as a shortcut. Although I do not believe '*.rs'
files would exist under the .git directory, there is no need for the
'find' command to traverse it.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Reviewed-by: default avatarNicolas Schier <n.schier@avm.de>
Acked-by: default avatarMiguel Ojeda <ojeda@kernel.org>
parent a49401be

Makefile

+2 −11
Original line number Diff line number Diff line
@@ -1754,18 +1754,9 @@ rusttest: prepare 
# Formatting targets

PHONY += rustfmt rustfmtcheck



# We skip `rust/alloc` since we want to minimize the diff w.r.t. upstream.

#

# We match using absolute paths since `find` does not resolve them

# when matching, which is a problem when e.g. `srctree` is `..`.

# We `grep` afterwards in order to remove the directory entry itself.

rustfmt:

	$(Q)find $(abs_srctree) -type f -name '*.rs' \

		-o -path $(abs_srctree)/rust/alloc -prune \

		-o -path $(abs_objtree)/rust/test -prune \

		| grep -Fv $(abs_srctree)/rust/alloc \

		| grep -Fv $(abs_objtree)/rust/test \

		| grep -Fv generated \

	$(Q)find $(srctree) $(RCS_FIND_IGNORE) \

		-type f -a -name '*.rs' -a ! -name '*generated*' -print \

		| xargs $(RUSTFMT) $(rustfmt_flags)



rustfmtcheck: rustfmt_flags = --check