tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

kbuild: simplify rustfmt target

There is no need to prune the rust/alloc directory because it was
removed by commit 9d0441bab775 ("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: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nicolas Schier <n.schier@avm.de>
Acked-by: Miguel Ojeda <ojeda@kernel.org>

Masahiro Yamada 397a479b a49401be

+2 -11
+2 -11
Makefile
··· 1754 1754 # Formatting targets 1755 1755 PHONY += rustfmt rustfmtcheck 1756 1756 1757 - # We skip `rust/alloc` since we want to minimize the diff w.r.t. upstream. 1758 - # 1759 - # We match using absolute paths since `find` does not resolve them 1760 - # when matching, which is a problem when e.g. `srctree` is `..`. 1761 - # We `grep` afterwards in order to remove the directory entry itself. 1762 1757 rustfmt: 1763 - $(Q)find $(abs_srctree) -type f -name '*.rs' \ 1764 - -o -path $(abs_srctree)/rust/alloc -prune \ 1765 - -o -path $(abs_objtree)/rust/test -prune \ 1766 - | grep -Fv $(abs_srctree)/rust/alloc \ 1767 - | grep -Fv $(abs_objtree)/rust/test \ 1768 - | grep -Fv generated \ 1758 + $(Q)find $(srctree) $(RCS_FIND_IGNORE) \ 1759 + -type f -a -name '*.rs' -a ! -name '*generated*' -print \ 1769 1760 | xargs $(RUSTFMT) $(rustfmt_flags) 1770 1761 1771 1762 rustfmtcheck: rustfmt_flags = --check