From 10518feaf33760e77be46af62c41a1caf4ef1da2 Mon Sep 17 00:00:00 2001 From: Mike Matthews Date: Fri, 26 May 2023 01:53:25 -0700 Subject: [PATCH] [clang-format][doc] Fix contradiction in SortIncludes description Fixes #62033. Differential Revision: https://reviews.llvm.org/D147894 --- clang/docs/ClangFormatStyleOptions.rst | 7 +------ clang/include/clang/Format/Format.h | 5 ----- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/clang/docs/ClangFormatStyleOptions.rst b/clang/docs/ClangFormatStyleOptions.rst index 56b6b62..a8fc651 100644 --- a/clang/docs/ClangFormatStyleOptions.rst +++ b/clang/docs/ClangFormatStyleOptions.rst @@ -2453,7 +2453,7 @@ the configuration (without a prefix: ``Auto``). * ``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 @@ the configuration (without a prefix: ``Auto``). **SortIncludes** (``SortIncludesOptions``) :versionbadge:`clang-format 3.8` :ref:`¶ ` 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: diff --git a/clang/include/clang/Format/Format.h b/clang/include/clang/Format/Format.h index 1cc1037..78c0847 100644 --- a/clang/include/clang/Format/Format.h +++ b/clang/include/clang/Format/Format.h @@ -3601,11 +3601,6 @@ struct FormatStyle { }; /// 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; -- 2.7.4