Author: Mike Matthews Date: 2023-05-26T01:58:57-07:00 New Revision: 10518feaf33760e77be46af62c41a1caf4ef1da2
URL: https://github.com/llvm/llvm-project/commit/10518feaf33760e77be46af62c41a1caf4ef1da2 DIFF: https://github.com/llvm/llvm-project/commit/10518feaf33760e77be46af62c41a1caf4ef1da2.diff LOG: [clang-format][doc] Fix contradiction in SortIncludes description Fixes #62033. Differential Revision: https://reviews.llvm.org/D147894 Added: Modified: clang/docs/ClangFormatStyleOptions.rst clang/include/clang/Format/Format.h Removed: ################################################################################ diff --git a/clang/docs/ClangFormatStyleOptions.rst b/clang/docs/ClangFormatStyleOptions.rst index 56b6b62e3138c..a8fc651f92a99 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:`ΒΆ <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: diff --git a/clang/include/clang/Format/Format.h b/clang/include/clang/Format/Format.h index 1cc1037562b89..78c08477e9a18 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; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
