From: Nathan Chancellor <nathan@kernel.org>
To: Michael Riesch <michael.riesch@wolfvision.net>
Cc: Miguel Ojeda <ojeda@kernel.org>,
Nick Desaulniers <ndesaulniers@google.com>,
Bill Wendling <morbo@google.com>,
Justin Stitt <justinstitt@google.com>,
linux-kernel@vger.kernel.org, llvm@lists.linux.dev
Subject: Re: [PATCH 2/2] clang-format: align consecutive macros
Date: Tue, 11 Feb 2025 13:14:42 -0500 [thread overview]
Message-ID: <20250211181442.GB2995885@ax162> (raw)
In-Reply-To: <20250210-clang-format-fixes-v1-2-9bcf43a4b4b2@wolfvision.net>
On Mon, Feb 10, 2025 at 09:21:01AM +0100, Michael Riesch wrote:
> clang-format 9 introduced the option "AlignConsecutiveMacros".
> Set it to "AcrossEmptyLinesAndComments" in order to avoid macro
> definitions of the form:
>
> #define MAGIC_REGISTER_1 0x42
> #define MAGIC_REGISTER_BIT_FLIP BIT(2)
> /* important comment */
> #define MAGIC_REGISTER_BIT_ENABLE BIT(12)
>
> #define MAGIC_REGISTER_2 0x43
>
> With the option set to "AcrossEmptyLinesAndComments", they will
> be converted to
>
> #define MAGIC_REGISTER_1 0x42
> #define MAGIC_REGISTER_BIT_FLIP BIT(2)
> /* important comment */
> #define MAGIC_REGISTER_BIT_ENABLE BIT(12)
>
> #define MAGIC_REGISTER_2 0x43
>
> which seems to be the convention in the kernel code base.
>
> Signed-off-by: Michael Riesch <michael.riesch@wolfvision.net>
I could see this being controversial in some cases but let's see what
happens.
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
> ---
> .clang-format | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/.clang-format b/.clang-format
> index 8040b516185b..30d09cb88170 100644
> --- a/.clang-format
> +++ b/.clang-format
> @@ -13,6 +13,7 @@ AccessModifierOffset: -4
> AlignAfterOpenBracket: Align
> AlignConsecutiveAssignments: false
> AlignConsecutiveDeclarations: false
> +AlignConsecutiveMacros: AcrossEmptyLinesAndComments
> AlignEscapedNewlines: Left
> AlignOperands: true
> AlignTrailingComments: false
>
> --
> 2.34.1
>
prev parent reply other threads:[~2025-02-11 18:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-10 8:20 [PATCH 0/2] clang-format: format short enums and macro definitions correctly Michael Riesch
2025-02-10 8:21 ` [PATCH 1/2] clang-format: do not allow short enums on a single line Michael Riesch
2025-02-11 18:13 ` Nathan Chancellor
2025-02-10 8:21 ` [PATCH 2/2] clang-format: align consecutive macros Michael Riesch
2025-02-11 18:14 ` Nathan Chancellor [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250211181442.GB2995885@ax162 \
--to=nathan@kernel.org \
--cc=justinstitt@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=llvm@lists.linux.dev \
--cc=michael.riesch@wolfvision.net \
--cc=morbo@google.com \
--cc=ndesaulniers@google.com \
--cc=ojeda@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox