From nobody Mon May 20 13:46:42 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vjf4M15Crz5LJX1; Mon, 20 May 2024 13:46:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vjf4M0RFtz4Qtv; Mon, 20 May 2024 13:46:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716212803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9sjaGg01gUpHlc7vncrNFPldOofjs1sJ2BROmuvIh8Q=; b=sElQyStBX7NDTuSnGAtUad5rIvIxAQ4+4S6oxYMOZu8t+6cJprmlLFVA8iO8+qUid8e7uH fHMn3BafZB7Sj3J0ZlbSbMiEwkPIVbHOoJckVNigFrH2bUpj18WPaEYjMEZLtfz4gS9mkG /uefXXXxH9zAV7T7oHPwZ3xRe9LLX5c9cLFcHXM5e2YNqIQHUFPLef+rxnqy/XRbMnlerY sCS6m6dbC0MWB+C29Sb5s1kH6kqYoJvVVbUMFnQUSQjkPrhSBjk01SZkqQXG0OA36WF8kj K/Wju+AFT2Y58yVKiODae1wGHupZGID57BfQRZ2EI4v7zyHZejeMN2c2GoQf+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716212803; a=rsa-sha256; cv=none; b=qIkuX/151jtPX2DVGzzuZJnlyGly3hRjxPVou1n+bX66HvDBKR9jKqQfd8gT/wn1e6Sl9P FAmiyOHj//xNxk1Xfx96S2mHeAU80VUHieHJ8wpAP0EgX+n2+2kebD3KWnSi9z7QjlV5NE XHvs5MdknGxUJLACLQ3mnJ9kB9WD8dqHhZpdFrMyQ8Xdplz6a3t6vcOrJIAY849nbgl1iC VUQIj6SuARt5zI6pmnv+Mmb2VJO3FtyvXIbRndjnNWy1/qzkqRb8M1A+yFRSFHUCjdnEp8 2SxUwJ8YJY5YizosE3O4DUVYUWNTTnzJltALPZKFXH7qqbmLdS1lz5WwZ4fUTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716212803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9sjaGg01gUpHlc7vncrNFPldOofjs1sJ2BROmuvIh8Q=; b=I85DOKvDTkGefcnsdov+bb5/Cvg0OH/XAJqjAT+Qtt0UISXbb2+ZQr4GRNtE563gQhTvXi RN5SaOwSXTduuHyAYETlj9S8306oeOOrSRLagzt1rFGkjivP8VSaToN3UdIgVSzwt3xxCB r/PtNrLMp71JXQ1fWdXDmSGzXYIZB0hRAqQeN4yBkfSc7zWFttZTXF5Ibc8Rw/wjdD198w E0GJp+i6ajiMJR5WFUiby43VpzTKP19VJNFdryPoogRw4TO6EJtJRBzjJh2cswdRe7JHp3 /0HCR9igChq8GApYiSW5s3XRUbC+jSQQd3L2h8GDhQ3K5lKUxjJB3McMkV54YQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vjf4L72N4zgmr; Mon, 20 May 2024 13:46:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44KDkgHj062872; Mon, 20 May 2024 13:46:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44KDkgGk062869; Mon, 20 May 2024 13:46:42 GMT (envelope-from git) Date: Mon, 20 May 2024 13:46:42 GMT Message-Id: <202405201346.44KDkgGk062869@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: d27c35123b92 - stable/14 - clang-format: Minor tweaks List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d27c35123b92a656170ebfc44383162812d79cd3 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d27c35123b92a656170ebfc44383162812d79cd3 commit d27c35123b92a656170ebfc44383162812d79cd3 Author: Mark Johnston AuthorDate: 2024-04-30 21:32:38 +0000 Commit: Mark Johnston CommitDate: 2024-05-20 13:42:32 +0000 clang-format: Minor tweaks Invert KeepEmptyLinesAtTheStartOfBlocks. We used to require an empty line at the beginning of functions with no local variables, which I believe is the reason for this setting. Now it is discouraged in new code. Tell clang-format to align consecutive macros, since we tend to do that. clang-format's output isn't quite what we want here. Typically we have a tab after a #define for some reason, and clang-format doesn't appear to have an option for that. clang-format will also use a mix of tabs and spaces to minimize indentation, which is also against our convention. However, the result looks better with this setting than without. Reviewed by: emaste MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D29870 (cherry picked from commit 2c18289b72c8594bb5dbe22d54ff3434a56ec6c6) --- .clang-format | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.clang-format b/.clang-format index 6c541a571e1d..3d436fa0b35d 100644 --- a/.clang-format +++ b/.clang-format @@ -2,6 +2,7 @@ --- BasedOnStyle: WebKit AlignAfterOpenBracket: DontAlign +AlignConsecutiveMacros: AcrossEmptyLines AlignConsecutiveAssignments: false AlignConsecutiveDeclarations: false AlignEscapedNewlines: Left @@ -94,6 +95,7 @@ ForEachMacros: - TAILQ_FOREACH_SAFE - VM_MAP_ENTRY_FOREACH - VM_PAGE_DUMP_FOREACH +SpaceBeforeParens: ControlStatementsExceptForEachMacros IndentCaseLabels: false IndentPPDirectives: None Language: Cpp @@ -162,7 +164,7 @@ IncludeCategories: # http://llvm.org/docs/CodingStandards.html#include-style IncludeIsMainRegex: 'BLAH_DONT_MATCH_ANYTHING' SortIncludes: true -KeepEmptyLinesAtTheStartOfBlocks: true +KeepEmptyLinesAtTheStartOfBlocks: false TypenameMacros: - ARB_ELMTYPE - ARB_HEAD