From bd4837f2404f20c0516d6e3579b7a0173df37d39 Mon Sep 17 00:00:00 2001 From: Sean Robinson Date: Wed, 9 Feb 2022 15:27:16 -0700 Subject: [PATCH] Enable clang-tidy's readability-qualified-auto check Following the clang-tidy suggested fix in consume_digits causes compile failures with MSVC 19.29 in our CI. Signed-off-by: Sean Robinson --- .clang-tidy | 1 - include/argparse/argparse.hpp | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.clang-tidy b/.clang-tidy index 107ed93..419f5ee 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -3,7 +3,6 @@ Checks: readability-*, -readability-else-after-return, -readability-function-cognitive-complexity, - -readability-qualified-auto, -readability-static-accessed-through-instance, CheckOptions: diff --git a/include/argparse/argparse.hpp b/include/argparse/argparse.hpp index 8bce3ab..ddade05 100644 --- a/include/argparse/argparse.hpp +++ b/include/argparse/argparse.hpp @@ -670,6 +670,7 @@ private: // precondition: we have consumed or will consume at least one digit auto consume_digits = [=](std::string_view s) { + // NOLINTNEXTLINE(readability-qualified-auto) auto it = std::find_if_not(std::begin(s), std::end(s), is_digit); return s.substr(it - std::begin(s)); }; @@ -936,12 +937,12 @@ public: template ArgumentParser &add_parents(const Targs &... Fargs) { for (const ArgumentParser &tParentParser : {std::ref(Fargs)...}) { - for (auto &tArgument : tParentParser.mPositionalArguments) { + for (const auto &tArgument : tParentParser.mPositionalArguments) { auto it = mPositionalArguments.insert(cend(mPositionalArguments), tArgument); index_argument(it); } - for (auto &tArgument : tParentParser.mOptionalArguments) { + for (const auto &tArgument : tParentParser.mOptionalArguments) { auto it = mOptionalArguments.insert(cend(mOptionalArguments), tArgument); index_argument(it); @@ -1173,7 +1174,7 @@ private: using list_iterator = std::list::iterator; void index_argument(list_iterator argIt) { - for (auto &mName : std::as_const(argIt->mNames)) { + for (const auto &mName : std::as_const(argIt->mNames)) { mArgumentMap.insert_or_assign(mName, argIt); } }