From 1220d632b561892e37ad0b40ba5de7b4174eec42 Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Mon, 23 Feb 2026 16:24:27 +0000 Subject: [PATCH] style: Fix lint comments due to style changes (#2963) --- src/etl/NFTHelpers.cpp | 9 ++++----- tests/unit/app/CliArgsTests.cpp | 12 ++++++++---- tests/unit/web/RPCServerHandlerTests.cpp | 3 +-- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/etl/NFTHelpers.cpp b/src/etl/NFTHelpers.cpp index 59f2b1096..6ef4e0522 100644 --- a/src/etl/NFTHelpers.cpp +++ b/src/etl/NFTHelpers.cpp @@ -137,20 +137,19 @@ getNFTokenMintData(ripple::TxMeta const& txMeta, ripple::STTx const& sttx) // Find the first NFT ID that doesn't match. We're looking for an // added NFT, so the one we want will be the mismatch in finalIDs. - // NOLINTNEXTLINE(modernize-use-ranges) - auto const diff = std::ranges::mismatch(finalIDs, prevIDs); + auto const [finalMismatch, prevMismatch] = std::ranges::mismatch(finalIDs, prevIDs); // There should always be a difference so the returned finalIDs // iterator should never be end(). But better safe than sorry. - if (finalIDs.size() != prevIDs.size() + 1 || diff.in1 == finalIDs.end() || !owner) { + if (finalIDs.size() != prevIDs.size() + 1 || finalMismatch == finalIDs.end() || !owner) { throw std::runtime_error( fmt::format(" - unexpected NFTokenMint data in tx {}", strHex(sttx.getTransactionID())) ); } return { - {NFTTransactionsData(*diff.in1, txMeta, sttx.getTransactionID())}, - NFTsData(*diff.in1, *owner, sttx.getFieldVL(ripple::sfURI), txMeta) + {NFTTransactionsData(*finalMismatch, txMeta, sttx.getTransactionID())}, + NFTsData(*finalMismatch, *owner, sttx.getFieldVL(ripple::sfURI), txMeta) }; } diff --git a/tests/unit/app/CliArgsTests.cpp b/tests/unit/app/CliArgsTests.cpp index c02e42222..c9d7366f6 100644 --- a/tests/unit/app/CliArgsTests.cpp +++ b/tests/unit/app/CliArgsTests.cpp @@ -116,8 +116,10 @@ TEST_F(CliArgsTests, Parse_Config) { std::string_view configPath = "some_config_path"; std::array argv{ - "clio_server", "--conf", configPath.data() - }; // NOLINT(bugprone-suspicious-stringview-data-usage) + "clio_server", + "--conf", + configPath.data() // NOLINT(bugprone-suspicious-stringview-data-usage) + }; auto const action = CliArgs::parse(argv.size(), argv.data()); int const returnCode = 123; @@ -140,8 +142,10 @@ TEST_F(CliArgsTests, Parse_VerifyConfig) { std::string_view configPath = "some_config_path"; std::array argv{ - "clio_server", configPath.data(), "--verify" - }; // NOLINT(bugprone-suspicious-stringview-data-usage) + "clio_server", + configPath.data(), // NOLINT(bugprone-suspicious-stringview-data-usage) + "--verify" + }; auto const action = CliArgs::parse(argv.size(), argv.data()); int const returnCode = 123; diff --git a/tests/unit/web/RPCServerHandlerTests.cpp b/tests/unit/web/RPCServerHandlerTests.cpp index 4a5fc2579..3ee1cca14 100644 --- a/tests/unit/web/RPCServerHandlerTests.cpp +++ b/tests/unit/web/RPCServerHandlerTests.cpp @@ -70,9 +70,8 @@ struct MockWsBase : public web::ConnectionBase { } void - // NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved) send( - std::string&& msg, + std::string&& msg, // NOLINT(cppcoreguidelines-rvalue-reference-param-not-moved) boost::beast::http::status status = boost::beast::http::status::ok ) override {