Fix the Clang sphinx bot again

The changes to fix the bot yesterday got reverted in a subsequent
commit, so this adds those changes back again.

Fixes the issue found in:
https://lab.llvm.org/buildbot/#/builders/92/builds/38593

diff --git a/clang/docs/ClangFormatStyleOptions.rst b/clang/docs/ClangFormatStyleOptions.rst
index 6d0df7b..302069e 100644 (file)
--- a/clang/docs/ClangFormatStyleOptions.rst
+++ b/clang/docs/ClangFormatStyleOptions.rst
@@ -3222,7 +3222,7 @@ the configuration (without a prefix: ``Auto``).
 
   * ``int8_t Binary`` Format separators in binary literals.
 
-    .. code-block:: c++
+    .. code-block:: text
 
       /* -1: */ b = 0b100111101101;
       /*  0: */ b = 0b10011'11'0110'1;
@@ -3231,7 +3231,7 @@ the configuration (without a prefix: ``Auto``).
 
   * ``int8_t Decimal`` Format separators in decimal literals.
 
-    .. code-block:: c++
+    .. code-block:: text
 
       /* -1: */ d = 18446744073709550592ull;
       /*  0: */ d = 184467'440737'0'95505'92ull;
@@ -3239,7 +3239,7 @@ the configuration (without a prefix: ``Auto``).
 
   * ``int8_t Hex`` Format separators in hexadecimal literals.
 
-    .. code-block:: c++
+    .. code-block:: text
 
       /* -1: */ h = 0xDEADBEEFDEADBEEFuz;
       /*  0: */ h = 0xDEAD'BEEF'DE'AD'BEE'Fuz;

diff --git a/clang/include/clang/Format/Format.h b/clang/include/clang/Format/Format.h
index f2efe82..0ca2430 100644 (file)
--- a/clang/include/clang/Format/Format.h
+++ b/clang/include/clang/Format/Format.h
@@ -2501,7 +2501,7 @@ struct FormatStyle {
   /// \endcode
   struct IntegerLiteralSeparatorStyle {
     /// Format separators in binary literals.
-    /// \code
+    /// \code{.text}
     ///   /* -1: */ b = 0b100111101101;
     ///   /*  0: */ b = 0b10011'11'0110'1;
     ///   /*  3: */ b = 0b100'111'101'101;
@@ -2509,14 +2509,14 @@ struct FormatStyle {
     /// \endcode
     int8_t Binary;
     /// Format separators in decimal literals.
-    /// \code
+    /// \code{.text}
     ///   /* -1: */ d = 18446744073709550592ull;
     ///   /*  0: */ d = 184467'440737'0'95505'92ull;
     ///   /*  3: */ d = 18'446'744'073'709'550'592ull;
     /// \endcode
     int8_t Decimal;
     /// Format separators in hexadecimal literals.
-    /// \code
+    /// \code{.text}
     ///   /* -1: */ h = 0xDEADBEEFDEADBEEFuz;
     ///   /*  0: */ h = 0xDEAD'BEEF'DE'AD'BEE'Fuz;
     ///   /*  2: */ h = 0xDE'AD'BE'EF'DE'AD'BE'EFuz;