From 5c2f0075898a2460eaa7c588fde426465a75c125 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 1 May 2022 20:56:38 +0200 Subject: [PATCH] Use auto consistently in PackageNameData --- libpkg/parser/package.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libpkg/parser/package.cpp b/libpkg/parser/package.cpp index 8eb592a..e6fdec8 100644 --- a/libpkg/parser/package.cpp +++ b/libpkg/parser/package.cpp @@ -987,7 +987,7 @@ std::vector Package::fromAurRpcJson(const char *jsonData, std::size string PackageNameData::compose() const { - string res; + auto res = std::string(); res.reserve(targetPrefix.size() + vcsSuffix.size() + actualName.size() + 2); if (!targetPrefix.empty()) { res += targetPrefix; @@ -1020,14 +1020,14 @@ bool PackageNameData::isVcsPackage() const if (vcsSuffix.empty()) { return false; } - static const std::unordered_set vcsSuffixes = { "cvs", "svn", "hg", "darcs", "bzr", "git" }; + static const auto vcsSuffixes = std::unordered_set{ "cvs", "svn", "hg", "darcs", "bzr", "git" }; const auto lastDash = vcsSuffix.rfind('-'); return vcsSuffixes.find(lastDash == std::string_view::npos ? vcsSuffix : vcsSuffix.substr(lastDash + 1)) != vcsSuffixes.end(); } PackageNameData PackageNameData::decompose(std::string_view packageName) { - static const std::regex packageNameRegex( + static const auto packageNameRegex = std::regex( "((lib32|mingw-w64|android-aarch64|android-x86-64|android-x86|android-armv7a-eabi|arm-none-eabi|aarch64-linux-" "gnu|riscv64-linux|avr|psp)-)?(.*?)((-(cvs|svn|hg|darcs|bzr|git|custom|compat|static|qt\\d+|doc|cli|gui))*)"); auto data = PackageNameData{};