Skip to content

[clang-format][docs] Fix version #81185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 9, 2024

Conversation

HazardyKnusperkeks
Copy link
Contributor

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

@llvmbot llvmbot added the clang Clang issues not falling into any other category label Feb 8, 2024
@llvmbot
Copy link
Member

llvmbot commented Feb 8, 2024

@llvm/pr-subscribers-clang-format

@llvm/pr-subscribers-clang

Author: Björn Schäpers (HazardyKnusperkeks)

Changes

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


Full diff: https://github.com/llvm/llvm-project/pull/81185.diff

2 Files Affected:

  • (modified) clang/docs/ClangFormatStyleOptions.rst (+1-1)
  • (modified) clang/include/clang/Tooling/Inclusions/IncludeStyle.h (+1-1)
diff --git a/clang/docs/ClangFormatStyleOptions.rst b/clang/docs/ClangFormatStyleOptions.rst
index 0a8cc18c5b4cb..4ccdd2d104de1 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.
 
diff --git a/clang/include/clang/Tooling/Inclusions/IncludeStyle.h b/clang/include/clang/Tooling/Inclusions/IncludeStyle.h
index c91e4a6b0ac54..d167b7e45467f 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;
 };
 

@owenca owenca added clang-format and removed clang Clang issues not falling into any other category labels Feb 9, 2024
Copy link
Contributor

@owenca owenca left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch!

@HazardyKnusperkeks HazardyKnusperkeks merged commit 9d9cc37 into llvm:main Feb 9, 2024
@HazardyKnusperkeks HazardyKnusperkeks deleted the Fix-Version branch February 9, 2024 19:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants