🤜 Doctest 2.5.3

Signed-off-by: Niels Lohmann <mail@nlohmann.me>

.github/dependabot.yml

@@ -4,8 +4,6 @@ updates:
     directory: /
     schedule:
       interval: daily
-    cooldown:
-      default-days: 7
     groups:
       codeql-action:
         patterns:
@@ -15,33 +13,23 @@ updates:
     directory: /docs/mkdocs
     schedule:
       interval: daily
-    cooldown:
-      default-days: 7
 
   - package-ecosystem: pip
     directory: /tools/astyle
     schedule:
       interval: daily
-    cooldown:
-      default-days: 7
 
   - package-ecosystem: pip
     directory: /tools/generate_natvis
     schedule:
       interval: daily
-    cooldown:
-      default-days: 7
 
   - package-ecosystem: pip
     directory: /tools/serve_header
     schedule:
       interval: daily
-    cooldown:
-      default-days: 7
 
   - package-ecosystem: pip
     directory: /cmake/requirements
     schedule:
       interval: daily
-    cooldown:
-      default-days: 7

.github/workflows/semgrep.yml

@@ -49,7 +49,7 @@ jobs:
       # SEMGREP_APP_TOKEN is still passed through so registry auth works if a
       # token is ever added.
       - name: Install Semgrep
-        run: python3 -m pip install --user semgrep==1.168.0
+        run: python3 -m pip install --user semgrep
 
       # `semgrep scan --sarif` always exits 0 even with findings; continue-on-error
       # is a safety net so the SARIF upload still runs if the scan itself errors.

.github/workflows/windows.yml

@@ -90,13 +90,11 @@ jobs:
       - name: Get latest CMake and ninja
         uses: lukka/get-cmake@f5b8fbb4d77cec1acc5a5f9f0df4beffaf5d98d9 # v4.3.4
       - name: Set extra CXX_FLAGS for latest std_version
-        # /wd5285 silences C5285 emitted by the bundled third-party doctest.h, which
-        # specializes std::tuple (newly diagnosed by the VS2026 v145 toolset)
         run: |
           if [ "${{ matrix.std_version }}" = "latest" ]; then
-            echo "flags=/permissive- /std:c++latest /utf-8 /W4 /WX /wd5285" >> $GITHUB_ENV
+            echo "flags=/permissive- /std:c++latest /utf-8 /W4 /WX" >> $GITHUB_ENV
           else
-            echo "flags=/W4 /WX /wd5285" >> $GITHUB_ENV
+            echo "flags=/W4 /WX" >> $GITHUB_ENV
           fi
         shell: bash
       - name: Run CMake (Release)

cmake/clang_flags.cmake

@@ -5,7 +5,7 @@
 # -Wno-extra-semi-stmt            The library uses assert which triggers this warning.
 # -Wno-padded                     We do not care about padding warnings.
 # -Wno-covered-switch-default     All switches list all cases and a default case.
-# -Wno-unsafe-buffer-usage        Otherwise Doctest would not compile.
+# -Wno-unsafe-buffer-usage        Otherwise library code (strlen) would not compile.
 # -Wno-missing-noreturn           We found no way to silence this warning otherwise, see PR #4871
 
 set(CLANG_CXXFLAGS

cmake/gcc_flags.cmake

@@ -4,7 +4,6 @@
 # -Wno-aggregate-return  The library uses aggregate returns.
 # -Wno-long-long         The library uses the long long type to interface with system functions.
 # -Wno-namespaces        The library uses namespaces.
-# -Wno-nrvo              Doctest triggers this warning.
 # -Wno-padded            We do not care about padding warnings.
 # -Wno-system-headers    We do not care about warnings in system headers.
 # -Wno-templates         The library uses templates.
@@ -232,7 +231,6 @@ set(GCC_CXXFLAGS
     -Wnonnull
     -Wnonnull-compare
     -Wnormalized=nfkc
-    -Wno-nrvo
     -Wnull-dereference
     -Wodr
     -Wold-style-cast

docs/mkdocs/docs/api/basic_json/basic_json.md

@@ -82,13 +82,7 @@ basic_json(basic_json&& other) noexcept;
 4. This is a constructor for existing `basic_json` types. It does not hijack copy/move constructors, since the parameter
    has different template arguments than the current ones.
 
-    The constructor tries to convert the internal `m_value` of the parameter. Each member value (object, array, string,
-    etc.) is serialized via the corresponding `to_json()` overload. For objects and strings, the conversion requires
-    that the *target* `basic_json` type's `object_t::key_type` (or `string_t`) be directly constructible from the
-    *source* type's corresponding member type via `is_constructible`. If this requirement is not met, the conversion
-    does not fail to compile; instead, it silently falls back to the array-conversion path, which represents objects
-    as arrays of `[key, value]` pairs and strings as arrays of character codes. This is a known limitation tracked in
-    [issue #3425](https://github.com/nlohmann/json/issues/3425).
+    The constructor tries to convert the internal `m_value` of the parameter.
 
 5. Creates a JSON value of type array or object from the passed initializer list `init`. In case `type_deduction` is
    `#!cpp true` (default), the type of the JSON value to be created is deducted from the initializer list `init`
@@ -152,11 +146,6 @@ basic_json(basic_json&& other) noexcept;
 
     - `BasicJsonType` is a `basic_json` type.
     - `BasicJsonType` has different template arguments than `basic_json_t`.
-    
-    **Note:** For cross-`basic_json` conversions to produce correct results, the target `basic_json`'s
-    `object_t::key_type` and `string_t` must be directly constructible from the source `basic_json`'s
-    corresponding types. See the description of overload (4) above for details on what happens when
-    this requirement is not met.
 
 `U`:
 :   `uncvref_t<CompatibleType>`

docs/mkdocs/docs/api/basic_json/object_t.md

@@ -93,15 +93,6 @@ alphabetical order as `std::map` with `std::less` is used by default. Please not
 [RFC 8259](https://tools.ietf.org/html/rfc8259), because any order implements the specified "unordered" nature of JSON
 objects.
 
-#### Cross-`basic_json` conversion requirements
-
-When converting an object from one `basic_json` specialization to another via the
-[converting constructor](basic_json.md#overload-4), the target `object_t`'s `key_type` must be
-directly constructible from the source `basic_json`'s `string_t` type (or more generally, from the
-source object's key type). If this requirement is not met, the conversion does not fail; instead,
-the object is silently converted as an array of key-value pairs, which is incorrect. See
-[issue #3425](https://github.com/nlohmann/json/issues/3425) for details and an example.
-
 ## Examples
 
 ??? example

docs/mkdocs/docs/api/basic_json/string_t.md

@@ -45,15 +45,6 @@ This implementation is interoperable as it does compare strings code unit by cod
 String values are stored as pointers in a `basic_json` type. That is, for any access to string values, a pointer of type
 `string_t*` must be dereferenced.
 
-#### Cross-`basic_json` conversion requirements
-
-When converting a string value from one `basic_json` specialization to another via the
-[converting constructor](basic_json.md#overload-4), the target `string_t` must be directly
-constructible from the source `basic_json`'s `string_t` type. If this requirement is not met, the
-conversion does not fail; instead, the string is silently converted as an array of character codes,
-which is incorrect. See [issue #3425](https://github.com/nlohmann/json/issues/3425) for details
-and an example.
-
 ## Examples
 
 ??? example

docs/mkdocs/docs/robots.txt

@@ -1,4 +0,0 @@
-User-agent: *
-Allow: /
-
-Sitemap: https://json.nlohmann.me/sitemap.xml

docs/mkdocs/hooks/copy_markdown_source.py

@@ -1,25 +0,0 @@
-"""Copy each documentation page's Markdown source into the built site."""
-
-# Creates a `<path>.md` sibling of each HTML output (for example,
-# `features/comments/` becomes `features/comments.md`) so agents and tools can
-# fetch the raw Markdown directly instead of parsing rendered HTML.
-
-import os
-import shutil
-
-_pages = []
-
-
-def on_files(files, config):
-    global _pages
-    _pages = [f for f in files if f.is_documentation_page()]
-    return files
-
-
-def on_post_build(config):
-    site_dir = config["site_dir"]
-    for file in _pages:
-        url = file.url.rstrip("/")
-        target = os.path.join(site_dir, (url or "index") + ".md")
-        os.makedirs(os.path.dirname(target), exist_ok=True)
-        shutil.copyfile(file.abs_src_path, target)

docs/mkdocs/mkdocs.yml

@@ -367,9 +367,6 @@ markdown_extensions:
       auto_append:
         - ../includes/glossary.md
 
-hooks:
-  - hooks/copy_markdown_source.py
-
 plugins:
   - search:
       separator: '[\s\-\.]'
@@ -392,33 +389,6 @@ plugins:
         - https://nlohmann.github.io/json/*
         - mailto:*
   - privacy
-  - llmstxt:
-      markdown_description: >
-        JSON for Modern C++ is a C++11 header-only library implementing a JSON
-        value type with an STL-like API, JSON Pointer/Patch, CBOR/MessagePack/
-        BSON/UBJSON/BJData binary format support, and a SAX-style parser interface.
-      sections:
-        Home:
-          - index.md
-          - home/*.md
-        Features:
-          - features/*.md
-          - features/binary_formats/*.md
-          - features/element_access/*.md
-          - features/parsing/*.md
-          - features/types/*.md
-        Integration:
-          - integration/*.md
-        API Documentation:
-          - api/*.md
-          - api/basic_json/*.md
-          - api/adl_serializer/*.md
-          - api/byte_container_with_subtype/*.md
-          - api/json_pointer/*.md
-          - api/json_sax/*.md
-          - api/macros/*.md
-        Community:
-          - community/*.md
 
 extra_css:
   - css/custom.css

docs/mkdocs/requirements.txt

@@ -7,6 +7,5 @@ mkdocs-material-extensions==1.3.1                   # extensions
 mkdocs-minify-plugin==0.8.0                         # plugin "minify"
 mkdocs-redirects==1.2.3                             # plugin "redirects"
 mkdocs-htmlproofer-plugin==1.5.0                    # plugin "htmlproofer"
-mkdocs-llmstxt==0.5.0                               # plugin "llmstxt"
 
 PyYAML==6.0.3                                       # linter

include/nlohmann/detail/output/serializer.hpp

@@ -465,12 +465,18 @@ class serializer
                             {
                                 if (codepoint <= 0xFFFF)
                                 {
-                                    write_u_escape(bytes, static_cast<std::uint16_t>(codepoint));
+                                    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+                                    static_cast<void>((std::snprintf)(string_buffer.data() + bytes, 7, "\\u%04x",
+                                                                      static_cast<std::uint16_t>(codepoint)));
+                                    bytes += 6;
                                 }
                                 else
                                 {
-                                    write_u_escape(bytes, static_cast<std::uint16_t>(0xD7C0u + (codepoint >> 10u)));
-                                    write_u_escape(bytes, static_cast<std::uint16_t>(0xDC00u + (codepoint & 0x3FFu)));
+                                    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+                                    static_cast<void>((std::snprintf)(string_buffer.data() + bytes, 13, "\\u%04x\\u%04x",
+                                                                      static_cast<std::uint16_t>(0xD7C0u + (codepoint >> 10u)),
+                                                                      static_cast<std::uint16_t>(0xDC00u + (codepoint & 0x3FFu))));
+                                    bytes += 12;
                                 }
                             }
                             else
@@ -677,32 +683,6 @@ class serializer
         return result;
     }
 
-    /*!
-     * @brief write a lowercase "\uXXXX" escape sequence into @a string_buffer
-     *
-     * Branch-free replacement for `snprintf(buf, 7, "\\u%04x", codeunit)` in the
-     * string escaping hot path. It writes exactly six characters ('\\', 'u' and
-     * four hex digits) at position @a pos of @a string_buffer via a nibble
-     * lookup table, avoiding the format-string parsing and locale machinery of
-     * `snprintf`. Advances @a pos by the number of bytes written (6).
-     *
-     * @param[in] pos       position in @a string_buffer to write at; there must
-     *                      be at least 6 bytes of headroom
-     * @param[in] codeunit  16-bit value to encode
-     */
-    void write_u_escape(std::size_t& pos, std::uint16_t codeunit) noexcept
-    {
-        JSON_ASSERT(string_buffer.size() - pos >= 6);
-        constexpr const char* nibble_to_hex = "0123456789abcdef";
-        string_buffer[pos + 0] = '\\';
-        string_buffer[pos + 1] = 'u';
-        string_buffer[pos + 2] = nibble_to_hex[(codeunit >> 12u) & 0x0Fu];
-        string_buffer[pos + 3] = nibble_to_hex[(codeunit >> 8u) & 0x0Fu];
-        string_buffer[pos + 4] = nibble_to_hex[(codeunit >> 4u) & 0x0Fu];
-        string_buffer[pos + 5] = nibble_to_hex[codeunit & 0x0Fu];
-        pos += 6;
-    }
-
     // templates to avoid warnings about useless casts
     template <typename NumberType, enable_if_t<std::is_signed<NumberType>::value, int> = 0>
     bool is_negative_number(NumberType x)

single_include/nlohmann/json.hpp

@@ -19962,12 +19962,18 @@ class serializer
                             {
                                 if (codepoint <= 0xFFFF)
                                 {
-                                    write_u_escape(bytes, static_cast<std::uint16_t>(codepoint));
+                                    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+                                    static_cast<void>((std::snprintf)(string_buffer.data() + bytes, 7, "\\u%04x",
+                                                                      static_cast<std::uint16_t>(codepoint)));
+                                    bytes += 6;
                                 }
                                 else
                                 {
-                                    write_u_escape(bytes, static_cast<std::uint16_t>(0xD7C0u + (codepoint >> 10u)));
-                                    write_u_escape(bytes, static_cast<std::uint16_t>(0xDC00u + (codepoint & 0x3FFu)));
+                                    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+                                    static_cast<void>((std::snprintf)(string_buffer.data() + bytes, 13, "\\u%04x\\u%04x",
+                                                                      static_cast<std::uint16_t>(0xD7C0u + (codepoint >> 10u)),
+                                                                      static_cast<std::uint16_t>(0xDC00u + (codepoint & 0x3FFu))));
+                                    bytes += 12;
                                 }
                             }
                             else
@@ -20174,32 +20180,6 @@ class serializer
         return result;
     }
 
-    /*!
-     * @brief write a lowercase "\uXXXX" escape sequence into @a string_buffer
-     *
-     * Branch-free replacement for `snprintf(buf, 7, "\\u%04x", codeunit)` in the
-     * string escaping hot path. It writes exactly six characters ('\\', 'u' and
-     * four hex digits) at position @a pos of @a string_buffer via a nibble
-     * lookup table, avoiding the format-string parsing and locale machinery of
-     * `snprintf`. Advances @a pos by the number of bytes written (6).
-     *
-     * @param[in] pos       position in @a string_buffer to write at; there must
-     *                      be at least 6 bytes of headroom
-     * @param[in] codeunit  16-bit value to encode
-     */
-    void write_u_escape(std::size_t& pos, std::uint16_t codeunit) noexcept
-    {
-        JSON_ASSERT(string_buffer.size() - pos >= 6);
-        constexpr const char* nibble_to_hex = "0123456789abcdef";
-        string_buffer[pos + 0] = '\\';
-        string_buffer[pos + 1] = 'u';
-        string_buffer[pos + 2] = nibble_to_hex[(codeunit >> 12u) & 0x0Fu];
-        string_buffer[pos + 3] = nibble_to_hex[(codeunit >> 8u) & 0x0Fu];
-        string_buffer[pos + 4] = nibble_to_hex[(codeunit >> 4u) & 0x0Fu];
-        string_buffer[pos + 5] = nibble_to_hex[codeunit & 0x0Fu];
-        pos += 6;
-    }
-
     // templates to avoid warnings about useless casts
     template <typename NumberType, enable_if_t<std::is_signed<NumberType>::value, int> = 0>
     bool is_negative_number(NumberType x)

tests/src/unit-algorithms.cpp

@@ -232,9 +232,6 @@ TEST_CASE("algorithms")
             // only the first four elements are expected to be sorted, the rest are
             // unspecified by the standard
             const json expected({nullptr, false, true, 3});
-            // std::equal below only bounds-checks the first range; assert the
-            // second range is at least as long to rule out an over-read (CWE-126)
-            CHECK(std::distance(begin(expected), end(expected)) >= 4);
             CHECK(std::equal(j.begin(), j.begin() + 4, begin(expected)));
         }
     }

tests/src/unit-alt-string.cpp

@@ -322,12 +322,14 @@ TEST_CASE("alternative string type")
 
     SECTION("JSON pointer")
     {
-        // Direct conversion from a json literal to alt_json is not supported due to issue #3425:
-        // alt_json's string_t (alt_string) is not directly constructible from std::string, so the
-        // cross-basic_json conversion falls back to the array-conversion path, incorrectly representing
-        // objects as arrays of [key, value] pairs and strings as arrays of character codes.
-        // See https://github.com/nlohmann/json/issues/3425 for details.
-        // Workaround: use alt_json::parse() instead of implicit conversion.
+        // conversion from json to alt_json fails to compile (see #3425);
+        // attempted fix(*) produces: [[['b','a','r'],['b','a','z']]] (with each char being an integer)
+        // (*) disable implicit conversion for json_refs of any basic_json type
+        // alt_json j = R"(
+        // {
+        //     "foo": ["bar", "baz"]
+        // }
+        // )"_json;
         auto j = alt_json::parse(R"({"foo": ["bar", "baz"]})");
 
         CHECK(j.at(alt_json::json_pointer("/foo/0")) == j["foo"][0]);

tests/src/unit-convenience.cpp

@@ -168,32 +168,6 @@ TEST_CASE("convenience functions")
         CHECK_THROWS_WITH_AS(check_escaped("\xC2"), "[json.exception.type_error.316] incomplete UTF-8 string; last byte: 0xC2", json::type_error&);
     }
 
-    SECTION("string escape with ensure_ascii")
-    {
-        // control characters are escaped regardless of ensure_ascii
-        check_escaped("\x01", "\\u0001", true);
-        check_escaped("\x1f", "\\u001f", true);
-
-        // non-ASCII code points in the Basic Multilingual Plane are emitted as
-        // a single lowercase \uXXXX escape (exercises every nibble position)
-        check_escaped("\xC2\x80", "\\u0080", true);         // U+0080
-        check_escaped("\xC3\xBF", "\\u00ff", true);         // U+00FF (ÿ)
-        check_escaped("\xDF\xBF", "\\u07ff", true);         // U+07FF
-        check_escaped("\xE4\xBD\xA0", "\\u4f60", true);     // U+4F60 (你)
-        check_escaped("\xEA\xAF\x8D", "\\uabcd", true);     // U+ABCD
-        check_escaped("\xEF\xBF\xBD", "\\ufffd", true);     // U+FFFD (replacement char, all-f nibbles)
-
-        // code points outside the BMP are emitted as a UTF-16 surrogate pair
-        // of two lowercase \uXXXX escapes
-        check_escaped("\xF0\x90\x80\x80", "\\ud800\\udc00", true); // U+10000 (lowest astral)
-        check_escaped("\xF0\x9F\x98\x80", "\\ud83d\\ude00", true); // U+1F600 (😀)
-        check_escaped("\xF4\x8F\xBF\xBF", "\\udbff\\udfff", true); // U+10FFFF (highest code point)
-
-        // with ensure_ascii disabled, non-ASCII input is passed through verbatim
-        check_escaped("\xE4\xBD\xA0", "\xE4\xBD\xA0", false);
-        check_escaped("\xF0\x9F\x98\x80", "\xF0\x9F\x98\x80", false);
-    }
-
     SECTION("string concat")
     {
         using nlohmann::detail::concat;