From 62fa3858d12f163de7db81f6e2be770e39783238 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 29 Dec 2025 21:26:24 +0100 Subject: solver3: Modernize std::find() to std::ranges::contains Where applicable --- apt-pkg/solver3.cc | 15 ++++++--------- apt-pkg/solver3.h | 8 ++++---- 2 files changed, 10 insertions(+), 13 deletions(-) (limited to 'apt-pkg') diff --git a/apt-pkg/solver3.cc b/apt-pkg/solver3.cc index 9313b433d..096cbb521 100644 --- a/apt-pkg/solver3.cc +++ b/apt-pkg/solver3.cc @@ -826,17 +826,15 @@ const Clause *DependencySolver::RegisterClause(Clause &&clause) earlierDep.TargetPkg() != dep.TargetPkg()) continue; if (std::none_of(earlierClause->solutions.begin(), earlierClause->solutions.end(), [&clause](auto earlierSol) - { return std::find(clause.solutions.begin(), - clause.solutions.end(), - earlierSol) != clause.solutions.end(); })) + { return std::ranges::contains(clause.solutions, + earlierSol); })) continue; if (earlierClause->optional == clause.optional) { std::erase_if(earlierClause->solutions, [&clause, this](auto earlierSol) - { return std::find(clause.solutions.begin(), - clause.solutions.end(), - earlierSol) == clause.solutions.end(); }); + { return not std::ranges::contains(clause.solutions, + earlierSol); }); earlierClause->merged.push_front(clause); merged = true; @@ -845,9 +843,8 @@ const Clause *DependencySolver::RegisterClause(Clause &&clause) { // If say a Depends has fewer solution than a Recommends, remove the Recommend's extranous ones. std::erase_if(clause.solutions, [&earlierClause, this](auto sol) - { return std::find(earlierClause->solutions.begin(), - earlierClause->solutions.end(), - sol) == earlierClause->solutions.end(); }); + { return not std::ranges::contains(earlierClause->solutions, + sol); }); // Remove recursion here, such that we display correctly (if we ever display anywhere...) auto earlierClauseCopy = *earlierClause; diff --git a/apt-pkg/solver3.h b/apt-pkg/solver3.h index facba4d39..6fa00933f 100644 --- a/apt-pkg/solver3.h +++ b/apt-pkg/solver3.h @@ -166,8 +166,8 @@ struct Var } // \brief Check if there is no reason. constexpr bool empty() const { return value == 0; } - constexpr bool operator!=(Var const other) const { return value != other.value; } - constexpr bool operator==(Var const other) const { return value == other.value; } + constexpr bool operator!=(Var const other) const noexcept { return value != other.value; } + constexpr bool operator==(Var const other) const noexcept { return value == other.value; } /// \brief Negate constexpr Lit operator~() const; @@ -206,8 +206,8 @@ struct Lit // Properties constexpr bool empty() const { return value == 0; } - constexpr bool operator!=(Lit const other) const { return value != other.value; } - constexpr bool operator==(Lit const other) const { return value == other.value; } + constexpr bool operator!=(Lit const other) const noexcept { return value != other.value; } + constexpr bool operator==(Lit const other) const noexcept { return value == other.value; } std::string toString(pkgCache &cache) const { return (sign() ? "not " : "") + var().toString(cache); } }; -- cgit v1.2.3-70-g09d2