From nobody Tue Apr 30 21:33:53 2024 X-Original-To: dev-commits-src-all@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 4VTYNd4d5dz5JyTp; Tue, 30 Apr 2024 21:33:53 +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 4VTYNd3x5kz4YD4; Tue, 30 Apr 2024 21:33:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714512833; 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=/HvpbqnDv2nH/9ue2yIq19tPd0v5pIhv6jU+hcWaE+g=; b=a2FOCJRKV8tQck/hvHM66qgbvxe98NZGuSHkyEX5CYM4G2Vjerne9g92Ssut4n6o7FB7gt 1c0fqJLcHCIFrU8j6PWOG2tPth5MY020RS9dY4x4qgjiFeZQ+sxqmNaGDGjtlU2dxASkK/ wf4H5S7L8X5ZLfiH7sRjHTYj7bAfApkqFNjSxUmXpdGJPR/TPi77BeAy6IDG39SDb43X1U qjd10CQS5BQ/ijRGxoLSRc4udnd2EspEqDzRd/jKhkqg2CCTr/437HRuRakUNWhOO6CSAW R94u/Ot2X+DC9ytdoRoKOn/V+G8r5/hdcaqfwo758T1a+KPB684qlDacABXXcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714512833; a=rsa-sha256; cv=none; b=ESfydW0/Nz9zkLBzwoUuydTiIbXGeC5A6fjAtrFPq6gUge8s28x/uttq054uHMMFD4hxkv YJiaRxEZ34FLMxY1HAT8+yx7/YiNfovfbeEOtHpEC7qKf67sDKZn9Nu2HrcrN7Hjg1Uvky p93TqeAF8ffDW/V7r/Rt9e+AhC99d5RQVW8Wq5ooSMWwDz+Rwwa3dJGmXxbYgWiXQtOG49 AtfgbAL0EAZMNbyo6WpktZ0YwRwzMXEH95bIBxt/0vsLAuJTkYFcYDyR3QpO+DuKvuO3vr y9Z0C6IpD3gEQ1bU0yLUVv7bP1ldrB1E1JI3kW4yFDjtqIJVnWJtVtbzCh3+6A== 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=1714512833; 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=/HvpbqnDv2nH/9ue2yIq19tPd0v5pIhv6jU+hcWaE+g=; b=CeZVDEGjs38ZIRyW9Si3P/FAQHGvFrUZ5qupS3ARHxQ8hQD92XDngQPX+YhhBR9i8ZPoGu VlBW1kPRu56K8b65+TKGixo0l/ejED8HVbV7BuSB9al9OsJGC02auAtopwWcs9j/43n30n eQNluw9U0Ckt9j/L5FDzKSF1NP6C7bjDLs6B2RSyOUMJUk/uTd3UhfjwQ8s6rQ4Y03HyBZ 6okvw0HGnh02zCSuRkut9FfBzpvZ4BYewtoHDPHbIph2+ZkRl9X9JFsM6KXhy7NxOubn3T JQZe1hQaZKYAiX1orziMeAgN3Npsfu7ajrcZaTrc2Z1dcMoeQx3GXX+g7W/IsA== 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 4VTYNd3VZtzs5s; Tue, 30 Apr 2024 21:33:53 +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 43ULXrUs032011; Tue, 30 Apr 2024 21:33:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43ULXrKU032008; Tue, 30 Apr 2024 21:33:53 GMT (envelope-from git) Date: Tue, 30 Apr 2024 21:33:53 GMT Message-Id: <202404302133.43ULXrKU032008@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 2c18289b72c8 - main - clang-format: Minor tweaks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 2c18289b72c8594bb5dbe22d54ff3434a56ec6c6 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2c18289b72c8594bb5dbe22d54ff3434a56ec6c6 commit 2c18289b72c8594bb5dbe22d54ff3434a56ec6c6 Author: Mark Johnston AuthorDate: 2024-04-30 21:32:38 +0000 Commit: Mark Johnston CommitDate: 2024-04-30 21:33:43 +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 --- .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