Author: Krystian Kuzniarek Date: 2022-07-16T18:19:11+02:00 New Revision: b2465748f236810944cf31f9438ac715e5362334
URL: https://github.com/llvm/llvm-project/commit/b2465748f236810944cf31f9438ac715e5362334 DIFF: https://github.com/llvm/llvm-project/commit/b2465748f236810944cf31f9438ac715e5362334.diff LOG: [clang-format][docs] Fix incorrect 'clang-format 7' option markers Introduced by 23a5090c6, some style option markers indicated 'clang-format 7', though their respective options were available in different releases. Added: Modified: clang/docs/ClangFormatStyleOptions.rst clang/include/clang/Format/Format.h clang/include/clang/Tooling/Inclusions/IncludeStyle.h Removed: ################################################################################ diff --git a/clang/docs/ClangFormatStyleOptions.rst b/clang/docs/ClangFormatStyleOptions.rst index a65382729da4a..ffd61ee2a1ae4 100644 --- a/clang/docs/ClangFormatStyleOptions.rst +++ b/clang/docs/ClangFormatStyleOptions.rst @@ -1256,7 +1256,7 @@ the configuration (without a prefix: ``Auto``). "bbbb" "cccc"; "cccc"; -**AlwaysBreakTemplateDeclarations** (``BreakTemplateDeclarationsStyle``) :versionbadge:`clang-format 7` +**AlwaysBreakTemplateDeclarations** (``BreakTemplateDeclarationsStyle``) :versionbadge:`clang-format 3.4` The template declaration breaking style to use. Possible values: @@ -2623,7 +2623,7 @@ the configuration (without a prefix: ``Auto``). For example: `KJ_IF_MAYBE <https://github.com/capnproto/capnproto/blob/master/kjdoc/tour.md#maybes>`_ -**IncludeBlocks** (``IncludeBlocksStyle``) :versionbadge:`clang-format 7` +**IncludeBlocks** (``IncludeBlocksStyle``) :versionbadge:`clang-format 6` Dependent on the value, multiple ``#include`` blocks can be sorted as one and divided based on category. @@ -2663,7 +2663,7 @@ the configuration (without a prefix: ``Auto``). -**IncludeCategories** (``List of IncludeCategories``) :versionbadge:`clang-format 7` +**IncludeCategories** (``List of IncludeCategories``) :versionbadge:`clang-format 3.8` Regular expressions denoting the diff erent ``#include`` categories used for ordering ``#includes``. @@ -2711,7 +2711,7 @@ the configuration (without a prefix: ``Auto``). Priority: 1 SortPriority: 0 -**IncludeIsMainRegex** (``String``) :versionbadge:`clang-format 7` +**IncludeIsMainRegex** (``String``) :versionbadge:`clang-format 3.9` Specify a regular expression of suffixes that are allowed in the file-to-main-include mapping. @@ -2724,7 +2724,7 @@ the configuration (without a prefix: ``Auto``). For example, if configured to "(_test)?$", then a header a.h would be seen as the "main" include in both a.cc and a_test.cc. -**IncludeIsMainSourceRegex** (``String``) :versionbadge:`clang-format 7` +**IncludeIsMainSourceRegex** (``String``) :versionbadge:`clang-format 10` Specify a regular expression for files being formatted that are allowed to be considered "main" in the file-to-main-include mapping. diff --git a/clang/include/clang/Format/Format.h b/clang/include/clang/Format/Format.h index f8a4b069b2e75..77ff9a8634295 100644 --- a/clang/include/clang/Format/Format.h +++ b/clang/include/clang/Format/Format.h @@ -786,7 +786,7 @@ struct FormatStyle { }; /// The template declaration breaking style to use. - /// \version 7 + /// \version 3.4 BreakTemplateDeclarationsStyle AlwaysBreakTemplateDeclarations; /// A vector of strings that should be interpreted as attributes/qualifiers diff --git a/clang/include/clang/Tooling/Inclusions/IncludeStyle.h b/clang/include/clang/Tooling/Inclusions/IncludeStyle.h index d5638642d0172..d6b2b0192477d 100644 --- a/clang/include/clang/Tooling/Inclusions/IncludeStyle.h +++ b/clang/include/clang/Tooling/Inclusions/IncludeStyle.h @@ -50,7 +50,7 @@ struct IncludeStyle { /// Dependent on the value, multiple ``#include`` blocks can be sorted /// as one and divided based on category. - /// \version 7 + /// \version 6 IncludeBlocksStyle IncludeBlocks; /// See documentation of ``IncludeCategories``. @@ -114,7 +114,7 @@ struct IncludeStyle { /// Priority: 1 /// SortPriority: 0 /// \endcode - /// \version 7 + /// \version 3.8 std::vector<IncludeCategory> IncludeCategories; /// Specify a regular expression of suffixes that are allowed in the @@ -128,7 +128,7 @@ struct IncludeStyle { /// /// For example, if configured to "(_test)?$", then a header a.h would be seen /// as the "main" include in both a.cc and a_test.cc. - /// \version 7 + /// \version 3.9 std::string IncludeIsMainRegex; /// Specify a regular expression for files being formatted @@ -149,7 +149,7 @@ struct IncludeStyle { /// also being respected in later phase). Without this option set, /// ``ClassImpl.hpp`` would not have the main include file put on top /// before any other include. - /// \version 7 + /// \version 10 std::string IncludeIsMainSourceRegex; }; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
