This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG10518feaf337: [clang-format][doc] Fix contradiction in
SortIncludes description (authored by michael-g-matthews, committed by owenpan).
Changed prior to commit:
https://reviews.llvm.org/D147894?vs=512042&id=525986#toc
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D147894/new/
https://reviews.llvm.org/D147894
Files:
clang/docs/ClangFormatStyleOptions.rst
clang/include/clang/Format/Format.h
Index: clang/include/clang/Format/Format.h
===================================================================
--- clang/include/clang/Format/Format.h
+++ clang/include/clang/Format/Format.h
@@ -3601,11 +3601,6 @@
};
/// Controls if and how clang-format will sort ``#includes``.
- /// If ``Never``, includes are never sorted.
- /// If ``CaseInsensitive``, includes are sorted in an ASCIIbetical or case
- /// insensitive fashion.
- /// If ``CaseSensitive``, includes are sorted in an alphabetical or case
- /// sensitive fashion.
/// \version 3.8
SortIncludesOptions SortIncludes;
Index: clang/docs/ClangFormatStyleOptions.rst
===================================================================
--- clang/docs/ClangFormatStyleOptions.rst
+++ clang/docs/ClangFormatStyleOptions.rst
@@ -2453,7 +2453,7 @@
* ``BBCDS_Allowed`` (in configuration: ``Allowed``)
Breaking between template declaration and ``concept`` is allowed. The
actual behavior depends on the content and line breaking rules and
- penalties.
+ penalities.
* ``BBCDS_Always`` (in configuration: ``Always``)
Always break before ``concept``, putting it in the line after the
@@ -4561,11 +4561,6 @@
**SortIncludes** (``SortIncludesOptions``) :versionbadge:`clang-format 3.8`
:ref:`¶ <SortIncludes>`
Controls if and how clang-format will sort ``#includes``.
- If ``Never``, includes are never sorted.
- If ``CaseInsensitive``, includes are sorted in an ASCIIbetical or case
- insensitive fashion.
- If ``CaseSensitive``, includes are sorted in an alphabetical or case
- sensitive fashion.
Possible values:
Index: clang/include/clang/Format/Format.h
===================================================================
--- clang/include/clang/Format/Format.h
+++ clang/include/clang/Format/Format.h
@@ -3601,11 +3601,6 @@
};
/// Controls if and how clang-format will sort ``#includes``.
- /// If ``Never``, includes are never sorted.
- /// If ``CaseInsensitive``, includes are sorted in an ASCIIbetical or case
- /// insensitive fashion.
- /// If ``CaseSensitive``, includes are sorted in an alphabetical or case
- /// sensitive fashion.
/// \version 3.8
SortIncludesOptions SortIncludes;
Index: clang/docs/ClangFormatStyleOptions.rst
===================================================================
--- clang/docs/ClangFormatStyleOptions.rst
+++ clang/docs/ClangFormatStyleOptions.rst
@@ -2453,7 +2453,7 @@
* ``BBCDS_Allowed`` (in configuration: ``Allowed``)
Breaking between template declaration and ``concept`` is allowed. The
actual behavior depends on the content and line breaking rules and
- penalties.
+ penalities.
* ``BBCDS_Always`` (in configuration: ``Always``)
Always break before ``concept``, putting it in the line after the
@@ -4561,11 +4561,6 @@
**SortIncludes** (``SortIncludesOptions``) :versionbadge:`clang-format 3.8` :ref:`¶ <SortIncludes>`
Controls if and how clang-format will sort ``#includes``.
- If ``Never``, includes are never sorted.
- If ``CaseInsensitive``, includes are sorted in an ASCIIbetical or case
- insensitive fashion.
- If ``CaseSensitive``, includes are sorted in an alphabetical or case
- sensitive fashion.
Possible values:
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
