maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[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.
This commit is contained in:
Krystian Kuzniarek 2022-04-28 15:40:09 +02:00
parent 1436420082
commit b2465748f2
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clang/docs/ClangFormatStyleOptions.rst
View File

@ -1256,7 +1256,7 @@ the configuration (without a prefix: ``Auto``).
"bbbb" "cccc"; "bbbb" "cccc";
"cccc"; "cccc";
**AlwaysBreakTemplateDeclarations** (``BreakTemplateDeclarationsStyle``) :versionbadge:`clang-format 7` **AlwaysBreakTemplateDeclarations** (``BreakTemplateDeclarationsStyle``) :versionbadge:`clang-format 3.4`
The template declaration breaking style to use. The template declaration breaking style to use.
Possible values: Possible values:
@ -2623,7 +2623,7 @@ the configuration (without a prefix: ``Auto``).
For example: `KJ_IF_MAYBE For example: `KJ_IF_MAYBE
<https://github.com/capnproto/capnproto/blob/master/kjdoc/tour.md#maybes>`_ <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 Dependent on the value, multiple ``#include`` blocks can be sorted
as one and divided based on category. 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 different ``#include`` categories Regular expressions denoting the different ``#include`` categories
used for ordering ``#includes``. used for ordering ``#includes``.
@ -2711,7 +2711,7 @@ the configuration (without a prefix: ``Auto``).
Priority: 1 Priority: 1
SortPriority: 0 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 Specify a regular expression of suffixes that are allowed in the
file-to-main-include mapping. 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 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. 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 Specify a regular expression for files being formatted
that are allowed to be considered "main" in the that are allowed to be considered "main" in the
file-to-main-include mapping. file-to-main-include mapping.

2
clang/include/clang/Format/Format.h
View File

@ -786,7 +786,7 @@ struct FormatStyle {
}; };
/// The template declaration breaking style to use. /// The template declaration breaking style to use.
/// \version 7 /// \version 3.4
BreakTemplateDeclarationsStyle AlwaysBreakTemplateDeclarations; BreakTemplateDeclarationsStyle AlwaysBreakTemplateDeclarations;
/// A vector of strings that should be interpreted as attributes/qualifiers /// A vector of strings that should be interpreted as attributes/qualifiers

8
clang/include/clang/Tooling/Inclusions/IncludeStyle.h
View File

@ -50,7 +50,7 @@ struct IncludeStyle {
/// Dependent on the value, multiple ``#include`` blocks can be sorted /// Dependent on the value, multiple ``#include`` blocks can be sorted
/// as one and divided based on category. /// as one and divided based on category.
/// \version 7 /// \version 6
IncludeBlocksStyle IncludeBlocks; IncludeBlocksStyle IncludeBlocks;
/// See documentation of ``IncludeCategories``. /// See documentation of ``IncludeCategories``.
@ -114,7 +114,7 @@ struct IncludeStyle {
/// Priority: 1 /// Priority: 1
/// SortPriority: 0 /// SortPriority: 0
/// \endcode /// \endcode
/// \version 7 /// \version 3.8
std::vector<IncludeCategory> IncludeCategories; std::vector<IncludeCategory> IncludeCategories;
/// Specify a regular expression of suffixes that are allowed in the /// 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 /// 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. /// as the "main" include in both a.cc and a_test.cc.
/// \version 7 /// \version 3.9
std::string IncludeIsMainRegex; std::string IncludeIsMainRegex;
/// Specify a regular expression for files being formatted /// Specify a regular expression for files being formatted
@ -149,7 +149,7 @@ struct IncludeStyle {
/// also being respected in later phase). Without this option set, /// also being respected in later phase). Without this option set,
/// ``ClassImpl.hpp`` would not have the main include file put on top /// ``ClassImpl.hpp`` would not have the main include file put on top
/// before any other include. /// before any other include.
/// \version 7 /// \version 10
std::string IncludeIsMainSourceRegex; std::string IncludeIsMainSourceRegex;
}; };