[clang] [clang-format][docs] Fix version (PR #81185)

Björn Schäpers via cfe-commits cfe-commits at lists.llvm.org
Thu Feb 8 12:12:00 PST 2024


https://github.com/HazardyKnusperkeks created https://github.com/llvm/llvm-project/pull/81185

#78752 was not merged in time for clang-format 18.

>From 0a6d07033cbc8218763bbee44df688b29bf7aa55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Sch=C3=A4pers?= <github at hazardy.de>
Date: Thu, 8 Feb 2024 21:08:52 +0100
Subject: [PATCH 1/2] [doc][clang-format] Fix version

#78752 was not merged in time for clang-format 18
---
 clang/include/clang/Tooling/Inclusions/IncludeStyle.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clang/include/clang/Tooling/Inclusions/IncludeStyle.h b/clang/include/clang/Tooling/Inclusions/IncludeStyle.h
index c91e4a6b0ac54a..d167b7e45467fe 100644
--- a/clang/include/clang/Tooling/Inclusions/IncludeStyle.h
+++ b/clang/include/clang/Tooling/Inclusions/IncludeStyle.h
@@ -164,7 +164,7 @@ struct IncludeStyle {
 
   /// When guessing whether a #include is the "main" include, only the include
   /// directives that use the specified character are considered.
-  /// \version 18
+  /// \version 19
   MainIncludeCharDiscriminator MainIncludeChar;
 };
 

>From e254f1160cb40cb57c093ee09f03b3406db210b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Sch=C3=A4pers?= <github at hazardy.de>
Date: Thu, 8 Feb 2024 21:11:03 +0100
Subject: [PATCH 2/2] Update ClangFormatStyleOptions.rst

---
 clang/docs/ClangFormatStyleOptions.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clang/docs/ClangFormatStyleOptions.rst b/clang/docs/ClangFormatStyleOptions.rst
index 0a8cc18c5b4cb5..4ccdd2d104de1f 100644
--- a/clang/docs/ClangFormatStyleOptions.rst
+++ b/clang/docs/ClangFormatStyleOptions.rst
@@ -4156,7 +4156,7 @@ the configuration (without a prefix: ``Auto``).
 
 .. _MainIncludeChar:
 
-**MainIncludeChar** (``MainIncludeCharDiscriminator``) :versionbadge:`clang-format 18` :ref:`¶ <MainIncludeChar>`
+**MainIncludeChar** (``MainIncludeCharDiscriminator``) :versionbadge:`clang-format 19` :ref:`¶ <MainIncludeChar>`
   When guessing whether a #include is the "main" include, only the include
   directives that use the specified character are considered.
 



More information about the cfe-commits mailing list