Author: Owen Pan Date: 2023-10-25T05:45:32-07:00 New Revision: 23d6a6dfc1bc6e79bdcc48a59a0698a5b79262e9
URL: https://github.com/llvm/llvm-project/commit/23d6a6dfc1bc6e79bdcc48a59a0698a5b79262e9 DIFF: https://github.com/llvm/llvm-project/commit/23d6a6dfc1bc6e79bdcc48a59a0698a5b79262e9.diff LOG: [clang-format] Fix the version for a newly added option Also update the release notes. Added: Modified: clang/docs/ClangFormatStyleOptions.rst clang/docs/ReleaseNotes.rst clang/include/clang/Format/Format.h Removed: ################################################################################ diff --git a/clang/docs/ClangFormatStyleOptions.rst b/clang/docs/ClangFormatStyleOptions.rst index a552c9795acb952..21342e1b89ea866 100644 --- a/clang/docs/ClangFormatStyleOptions.rst +++ b/clang/docs/ClangFormatStyleOptions.rst @@ -1217,7 +1217,7 @@ the configuration (without a prefix: ``Auto``). .. _AllowShortCompoundRequirementOnASingleLine: -**AllowShortCompoundRequirementOnASingleLine** (``Boolean``) :versionbadge:`clang-format 16` :ref:`¶ <AllowShortCompoundRequirementOnASingleLine>` +**AllowShortCompoundRequirementOnASingleLine** (``Boolean``) :versionbadge:`clang-format 18` :ref:`¶ <AllowShortCompoundRequirementOnASingleLine>` Allow short compound requirement on a single line. .. code-block:: c++ diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst index c0514e5b70783b6..903ad19d0b845f2 100644 --- a/clang/docs/ReleaseNotes.rst +++ b/clang/docs/ReleaseNotes.rst @@ -775,6 +775,7 @@ AST Matchers clang-format ------------ - Add ``AllowBreakBeforeNoexceptSpecifier`` option. +- Add ``AllowShortCompoundRequirementOnASingleLine`` option. libclang -------- diff --git a/clang/include/clang/Format/Format.h b/clang/include/clang/Format/Format.h index f2ee25bc96d6f0d..3e9d1915badd87f 100644 --- a/clang/include/clang/Format/Format.h +++ b/clang/include/clang/Format/Format.h @@ -701,7 +701,7 @@ struct FormatStyle { /// } -> std::same_as<int>; /// }; /// \endcode - /// \version 16 + /// \version 18 bool AllowShortCompoundRequirementOnASingleLine; /// Allow short enums on a single line. _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits