From ad9b2d6b8840825411a3c23251cfbb978ab60e89 Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Mon, 18 Nov 2024 16:29:18 +0000 Subject: [PATCH] maint: Update clang-format to v19 (#3600) --- .pre-commit-config.yaml | 2 +- .../ext/solv-cpp/include/solv-cpp/solver.hpp | 4 +- .../solv-cpp/include/solv-cpp/transaction.hpp | 8 +- libmamba/ext/solv-cpp/src/pool.cpp | 8 +- libmamba/ext/solv-cpp/src/solver.cpp | 4 +- libmamba/ext/solv-cpp/src/transaction.cpp | 8 +- libmamba/ext/solv-cpp/tests/src/pool_data.cpp | 4 +- libmamba/include/mamba/core/query.hpp | 4 +- .../include/mamba/download/mirror_map.hpp | 4 +- .../include/mamba/solver/libsolv/database.hpp | 24 ++-- .../include/mamba/specs/build_number_spec.hpp | 4 +- libmamba/include/mamba/specs/channel.hpp | 8 +- libmamba/include/mamba/specs/glob_spec.hpp | 4 +- libmamba/include/mamba/specs/match_spec.hpp | 4 +- libmamba/include/mamba/specs/platform.hpp | 8 +- libmamba/include/mamba/specs/regex_spec.hpp | 4 +- libmamba/include/mamba/specs/version_spec.hpp | 8 +- libmamba/include/mamba/util/encoding.hpp | 20 +-- libmamba/include/mamba/util/environment.hpp | 8 +- .../include/mamba/util/flat_binary_tree.hpp | 12 +- .../mamba/util/flat_bool_expr_tree.hpp | 4 +- libmamba/include/mamba/util/flat_set.hpp | 37 +++-- libmamba/include/mamba/util/graph.hpp | 3 +- libmamba/include/mamba/util/os_unix.hpp | 4 +- libmamba/include/mamba/util/parsers.hpp | 4 +- libmamba/include/mamba/util/path_manip.hpp | 12 +- libmamba/include/mamba/util/random.hpp | 4 +- libmamba/include/mamba/util/string.hpp | 134 +++++++++--------- libmamba/include/mamba/util/tuple_hash.hpp | 4 +- libmamba/include/mamba/util/url.hpp | 18 +-- libmamba/include/mamba/validation/tools.hpp | 12 +- .../mamba/validation/update_framework.hpp | 12 +- .../validation/update_framework_v0_6.hpp | 4 +- .../mamba/validation/update_framework_v1.hpp | 4 +- libmamba/src/api/configuration.cpp | 7 +- libmamba/src/api/shell.cpp | 4 +- libmamba/src/core/channel_context.cpp | 7 +- libmamba/src/core/package_fetcher.cpp | 4 +- libmamba/src/core/package_handling.cpp | 8 +- libmamba/src/core/subdirdata.cpp | 3 +- libmamba/src/core/transaction.cpp | 4 +- libmamba/src/core/virtual_packages.cpp | 9 +- libmamba/src/download/downloader.cpp | 6 +- libmamba/src/download/downloader_impl.hpp | 4 +- libmamba/src/download/mirror_impl.cpp | 7 +- libmamba/src/solver/helpers.cpp | 4 +- libmamba/src/solver/helpers.hpp | 4 +- libmamba/src/solver/libsolv/helpers.cpp | 22 +-- libmamba/src/solver/libsolv/helpers.hpp | 8 +- libmamba/src/solver/libsolv/matcher.cpp | 4 +- libmamba/src/solver/libsolv/unsolvable.cpp | 4 +- libmamba/src/solver/problems_graph.cpp | 26 ++-- libmamba/src/specs/authentication_info.cpp | 8 +- libmamba/src/specs/build_number_spec.cpp | 12 +- libmamba/src/specs/channel.cpp | 26 ++-- libmamba/src/specs/chimera_string_spec.cpp | 7 +- libmamba/src/specs/conda_url.cpp | 4 +- libmamba/src/specs/glob_spec.cpp | 6 +- libmamba/src/specs/match_spec.cpp | 14 +- libmamba/src/specs/unresolved_channel.cpp | 14 +- libmamba/src/specs/version.cpp | 32 ++--- libmamba/src/specs/version_spec.cpp | 18 +-- libmamba/src/util/encoding.cpp | 4 +- libmamba/src/util/string.cpp | 44 +++--- libmamba/src/util/url.cpp | 12 +- libmamba/src/validation/keys.cpp | 2 +- libmamba/src/validation/tools.cpp | 19 +-- .../src/validation/update_framework_v0_6.cpp | 4 +- .../src/solver/libsolv/test_database.cpp | 4 +- .../tests/src/solver/libsolv/test_solver.cpp | 3 +- .../tests/src/solver/test_problems_graph.cpp | 7 +- libmamba/tests/src/specs/test_channel.cpp | 5 +- .../validation/test_update_framework_v0_6.cpp | 12 +- .../validation/test_update_framework_v1.cpp | 4 +- libmambapy/src/libmambapy/bindings/legacy.cpp | 6 +- .../libmambapy/bindings/solver_libsolv.cpp | 8 +- libmambapy/src/libmambapy/bindings/specs.cpp | 12 +- 77 files changed, 421 insertions(+), 407 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8aab8fd3e5..1a88afeba9 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -34,7 +34,7 @@ repos: - id: blacken-docs additional_dependencies: [black==24.10.0] - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v18.1.2 + rev: v19.1.3 hooks: - id: clang-format args: [--style=file] diff --git a/libmamba/ext/solv-cpp/include/solv-cpp/solver.hpp b/libmamba/ext/solv-cpp/include/solv-cpp/solver.hpp index 3a86bc7821..78de562d6c 100644 --- a/libmamba/ext/solv-cpp/include/solv-cpp/solver.hpp +++ b/libmamba/ext/solv-cpp/include/solv-cpp/solver.hpp @@ -71,8 +71,8 @@ namespace solv */ [[nodiscard]] auto problem_rules(ProblemId id) const -> ObjQueue; [[nodiscard]] auto get_rule_info(const ObjPool& pool, RuleId id) const -> ObjRuleInfo; - [[nodiscard]] auto - rule_info_to_string(const ObjPool& pool, const ObjRuleInfo& id) const -> std::string; + [[nodiscard]] auto rule_info_to_string(const ObjPool& pool, const ObjRuleInfo& id) const + -> std::string; private: diff --git a/libmamba/ext/solv-cpp/include/solv-cpp/transaction.hpp b/libmamba/ext/solv-cpp/include/solv-cpp/transaction.hpp index 6a24eee67c..1e0ba9c139 100644 --- a/libmamba/ext/solv-cpp/include/solv-cpp/transaction.hpp +++ b/libmamba/ext/solv-cpp/include/solv-cpp/transaction.hpp @@ -37,16 +37,16 @@ namespace solv * * Negative solvable ids are use to mean that the solvable must be removed. */ - [[nodiscard]] static auto - from_solvables(const ObjPool& pool, const ObjQueue& solvables) -> ObjTransaction; + [[nodiscard]] static auto from_solvables(const ObjPool& pool, const ObjQueue& solvables) + -> ObjTransaction; /** * Create a transaction from the result of a solver run. * * The solver must be solved. */ - [[nodiscard]] static auto - from_solver(const ObjPool& pool, const ObjSolver& solver) -> ObjTransaction; + [[nodiscard]] static auto from_solver(const ObjPool& pool, const ObjSolver& solver) + -> ObjTransaction; ObjTransaction(const ObjPool& pool); ObjTransaction(ObjTransaction&&) noexcept = default; diff --git a/libmamba/ext/solv-cpp/src/pool.cpp b/libmamba/ext/solv-cpp/src/pool.cpp index 50f691a380..bf2f7bc898 100644 --- a/libmamba/ext/solv-cpp/src/pool.cpp +++ b/libmamba/ext/solv-cpp/src/pool.cpp @@ -118,8 +118,8 @@ namespace solv return (id == 0) ? std::nullopt : std::optional(DependencyId{ id }); } - auto - ObjPoolView::add_dependency(StringId name_id, RelationFlag flag, StringId version_id) -> DependencyId + auto ObjPoolView::add_dependency(StringId name_id, RelationFlag flag, StringId version_id) + -> DependencyId { // Note: libsolv cannot report failure to allocate const ::Id id = ::pool_rel2id( @@ -181,8 +181,8 @@ namespace solv return solvables; } - auto - ObjPoolView::what_matches_dep(KeyNameId key, DependencyId dep, DependencyMarker marker) const -> ObjQueue + auto ObjPoolView::what_matches_dep(KeyNameId key, DependencyId dep, DependencyMarker marker) const + -> ObjQueue { ObjQueue solvables = {}; ::pool_whatmatchesdep(const_cast<::Pool*>(raw()), key, dep, solvables.raw(), marker); diff --git a/libmamba/ext/solv-cpp/src/solver.cpp b/libmamba/ext/solv-cpp/src/solver.cpp index 3c55bdb70a..5ac15fdc97 100644 --- a/libmamba/ext/solv-cpp/src/solver.cpp +++ b/libmamba/ext/solv-cpp/src/solver.cpp @@ -228,8 +228,8 @@ namespace solv }; } - auto - ObjSolver::rule_info_to_string(const ObjPool& /* pool */, const ObjRuleInfo& ri) const -> std::string + auto ObjSolver::rule_info_to_string(const ObjPool& /* pool */, const ObjRuleInfo& ri) const + -> std::string { // pool is captured inside solver so we take it as a parameter to be explicit. return ::solver_ruleinfo2str( diff --git a/libmamba/ext/solv-cpp/src/transaction.cpp b/libmamba/ext/solv-cpp/src/transaction.cpp index 6361cc5ed7..180e11ce81 100644 --- a/libmamba/ext/solv-cpp/src/transaction.cpp +++ b/libmamba/ext/solv-cpp/src/transaction.cpp @@ -41,8 +41,8 @@ namespace solv return *this; } - auto - ObjTransaction::from_solvables(const ObjPool& pool, const ObjQueue& solvables) -> ObjTransaction + auto ObjTransaction::from_solvables(const ObjPool& pool, const ObjQueue& solvables) + -> ObjTransaction { return ObjTransaction{ ::transaction_create_decisionq( const_cast<::Pool*>(pool.raw()), @@ -103,8 +103,8 @@ namespace solv return ::transaction_type(const_cast<::Transaction*>(raw()), step, mode); } - auto - ObjTransaction::step_newer(const ObjPool& pool, SolvableId step) const -> std::optional + auto ObjTransaction::step_newer(const ObjPool& pool, SolvableId step) const + -> std::optional { assert_same_pool(pool, *this); if (const auto solvable = pool.get_solvable(step); solvable && solvable->installed()) diff --git a/libmamba/ext/solv-cpp/tests/src/pool_data.cpp b/libmamba/ext/solv-cpp/tests/src/pool_data.cpp index fa095ce33f..e18d8eedf7 100644 --- a/libmamba/ext/solv-cpp/tests/src/pool_data.cpp +++ b/libmamba/ext/solv-cpp/tests/src/pool_data.cpp @@ -48,8 +48,8 @@ namespace solv::test return attrs(a) >= attrs(b); } - auto - add_simple_package(solv::ObjPool& pool, solv::ObjRepoView& repo, const SimplePkg& pkg) -> solv::SolvableId + auto add_simple_package(solv::ObjPool& pool, solv::ObjRepoView& repo, const SimplePkg& pkg) + -> solv::SolvableId { auto [solv_id, solv] = repo.add_solvable(); solv.set_name(pkg.name); diff --git a/libmamba/include/mamba/core/query.hpp b/libmamba/include/mamba/core/query.hpp index 2cb86adaac..45ddfd8e85 100644 --- a/libmamba/include/mamba/core/query.hpp +++ b/libmamba/include/mamba/core/query.hpp @@ -94,8 +94,8 @@ namespace mamba using Database = solver::libsolv::Database; - [[nodiscard]] static auto - find(Database& db, const std::vector& queries) -> QueryResult; + [[nodiscard]] static auto find(Database& db, const std::vector& queries) + -> QueryResult; [[nodiscard]] static auto whoneeds(Database& db, std::string query, bool tree) -> QueryResult; diff --git a/libmamba/include/mamba/download/mirror_map.hpp b/libmamba/include/mamba/download/mirror_map.hpp index adc4548d38..bbc9b71770 100644 --- a/libmamba/include/mamba/download/mirror_map.hpp +++ b/libmamba/include/mamba/download/mirror_map.hpp @@ -64,8 +64,8 @@ namespace mamba::download }; template - auto - mirror_map::create_unique_mirror(const std::string& mirror_name, Args&&... args) -> MirrorType& + auto mirror_map::create_unique_mirror(const std::string& mirror_name, Args&&... args) + -> MirrorType& { static_assert(std::is_base_of_v); diff --git a/libmamba/include/mamba/solver/libsolv/database.hpp b/libmamba/include/mamba/solver/libsolv/database.hpp index 7dc4a0ecc0..641b926685 100644 --- a/libmamba/include/mamba/solver/libsolv/database.hpp +++ b/libmamba/include/mamba/solver/libsolv/database.hpp @@ -100,11 +100,9 @@ namespace mamba::solver::libsolv PipAsPythonDependency add = PipAsPythonDependency::No ) -> RepoInfo; - auto native_serialize_repo( - const RepoInfo& repo, - const fs::u8path& path, - const RepodataOrigin& metadata - ) -> expected_t; + auto + native_serialize_repo(const RepoInfo& repo, const fs::u8path& path, const RepodataOrigin& metadata) + -> expected_t; [[nodiscard]] auto installed_repo() const -> std::optional; @@ -162,11 +160,11 @@ namespace mamba::solver::libsolv [[nodiscard]] auto packages_in_repo(RepoInfo repo) const -> std::vector; - [[nodiscard]] auto - packages_matching_ids(const specs::MatchSpec& ms) -> std::vector; + [[nodiscard]] auto packages_matching_ids(const specs::MatchSpec& ms) + -> std::vector; - [[nodiscard]] auto - packages_depending_on_ids(const specs::MatchSpec& ms) -> std::vector; + [[nodiscard]] auto packages_depending_on_ids(const specs::MatchSpec& ms) + -> std::vector; }; /******************** @@ -191,11 +189,9 @@ namespace mamba::solver::libsolv } template - auto Database::add_repo_from_packages( - const Range& packages, - std::string_view name, - PipAsPythonDependency add - ) -> RepoInfo + auto + Database::add_repo_from_packages(const Range& packages, std::string_view name, PipAsPythonDependency add) + -> RepoInfo { return add_repo_from_packages(packages.begin(), packages.end(), name, add); } diff --git a/libmamba/include/mamba/specs/build_number_spec.hpp b/libmamba/include/mamba/specs/build_number_spec.hpp index 5683df5b9b..585b51793d 100644 --- a/libmamba/include/mamba/specs/build_number_spec.hpp +++ b/libmamba/include/mamba/specs/build_number_spec.hpp @@ -71,8 +71,8 @@ namespace mamba::specs BuildNumberPredicate(BuildNumber ver, BinaryOperator op); friend auto equal(free_interval, free_interval) -> bool; - friend auto - operator==(const BuildNumberPredicate& lhs, const BuildNumberPredicate& rhs) -> bool; + friend auto operator==(const BuildNumberPredicate& lhs, const BuildNumberPredicate& rhs) + -> bool; friend struct ::fmt::formatter; }; diff --git a/libmamba/include/mamba/specs/channel.hpp b/libmamba/include/mamba/specs/channel.hpp index 59f66ed89b..f3bdc23ff4 100644 --- a/libmamba/include/mamba/specs/channel.hpp +++ b/libmamba/include/mamba/specs/channel.hpp @@ -39,8 +39,8 @@ namespace mamba::specs /** * Remove the last element of the '/'-separated name. */ - [[nodiscard]] auto - weaken_key(std::string_view key) const -> std::optional; + [[nodiscard]] auto weaken_key(std::string_view key) const + -> std::optional; }; template @@ -95,8 +95,8 @@ namespace mamba::specs [[nodiscard]] auto mirror_urls() const -> const std::vector&; [[nodiscard]] auto platform_mirror_urls() const -> std::vector; - [[nodiscard]] auto - platform_mirror_urls(const std::string_view platform) const -> std::vector; + [[nodiscard]] auto platform_mirror_urls(const std::string_view platform) const + -> std::vector; [[nodiscard]] auto url() const -> const CondaURL&; auto clear_url() -> const CondaURL; diff --git a/libmamba/include/mamba/specs/glob_spec.hpp b/libmamba/include/mamba/specs/glob_spec.hpp index 706dd7591c..6b2ff80b4d 100644 --- a/libmamba/include/mamba/specs/glob_spec.hpp +++ b/libmamba/include/mamba/specs/glob_spec.hpp @@ -65,8 +65,8 @@ struct fmt::formatter { auto parse(format_parse_context& ctx) -> decltype(ctx.begin()); - auto - format(const ::mamba::specs::GlobSpec& spec, format_context& ctx) const -> decltype(ctx.out()); + auto format(const ::mamba::specs::GlobSpec& spec, format_context& ctx) const + -> decltype(ctx.out()); }; template <> diff --git a/libmamba/include/mamba/specs/match_spec.hpp b/libmamba/include/mamba/specs/match_spec.hpp index 1d4ceaa1e2..b6552fa199 100644 --- a/libmamba/include/mamba/specs/match_spec.hpp +++ b/libmamba/include/mamba/specs/match_spec.hpp @@ -226,8 +226,8 @@ struct fmt::formatter<::mamba::specs::MatchSpec> { auto parse(format_parse_context& ctx) -> decltype(ctx.begin()); - auto - format(const ::mamba::specs::MatchSpec& spec, format_context& ctx) const -> decltype(ctx.out()); + auto format(const ::mamba::specs::MatchSpec& spec, format_context& ctx) const + -> decltype(ctx.out()); }; /********************************* diff --git a/libmamba/include/mamba/specs/platform.hpp b/libmamba/include/mamba/specs/platform.hpp index 2af47d8142..3149296a80 100644 --- a/libmamba/include/mamba/specs/platform.hpp +++ b/libmamba/include/mamba/specs/platform.hpp @@ -53,11 +53,11 @@ namespace mamba::specs return static_cast(KnownPlatform::count_); } - [[nodiscard]] constexpr auto - known_platforms() -> std::array; + [[nodiscard]] constexpr auto known_platforms() + -> std::array; - [[nodiscard]] constexpr auto - known_platform_names() -> std::array; + [[nodiscard]] constexpr auto known_platform_names() + -> std::array; /** * Convert the enumeration to its conda string. diff --git a/libmamba/include/mamba/specs/regex_spec.hpp b/libmamba/include/mamba/specs/regex_spec.hpp index 74edbbecc2..57353e44c5 100644 --- a/libmamba/include/mamba/specs/regex_spec.hpp +++ b/libmamba/include/mamba/specs/regex_spec.hpp @@ -71,8 +71,8 @@ struct fmt::formatter { auto parse(format_parse_context& ctx) -> decltype(ctx.begin()); - auto - format(const ::mamba::specs::RegexSpec& spec, format_context& ctx) const -> decltype(ctx.out()); + auto format(const ::mamba::specs::RegexSpec& spec, format_context& ctx) const + -> decltype(ctx.out()); }; template <> diff --git a/libmamba/include/mamba/specs/version_spec.hpp b/libmamba/include/mamba/specs/version_spec.hpp index bb4fccc962..a2798fe379 100644 --- a/libmamba/include/mamba/specs/version_spec.hpp +++ b/libmamba/include/mamba/specs/version_spec.hpp @@ -37,8 +37,8 @@ namespace mamba::specs [[nodiscard]] static auto make_less_equal(Version ver) -> VersionPredicate; [[nodiscard]] static auto make_starts_with(Version ver) -> VersionPredicate; [[nodiscard]] static auto make_not_starts_with(Version ver) -> VersionPredicate; - [[nodiscard]] static auto - make_compatible_with(Version ver, std::size_t level) -> VersionPredicate; + [[nodiscard]] static auto make_compatible_with(Version ver, std::size_t level) + -> VersionPredicate; /** Construct an free interval. */ VersionPredicate() = default; @@ -243,8 +243,8 @@ struct fmt::formatter auto parse(format_parse_context& ctx) -> decltype(ctx.begin()); - auto - format(const ::mamba::specs::VersionSpec& spec, format_context& ctx) const -> decltype(ctx.out()); + auto format(const ::mamba::specs::VersionSpec& spec, format_context& ctx) const + -> decltype(ctx.out()); }; template <> diff --git a/libmamba/include/mamba/util/encoding.hpp b/libmamba/include/mamba/util/encoding.hpp index 6df0355e18..9012aa800a 100644 --- a/libmamba/include/mamba/util/encoding.hpp +++ b/libmamba/include/mamba/util/encoding.hpp @@ -51,14 +51,14 @@ namespace mamba::util /** * Convert two hexadecimal characters to a byte. */ - [[nodiscard]] auto - two_hex_to_byte(char high, char low, EncodingError& error) noexcept -> std::byte; + [[nodiscard]] auto two_hex_to_byte(char high, char low, EncodingError& error) noexcept + -> std::byte; /** * Convert two hexadecimal characters to a byte. */ - [[nodiscard]] auto - two_hex_to_byte(char high, char low) noexcept -> tl::expected; + [[nodiscard]] auto two_hex_to_byte(char high, char low) noexcept + -> tl::expected; /** * Convert hexadecimal characters to a bytes and write it to the given output. @@ -74,8 +74,8 @@ namespace mamba::util * The number of hexadecimal characters must be even and out must be allocated with half the * number of hexadecimal characters. */ - [[nodiscard]] auto - hex_to_bytes_to(std::string_view hex, std::byte* out) noexcept -> tl::expected; + [[nodiscard]] auto hex_to_bytes_to(std::string_view hex, std::byte* out) noexcept + -> tl::expected; /** * Escape reserved URL reserved characters with '%' encoding. @@ -100,13 +100,13 @@ namespace mamba::util /** * Convert a string to base64 encoding. */ - [[nodiscard]] auto - encode_base64(std::string_view input) -> tl::expected; + [[nodiscard]] auto encode_base64(std::string_view input) + -> tl::expected; /** * Convert a string from base64 back to its original representation. */ - [[nodiscard]] auto - decode_base64(std::string_view input) -> tl::expected; + [[nodiscard]] auto decode_base64(std::string_view input) + -> tl::expected; } #endif diff --git a/libmamba/include/mamba/util/environment.hpp b/libmamba/include/mamba/util/environment.hpp index dc54646060..f3fc75bced 100644 --- a/libmamba/include/mamba/util/environment.hpp +++ b/libmamba/include/mamba/util/environment.hpp @@ -108,8 +108,8 @@ namespace mamba::util * Return the full path of a program from its name if found inside the given directories. */ template - [[nodiscard]] auto - which_in(std::string_view exe, Iter search_path_first, Iter search_path_last) -> fs::u8path; + [[nodiscard]] auto which_in(std::string_view exe, Iter search_path_first, Iter search_path_last) + -> fs::u8path; /** * Return the full path of a program from its name if found inside the given directories. @@ -139,8 +139,8 @@ namespace mamba::util { [[nodiscard]] auto which_in_one(const fs::u8path& exe, const fs::u8path& dir) -> fs::u8path; - [[nodiscard]] auto - which_in_split(const fs::u8path& exe, std::string_view paths) -> fs::u8path; + [[nodiscard]] auto which_in_split(const fs::u8path& exe, std::string_view paths) + -> fs::u8path; } template diff --git a/libmamba/include/mamba/util/flat_binary_tree.hpp b/libmamba/include/mamba/util/flat_binary_tree.hpp index 01c3b26813..f488cd6554 100644 --- a/libmamba/include/mamba/util/flat_binary_tree.hpp +++ b/libmamba/include/mamba/util/flat_binary_tree.hpp @@ -87,8 +87,8 @@ namespace mamba::util * The children must have been previously added to the tree and their IDs can be used * to point to them. */ - auto - add_branch(const branch_type& branch, idx_type left_child, idx_type right_child) -> idx_type; + auto add_branch(const branch_type& branch, idx_type left_child, idx_type right_child) + -> idx_type; auto add_branch(branch_type&& branch, idx_type left_child, idx_type right_child) -> idx_type; [[nodiscard]] auto node(idx_type idx) const -> const node_type&; @@ -258,11 +258,9 @@ namespace mamba::util } template - auto flat_binary_tree::add_branch( - const branch_type& branch, - idx_type left_child, - idx_type right_child - ) -> idx_type + auto + flat_binary_tree::add_branch(const branch_type& branch, idx_type left_child, idx_type right_child) + -> idx_type { return add_branch_impl(branch, left_child, right_child); } diff --git a/libmamba/include/mamba/util/flat_bool_expr_tree.hpp b/libmamba/include/mamba/util/flat_bool_expr_tree.hpp index abab3921ae..eea8ca07a4 100644 --- a/libmamba/include/mamba/util/flat_bool_expr_tree.hpp +++ b/libmamba/include/mamba/util/flat_bool_expr_tree.hpp @@ -167,8 +167,8 @@ namespace mamba::util void reserve(size_type size); template - [[nodiscard]] auto - evaluate(UnaryFunc&& var_evaluator = {}, bool empty_val = true) const -> bool; + [[nodiscard]] auto evaluate(UnaryFunc&& var_evaluator = {}, bool empty_val = true) const + -> bool; template void infix_for_each(UnaryFunc&& func) const; diff --git a/libmamba/include/mamba/util/flat_set.hpp b/libmamba/include/mamba/util/flat_set.hpp index 8275a3b3bd..6e897c72b1 100644 --- a/libmamba/include/mamba/util/flat_set.hpp +++ b/libmamba/include/mamba/util/flat_set.hpp @@ -127,14 +127,14 @@ namespace mamba::util friend auto operator==(const flat_set& lhs, const flat_set& rhs) -> bool; template - friend auto - set_union(const flat_set&, const flat_set&) -> flat_set; + friend auto set_union(const flat_set&, const flat_set&) + -> flat_set; template - friend auto - set_intersection(const flat_set&, const flat_set&) -> flat_set; + friend auto set_intersection(const flat_set&, const flat_set&) + -> flat_set; template - friend auto - set_difference(const flat_set&, const flat_set&) -> flat_set; + friend auto set_difference(const flat_set&, const flat_set&) + -> flat_set; template friend auto set_symmetric_difference(const flat_set&, const flat_set&) -> flat_set; @@ -160,16 +160,14 @@ namespace mamba::util -> flat_set; template - auto operator==( - const flat_set& lhs, - const flat_set& rhs - ) -> bool; + auto + operator==(const flat_set& lhs, const flat_set& rhs) + -> bool; template - auto operator!=( - const flat_set& lhs, - const flat_set& rhs - ) -> bool; + auto + operator!=(const flat_set& lhs, const flat_set& rhs) + -> bool; template auto set_is_disjoint_of( @@ -430,7 +428,8 @@ namespace mamba::util */ template auto - set_disjoint(InputIt1 first1, InputIt1 last1, InputIt2 first2, InputIt2 last2, Compare comp) -> bool + set_disjoint(InputIt1 first1, InputIt1 last1, InputIt2 first2, InputIt2 last2, Compare comp) + -> bool { while (first1 != last1 && first2 != last2) { @@ -512,8 +511,8 @@ namespace mamba::util } template - auto - set_intersection(const flat_set& lhs, const flat_set& rhs) -> flat_set + auto set_intersection(const flat_set& lhs, const flat_set& rhs) + -> flat_set { auto out = flat_set(); std::set_intersection( @@ -528,8 +527,8 @@ namespace mamba::util } template - auto - set_difference(const flat_set& lhs, const flat_set& rhs) -> flat_set + auto set_difference(const flat_set& lhs, const flat_set& rhs) + -> flat_set { auto out = flat_set(); std::set_difference( diff --git a/libmamba/include/mamba/util/graph.hpp b/libmamba/include/mamba/util/graph.hpp index 5ab2168868..d608abb03d 100644 --- a/libmamba/include/mamba/util/graph.hpp +++ b/libmamba/include/mamba/util/graph.hpp @@ -705,7 +705,8 @@ namespace mamba::util template auto - is_reachable(const Graph& graph, typename Graph::node_id source, typename Graph::node_id target) -> bool + is_reachable(const Graph& graph, typename Graph::node_id source, typename Graph::node_id target) + -> bool { struct : EmptyVisitor { diff --git a/libmamba/include/mamba/util/os_unix.hpp b/libmamba/include/mamba/util/os_unix.hpp index 2398035688..89729cae6a 100644 --- a/libmamba/include/mamba/util/os_unix.hpp +++ b/libmamba/include/mamba/util/os_unix.hpp @@ -16,7 +16,7 @@ namespace mamba::util { - [[nodiscard]] auto - unix_name_version() -> tl::expected, OSError>; + [[nodiscard]] auto unix_name_version() + -> tl::expected, OSError>; } #endif diff --git a/libmamba/include/mamba/util/parsers.hpp b/libmamba/include/mamba/util/parsers.hpp index 0654f087f8..11b93f6500 100644 --- a/libmamba/include/mamba/util/parsers.hpp +++ b/libmamba/include/mamba/util/parsers.hpp @@ -249,8 +249,8 @@ namespace mamba::util /** * Test whether the glob pattern @p pattern matches the string @p str. */ - [[nodiscard]] auto - glob_match(std::string_view pattern, std::string_view str, char glob = '*') -> bool; + [[nodiscard]] auto glob_match(std::string_view pattern, std::string_view str, char glob = '*') + -> bool; /******************** * Implementation * diff --git a/libmamba/include/mamba/util/path_manip.hpp b/libmamba/include/mamba/util/path_manip.hpp index 2c04d6c75b..3e0db5e985 100644 --- a/libmamba/include/mamba/util/path_manip.hpp +++ b/libmamba/include/mamba/util/path_manip.hpp @@ -80,8 +80,8 @@ namespace mamba::util /** * Concatenate paths with the given separator. */ - [[nodiscard]] auto - path_concat(std::string_view parent, std::string_view child, char sep) -> std::string; + [[nodiscard]] auto path_concat(std::string_view parent, std::string_view child, char sep) + -> std::string; /** * Concatenate paths with '/' on Unix and detected separator on Windows. @@ -91,8 +91,8 @@ namespace mamba::util /** * Expand a leading '~' with the given home directory, assuming the given separator. */ - [[nodiscard]] auto - expand_home(std::string_view path, std::string_view home, char sep) -> std::string; + [[nodiscard]] auto expand_home(std::string_view path, std::string_view home, char sep) + -> std::string; /** * Expand a leading '~' with the given home directory. @@ -109,8 +109,8 @@ namespace mamba::util * * This assumes the given separator is used separate paths. */ - [[nodiscard]] auto - shrink_home(std::string_view path, std::string_view home, char sep) -> std::string; + [[nodiscard]] auto shrink_home(std::string_view path, std::string_view home, char sep) + -> std::string; /** * If the path starts with the given home directory, replace it with a leading '~'. diff --git a/libmamba/include/mamba/util/random.hpp b/libmamba/include/mamba/util/random.hpp index a8d17351d4..327b286494 100644 --- a/libmamba/include/mamba/util/random.hpp +++ b/libmamba/include/mamba/util/random.hpp @@ -61,8 +61,8 @@ namespace mamba::util return rng; } - extern template auto - local_random_generator() -> default_random_generator&; + extern template auto local_random_generator() + -> default_random_generator&; template auto random_int(T min, T max, Generator& generator) -> T diff --git a/libmamba/include/mamba/util/string.hpp b/libmamba/include/mamba/util/string.hpp index 4d8a1bb4a0..17e94cc992 100644 --- a/libmamba/include/mamba/util/string.hpp +++ b/libmamba/include/mamba/util/string.hpp @@ -103,32 +103,32 @@ namespace mamba::util /** * Return a view to the input without the prefix if present. */ - [[nodiscard]] auto - remove_prefix(std::string_view str, std::string_view prefix) -> std::string_view; - [[nodiscard]] auto - remove_prefix(std::string_view str, std::string_view::value_type c) -> std::string_view; + [[nodiscard]] auto remove_prefix(std::string_view str, std::string_view prefix) + -> std::string_view; + [[nodiscard]] auto remove_prefix(std::string_view str, std::string_view::value_type c) + -> std::string_view; /** * Return a view to prefix if present, and a view to the rest of the input. */ - [[nodiscard]] auto - split_prefix(std::string_view str, std::string_view prefix) -> std::array; + [[nodiscard]] auto split_prefix(std::string_view str, std::string_view prefix) + -> std::array; [[nodiscard]] auto split_prefix(std::string_view str, std::string_view::value_type c) -> std::array; /** * Return a view to the input without the suffix if present. */ - [[nodiscard]] auto - remove_suffix(std::string_view str, std::string_view suffix) -> std::string_view; - [[nodiscard]] auto - remove_suffix(std::string_view str, std::string_view::value_type c) -> std::string_view; + [[nodiscard]] auto remove_suffix(std::string_view str, std::string_view suffix) + -> std::string_view; + [[nodiscard]] auto remove_suffix(std::string_view str, std::string_view::value_type c) + -> std::string_view; /** * Return a view to the head of the input, and a view to suffix if present. */ - [[nodiscard]] auto - split_suffix(std::string_view str, std::string_view suffix) -> std::array; + [[nodiscard]] auto split_suffix(std::string_view str, std::string_view suffix) + -> std::array; [[nodiscard]] auto split_suffix(std::string_view str, std::string_view::value_type c) -> std::array; @@ -139,24 +139,24 @@ namespace mamba::util [[nodiscard]] auto lstrip(std::string_view input) -> std::string_view; [[nodiscard]] auto lstrip(std::wstring_view input) -> std::wstring_view; - [[nodiscard]] auto - lstrip_parts(std::string_view input, char c) -> std::array; - [[nodiscard]] auto - lstrip_parts(std::wstring_view input, wchar_t c) -> std::array; - [[nodiscard]] auto - lstrip_parts(std::string_view input, std::string_view chars) -> std::array; - [[nodiscard]] auto - lstrip_parts(std::wstring_view input, std::wstring_view chars) -> std::array; + [[nodiscard]] auto lstrip_parts(std::string_view input, char c) + -> std::array; + [[nodiscard]] auto lstrip_parts(std::wstring_view input, wchar_t c) + -> std::array; + [[nodiscard]] auto lstrip_parts(std::string_view input, std::string_view chars) + -> std::array; + [[nodiscard]] auto lstrip_parts(std::wstring_view input, std::wstring_view chars) + -> std::array; template [[nodiscard]] auto lstrip_if(std::string_view input, UnaryFunc should_strip) -> std::string_view; template - [[nodiscard]] auto - lstrip_if(std::wstring_view input, UnaryFunc should_strip) -> std::wstring_view; + [[nodiscard]] auto lstrip_if(std::wstring_view input, UnaryFunc should_strip) + -> std::wstring_view; template - [[nodiscard]] auto - lstrip_if_parts(std::string_view input, UnaryFunc should_strip) -> std::array; + [[nodiscard]] auto lstrip_if_parts(std::string_view input, UnaryFunc should_strip) + -> std::array; template [[nodiscard]] auto lstrip_if_parts(std::wstring_view input, UnaryFunc should_strip) -> std::array; @@ -168,24 +168,24 @@ namespace mamba::util [[nodiscard]] auto rstrip(std::string_view input) -> std::string_view; [[nodiscard]] auto rstrip(std::wstring_view input) -> std::wstring_view; - [[nodiscard]] auto - rstrip_parts(std::string_view input, char c) -> std::array; - [[nodiscard]] auto - rstrip_parts(std::wstring_view input, wchar_t c) -> std::array; - [[nodiscard]] auto - rstrip_parts(std::string_view input, std::string_view chars) -> std::array; - [[nodiscard]] auto - rstrip_parts(std::wstring_view input, std::wstring_view chars) -> std::array; + [[nodiscard]] auto rstrip_parts(std::string_view input, char c) + -> std::array; + [[nodiscard]] auto rstrip_parts(std::wstring_view input, wchar_t c) + -> std::array; + [[nodiscard]] auto rstrip_parts(std::string_view input, std::string_view chars) + -> std::array; + [[nodiscard]] auto rstrip_parts(std::wstring_view input, std::wstring_view chars) + -> std::array; template [[nodiscard]] auto rstrip_if(std::string_view input, UnaryFunc should_strip) -> std::string_view; template - [[nodiscard]] auto - rstrip_if(std::wstring_view input, UnaryFunc should_strip) -> std::wstring_view; + [[nodiscard]] auto rstrip_if(std::wstring_view input, UnaryFunc should_strip) + -> std::wstring_view; template - [[nodiscard]] auto - rstrip_if_parts(std::string_view input, UnaryFunc should_strip) -> std::array; + [[nodiscard]] auto rstrip_if_parts(std::string_view input, UnaryFunc should_strip) + -> std::array; template [[nodiscard]] auto rstrip_if_parts(std::wstring_view input, UnaryFunc should_strip) -> std::array; @@ -198,24 +198,25 @@ namespace mamba::util [[nodiscard]] auto strip(std::wstring_view input) -> std::wstring_view; [[nodiscard]] auto strip_parts(std::string_view input, char c) -> std::array; - [[nodiscard]] auto - strip_parts(std::wstring_view input, wchar_t c) -> std::array; - [[nodiscard]] auto - strip_parts(std::string_view input, std::string_view chars) -> std::array; - [[nodiscard]] auto - strip_parts(std::wstring_view input, std::wstring_view chars) -> std::array; + [[nodiscard]] auto strip_parts(std::wstring_view input, wchar_t c) + -> std::array; + [[nodiscard]] auto strip_parts(std::string_view input, std::string_view chars) + -> std::array; + [[nodiscard]] auto strip_parts(std::wstring_view input, std::wstring_view chars) + -> std::array; template [[nodiscard]] auto strip_if(std::string_view input, UnaryFunc should_strip) -> std::string_view; template - [[nodiscard]] auto strip_if(std::wstring_view input, UnaryFunc should_strip) -> std::wstring_view; + [[nodiscard]] auto strip_if(std::wstring_view input, UnaryFunc should_strip) + -> std::wstring_view; template - [[nodiscard]] auto - strip_if_parts(std::string_view input, UnaryFunc should_strip) -> std::array; + [[nodiscard]] auto strip_if_parts(std::string_view input, UnaryFunc should_strip) + -> std::array; template - [[nodiscard]] auto - strip_if_parts(std::wstring_view input, UnaryFunc should_strip) -> std::array; + [[nodiscard]] auto strip_if_parts(std::wstring_view input, UnaryFunc should_strip) + -> std::array; [[nodiscard]] auto split_once(std::string_view str, char sep) -> std::tuple>; @@ -269,10 +270,11 @@ namespace mamba::util * would return "private/channel/label/foo", but "private/chan" and "channel/label/foo" * would return the "private/chan/channel/label/foo". */ + [[nodiscard]] auto concat_dedup_splits(std::string_view str1, std::string_view str2, char sep) + -> std::string; [[nodiscard]] auto - concat_dedup_splits(std::string_view str1, std::string_view str2, char sep) -> std::string; - [[nodiscard]] auto - concat_dedup_splits(std::string_view str1, std::string_view str2, std::string_view sep) -> std::string; + concat_dedup_splits(std::string_view str1, std::string_view str2, std::string_view sep) + -> std::string; void replace_all(std::string& data, std::string_view search, std::string_view replace); void replace_all(std::wstring& data, std::wstring_view search, std::wstring_view replace); @@ -294,8 +296,8 @@ namespace mamba::util * separator in between the elements (thus appearing ``n-1`` times). */ template - auto - join_for_each(InputIt first, InputIt last, UnaryFunction func, const Value& sep) -> UnaryFunction; + auto join_for_each(InputIt first, InputIt last, UnaryFunction func, const Value& sep) + -> UnaryFunction; /** * Concatenate the elements of the container @p container by interleaving a separator. @@ -460,15 +462,15 @@ namespace mamba::util } template - auto - lstrip_if_parts(std::string_view input, UnaryFunc should_strip) -> std::array + auto lstrip_if_parts(std::string_view input, UnaryFunc should_strip) + -> std::array { return detail::lstrip_if_parts_impl(input, std::move(should_strip)); } template - auto - lstrip_if_parts(std::wstring_view input, UnaryFunc should_strip) -> std::array + auto lstrip_if_parts(std::wstring_view input, UnaryFunc should_strip) + -> std::array { return detail::lstrip_if_parts_impl(input, std::move(should_strip)); } @@ -502,15 +504,15 @@ namespace mamba::util } template - auto - rstrip_if_parts(std::string_view input, UnaryFunc should_strip) -> std::array + auto rstrip_if_parts(std::string_view input, UnaryFunc should_strip) + -> std::array { return detail::rstrip_if_parts_impl(input, std::move(should_strip)); } template - auto - rstrip_if_parts(std::wstring_view input, UnaryFunc should_strip) -> std::array + auto rstrip_if_parts(std::wstring_view input, UnaryFunc should_strip) + -> std::array { return detail::rstrip_if_parts_impl(input, std::move(should_strip)); } @@ -540,15 +542,15 @@ namespace mamba::util } template - auto - strip_if_parts(std::string_view input, UnaryFunc should_strip) -> std::array + auto strip_if_parts(std::string_view input, UnaryFunc should_strip) + -> std::array { return detail::strip_if_parts_impl(input, std::move(should_strip)); } template - auto - strip_if_parts(std::wstring_view input, UnaryFunc should_strip) -> std::array + auto strip_if_parts(std::wstring_view input, UnaryFunc should_strip) + -> std::array { return detail::strip_if_parts_impl(input, std::move(should_strip)); } @@ -607,8 +609,8 @@ namespace mamba::util // TODO(C++20) Use ``std::ranges::join_view`` (or ``std::ranges::join``) template - auto - join_for_each(InputIt first, InputIt last, UnaryFunction func, const Value& sep) -> UnaryFunction + auto join_for_each(InputIt first, InputIt last, UnaryFunction func, const Value& sep) + -> UnaryFunction { if (first < last) { diff --git a/libmamba/include/mamba/util/tuple_hash.hpp b/libmamba/include/mamba/util/tuple_hash.hpp index ef50bb8a82..872d9f23d1 100644 --- a/libmamba/include/mamba/util/tuple_hash.hpp +++ b/libmamba/include/mamba/util/tuple_hash.hpp @@ -21,8 +21,8 @@ namespace mamba::util } template > - constexpr auto - hash_combine_val(std::size_t seed, const T& val, const Hasher& hasher = {}) -> std::size_t + constexpr auto hash_combine_val(std::size_t seed, const T& val, const Hasher& hasher = {}) + -> std::size_t { return hash_combine(seed, hasher(val)); } diff --git a/libmamba/include/mamba/util/url.hpp b/libmamba/include/mamba/util/url.hpp index 0f1300c7e7..074f256a52 100644 --- a/libmamba/include/mamba/util/url.hpp +++ b/libmamba/include/mamba/util/url.hpp @@ -260,15 +260,15 @@ namespace mamba::util protected: - [[nodiscard]] auto - authentication_elems(Credentials, Decode::no_type) const -> std::array; - [[nodiscard]] auto - authentication_elems(Credentials, Decode::yes_type) const -> std::array; - - [[nodiscard]] auto - authority_elems(Credentials, Decode::no_type) const -> std::array; - [[nodiscard]] auto - authority_elems(Credentials, Decode::yes_type) const -> std::array; + [[nodiscard]] auto authentication_elems(Credentials, Decode::no_type) const + -> std::array; + [[nodiscard]] auto authentication_elems(Credentials, Decode::yes_type) const + -> std::array; + + [[nodiscard]] auto authority_elems(Credentials, Decode::no_type) const + -> std::array; + [[nodiscard]] auto authority_elems(Credentials, Decode::yes_type) const + -> std::array; [[nodiscard]] auto pretty_str_path(StripScheme strip_scheme = StripScheme::no, char rstrip_path = 0) const diff --git a/libmamba/include/mamba/validation/tools.hpp b/libmamba/include/mamba/validation/tools.hpp index dcf645df6c..51b2738bd4 100644 --- a/libmamba/include/mamba/validation/tools.hpp +++ b/libmamba/include/mamba/validation/tools.hpp @@ -35,8 +35,8 @@ namespace mamba::validation auto generate_ed25519_keypair(std::byte* pk, std::byte* sk) -> int; auto generate_ed25519_keypair() -> std::pair< - std::array, - std::array>; + std::array, + std::array>; auto generate_ed25519_keypair_hex() -> std::pair; auto sign(const std::string& data, const std::byte* sk, std::byte* signature) -> int; @@ -52,8 +52,8 @@ namespace mamba::validation verify(const std::byte* data, std::size_t data_len, const std::byte* pk, const std::byte* signature) -> int; auto verify(const std::string& data, const std::byte* pk, const std::byte* signature) -> int; - auto - verify(const std::string& data, const std::string& pk_hex, const std::string& signature_hex) -> int; + auto verify(const std::string& data, const std::string& pk_hex, const std::string& signature_hex) + -> int; /** * Verify a GPG/PGP signature against the hash of the binary data and @@ -61,8 +61,8 @@ namespace mamba::validation * See RFC4880, section 5.2.4 https://datatracker.ietf.org/doc/html/rfc4880#section-5.2.4 * This method assumes hash function to be SHA-256 */ - auto - verify_gpg_hashed_msg(const std::byte* data, const std::byte* pk, const std::byte* signature) -> int; + auto verify_gpg_hashed_msg(const std::byte* data, const std::byte* pk, const std::byte* signature) + -> int; auto verify_gpg_hashed_msg(const std::string& data, const std::byte* pk, const std::byte* signature) -> int; diff --git a/libmamba/include/mamba/validation/update_framework.hpp b/libmamba/include/mamba/validation/update_framework.hpp index 712983e1fb..2e163c7035 100644 --- a/libmamba/include/mamba/validation/update_framework.hpp +++ b/libmamba/include/mamba/validation/update_framework.hpp @@ -59,8 +59,9 @@ namespace mamba::validation [[nodiscard]] virtual auto json_key() const -> std::string = 0; [[nodiscard]] virtual auto expiration_json_key() const -> std::string = 0; - [[nodiscard]] virtual auto - signatures(const nlohmann::json& j) const -> std::set = 0; + [[nodiscard]] virtual auto signatures(const nlohmann::json& j) const + -> std::set + = 0; protected: @@ -103,8 +104,8 @@ namespace mamba::validation protected: - [[nodiscard]] auto - read_json_file(const fs::u8path& p, bool update = false) const -> nlohmann::json; + [[nodiscard]] auto read_json_file(const fs::u8path& p, bool update = false) const + -> nlohmann::json; /** * Check that a threshold of valid signatures is met @@ -178,7 +179,8 @@ namespace mamba::validation const TimeRef& time_reference, const std::string& url, const fs::u8path& cache_path - ) const -> std::unique_ptr = 0; + ) const -> std::unique_ptr + = 0; protected: diff --git a/libmamba/include/mamba/validation/update_framework_v0_6.hpp b/libmamba/include/mamba/validation/update_framework_v0_6.hpp index d338ef4a81..3dd6ba35ce 100644 --- a/libmamba/include/mamba/validation/update_framework_v0_6.hpp +++ b/libmamba/include/mamba/validation/update_framework_v0_6.hpp @@ -32,8 +32,8 @@ namespace mamba::validation::v0_6 [[nodiscard]] auto json_key() const -> std::string override; [[nodiscard]] auto expiration_json_key() const -> std::string override; - [[nodiscard]] auto - signatures(const nlohmann::json& j) const -> std::set override; + [[nodiscard]] auto signatures(const nlohmann::json& j) const + -> std::set override; [[nodiscard]] auto canonicalize(const nlohmann::json& j) const -> std::string override; [[nodiscard]] auto upgradable() const -> bool override; diff --git a/libmamba/include/mamba/validation/update_framework_v1.hpp b/libmamba/include/mamba/validation/update_framework_v1.hpp index 482b270af4..9646fdb5c1 100644 --- a/libmamba/include/mamba/validation/update_framework_v1.hpp +++ b/libmamba/include/mamba/validation/update_framework_v1.hpp @@ -34,8 +34,8 @@ namespace mamba::validation::v1 [[nodiscard]] auto json_key() const -> std::string override; [[nodiscard]] auto expiration_json_key() const -> std::string override; - [[nodiscard]] auto - signatures(const nlohmann::json& j) const -> std::set override; + [[nodiscard]] auto signatures(const nlohmann::json& j) const + -> std::set override; }; /** diff --git a/libmamba/src/api/configuration.cpp b/libmamba/src/api/configuration.cpp index d065e396e9..946992aaf6 100644 --- a/libmamba/src/api/configuration.cpp +++ b/libmamba/src/api/configuration.cpp @@ -629,8 +629,8 @@ namespace mamba } } - auto - get_root_prefix_from_mamba_bin(const fs::u8path& mamba_bin_path) -> expected_t + auto get_root_prefix_from_mamba_bin(const fs::u8path& mamba_bin_path) + -> expected_t { if (mamba_bin_path.empty()) { @@ -1555,7 +1555,8 @@ namespace mamba previous versions of conda, this parameter was configured as either True or False. True is now an alias to 'flexible'.)")) .set_post_merge_hook( - [&](ChannelPriority& value) { + [&](ChannelPriority& value) + { m_context.solver_flags.strict_repo_priority = (value == ChannelPriority::Strict); } )); diff --git a/libmamba/src/api/shell.cpp b/libmamba/src/api/shell.cpp index 6a4d9bcb52..92cf298f39 100644 --- a/libmamba/src/api/shell.cpp +++ b/libmamba/src/api/shell.cpp @@ -23,8 +23,8 @@ namespace mamba { namespace { - auto - make_activator(const Context& context, std::string_view name) -> std::unique_ptr + auto make_activator(const Context& context, std::string_view name) + -> std::unique_ptr { if (name == "bash" || name == "zsh" || name == "dash" || name == "posix") { diff --git a/libmamba/src/core/channel_context.cpp b/libmamba/src/core/channel_context.cpp index aff570f39c..3432be270e 100644 --- a/libmamba/src/core/channel_context.cpp +++ b/libmamba/src/core/channel_context.cpp @@ -27,8 +27,8 @@ namespace mamba namespace { - auto create_platforms(const std::vector& platforms - ) -> specs::ChannelResolveParams::platform_list + auto create_platforms(const std::vector& platforms) + -> specs::ChannelResolveParams::platform_list { return { platforms.cbegin(), platforms.cend() }; } @@ -193,7 +193,8 @@ namespace mamba { auto channels = specs::UnresolvedChannel::parse(loc) .and_then( // - [&](specs::UnresolvedChannel&& uc) { + [&](specs::UnresolvedChannel&& uc) + { return specs::Channel::resolve(std::move(uc), params); } ) diff --git a/libmamba/src/core/package_fetcher.cpp b/libmamba/src/core/package_fetcher.cpp index cd62744f4c..c960f73178 100644 --- a/libmamba/src/core/package_fetcher.cpp +++ b/libmamba/src/core/package_fetcher.cpp @@ -178,8 +178,8 @@ namespace mamba return request; } - auto - PackageFetcher::validate(std::size_t downloaded_size, progress_callback_t* cb) const -> ValidationResult + auto PackageFetcher::validate(std::size_t downloaded_size, progress_callback_t* cb) const + -> ValidationResult { update_monitor(cb, PackageExtractEvent::validate_update); ValidationResult res = validate_size(downloaded_size); diff --git a/libmamba/src/core/package_handling.cpp b/libmamba/src/core/package_handling.cpp index 320d916366..f0c4ce36ba 100644 --- a/libmamba/src/core/package_handling.cpp +++ b/libmamba/src/core/package_handling.cpp @@ -73,7 +73,7 @@ namespace mamba public: scoped_archive_read() - : scoped_archive_read(archive_read_new()){}; + : scoped_archive_read(archive_read_new()) {}; static scoped_archive_read read_disk() { @@ -450,7 +450,8 @@ namespace mamba zstd, compression_level, compression_threads, - [](const fs::u8path& p) -> bool { + [](const fs::u8path& p) -> bool + { return p.std_path().begin() != p.std_path().end() && *p.std_path().begin() != "info"; } @@ -461,7 +462,8 @@ namespace mamba zstd, compression_level, compression_threads, - [](const fs::u8path& p) -> bool { + [](const fs::u8path& p) -> bool + { return p.std_path().begin() != p.std_path().end() && *p.std_path().begin() == "info"; } diff --git a/libmamba/src/core/subdirdata.cpp b/libmamba/src/core/subdirdata.cpp index 54ae7908b4..67d71211a4 100644 --- a/libmamba/src/core/subdirdata.cpp +++ b/libmamba/src/core/subdirdata.cpp @@ -285,7 +285,8 @@ namespace mamba return m; } - auto SubdirMetadata::from_repodata_file(const fs::u8path& repodata_file) -> expected_subdir_metadata + auto SubdirMetadata::from_repodata_file(const fs::u8path& repodata_file) + -> expected_subdir_metadata { const std::string json = [](const fs::u8path& file) -> std::string { diff --git a/libmamba/src/core/transaction.cpp b/libmamba/src/core/transaction.cpp index e0f22dce41..7d2f766896 100644 --- a/libmamba/src/core/transaction.cpp +++ b/libmamba/src/core/transaction.cpp @@ -84,8 +84,8 @@ namespace mamba return out; } - auto - installed_python(const solver::libsolv::Database& db) -> std::optional + auto installed_python(const solver::libsolv::Database& db) + -> std::optional { // TODO combine Repo and MatchSpec search API in Pool auto out = std::optional(); diff --git a/libmamba/src/core/virtual_packages.cpp b/libmamba/src/core/virtual_packages.cpp index f95c89cd8c..c457a57b95 100644 --- a/libmamba/src/core/virtual_packages.cpp +++ b/libmamba/src/core/virtual_packages.cpp @@ -262,7 +262,8 @@ namespace mamba { overridable_windows_version() .transform( - [&](std::string&& version) { + [&](std::string&& version) + { res.push_back(make_virtual_package("__win", platform, std::move(version))); } ) @@ -284,7 +285,8 @@ namespace mamba overridable_linux_version() .transform( - [&](std::string&& version) { + [&](std::string&& version) + { res.push_back( make_virtual_package("__linux", platform, std::move(version)) ); @@ -318,7 +320,8 @@ namespace mamba overridable_osx_version() .transform( - [&](std::string&& version) { + [&](std::string&& version) + { res.push_back(make_virtual_package("__osx", platform, std::move(version))); } ) diff --git a/libmamba/src/download/downloader.cpp b/libmamba/src/download/downloader.cpp index 2273bfdd48..d220301d3f 100644 --- a/libmamba/src/download/downloader.cpp +++ b/libmamba/src/download/downloader.cpp @@ -962,7 +962,8 @@ namespace mamba::download { new_mirror = find_mirror( m_mirror_set, - [iteration](const auto& mirror) { + [iteration](const auto& mirror) + { return iteration > mirror->failed_transfers() && mirror->can_accept_more_connections(); } @@ -1016,7 +1017,8 @@ namespace mamba::download m_requests.begin(), m_requests.end(), std::back_inserter(m_trackers), - [tracker_options, this](const Request& req) { + [tracker_options, this](const Request& req) + { return DownloadTracker(req, p_mirrors->get_mirrors(req.mirror_name), tracker_options); } ); diff --git a/libmamba/src/download/downloader_impl.hpp b/libmamba/src/download/downloader_impl.hpp index d9ab58f069..5f691c4856 100644 --- a/libmamba/src/download/downloader_impl.hpp +++ b/libmamba/src/download/downloader_impl.hpp @@ -193,8 +193,8 @@ namespace mamba::download DownloadTrackerOptions options ); - auto - prepare_new_attempt(CURLMultiHandle& handle, const Context& context) -> completion_map_entry; + auto prepare_new_attempt(CURLMultiHandle& handle, const Context& context) + -> completion_map_entry; bool has_failed() const; bool can_start_transfer() const; diff --git a/libmamba/src/download/mirror_impl.cpp b/libmamba/src/download/mirror_impl.cpp index 430e775530..39fcb82782 100644 --- a/libmamba/src/download/mirror_impl.cpp +++ b/libmamba/src/download/mirror_impl.cpp @@ -153,10 +153,9 @@ namespace mamba::download return MirrorID(std::move(url)); } - auto OCIMirror::get_request_generators_impl( - const std::string& url_path, - const std::string& spec_sha256 - ) const -> request_generator_list + auto + OCIMirror::get_request_generators_impl(const std::string& url_path, const std::string& spec_sha256) const + -> request_generator_list { // NB: This method can be executed by many threads in parallel. Therefore, // data should not be captured in lambda used for building the request, as diff --git a/libmamba/src/solver/helpers.cpp b/libmamba/src/solver/helpers.cpp index a42cf9c905..9a2d826cf2 100644 --- a/libmamba/src/solver/helpers.cpp +++ b/libmamba/src/solver/helpers.cpp @@ -8,8 +8,8 @@ namespace mamba::solver { - auto find_new_python_in_solution(const Solution& solution - ) -> std::optional> + auto find_new_python_in_solution(const Solution& solution) + -> std::optional> { auto out = std::optional>{}; for_each_to_install( diff --git a/libmamba/src/solver/helpers.hpp b/libmamba/src/solver/helpers.hpp index 4a807be3d4..f6979f40d4 100644 --- a/libmamba/src/solver/helpers.hpp +++ b/libmamba/src/solver/helpers.hpp @@ -19,8 +19,8 @@ namespace mamba::solver { - [[nodiscard]] auto find_new_python_in_solution(const Solution& solution - ) -> std::optional>; + [[nodiscard]] auto find_new_python_in_solution(const Solution& solution) + -> std::optional>; [[nodiscard]] auto python_binary_compatible( // const specs::Version& older, diff --git a/libmamba/src/solver/libsolv/helpers.cpp b/libmamba/src/solver/libsolv/helpers.cpp index 59bfca15ab..cd4e9c2a3d 100644 --- a/libmamba/src/solver/libsolv/helpers.cpp +++ b/libmamba/src/solver/libsolv/helpers.cpp @@ -91,8 +91,8 @@ namespace mamba::solver::libsolv solv.add_self_provide(); } - auto - make_package_info(const solv::ObjPool& pool, solv::ObjSolvableViewConst s) -> specs::PackageInfo + auto make_package_info(const solv::ObjPool& pool, solv::ObjSolvableViewConst s) + -> specs::PackageInfo { specs::PackageInfo out = {}; @@ -814,11 +814,9 @@ namespace mamba::solver::libsolv repo.set_pip_added(true); } - auto make_abused_namespace_dep_args( - solv::ObjPool& pool, - std::string_view dependency, - const MatchFlags& flags - ) -> std::pair + auto + make_abused_namespace_dep_args(solv::ObjPool& pool, std::string_view dependency, const MatchFlags& flags) + -> std::pair { return { pool.add_string(dependency), @@ -1083,8 +1081,8 @@ namespace mamba::solver::libsolv } } - auto - transaction_to_solution_all(const solv::ObjPool& pool, const solv::ObjTransaction& trans) -> Solution + auto transaction_to_solution_all(const solv::ObjPool& pool, const solv::ObjTransaction& trans) + -> Solution { return transaction_to_solution_impl(pool, trans, [](const auto&) { return true; }); } @@ -1194,7 +1192,8 @@ namespace mamba::solver::libsolv namespace { - auto action_refers_to(const Solution::Action& unknown_action, std::string_view pkg_name) -> bool + auto action_refers_to(const Solution::Action& unknown_action, std::string_view pkg_name) + -> bool { return std::visit( [&](const auto& action) @@ -1369,7 +1368,8 @@ namespace mamba::solver::libsolv { return pool_add_matchspec(pool, job.spec) .transform( - [&](auto id) { + [&](auto id) + { raw_jobs.push_back( SOLVER_ERASE | (job.clean_dependencies ? SOLVER_CLEANDEPS : 0), id diff --git a/libmamba/src/solver/libsolv/helpers.hpp b/libmamba/src/solver/libsolv/helpers.hpp index b7a411b5ea..f7c30118c6 100644 --- a/libmamba/src/solver/libsolv/helpers.hpp +++ b/libmamba/src/solver/libsolv/helpers.hpp @@ -38,8 +38,8 @@ namespace mamba::solver::libsolv { void set_solvable(solv::ObjPool& pool, solv::ObjSolvableView solv, const specs::PackageInfo& pkg); - auto - make_package_info(const solv::ObjPool& pool, solv::ObjSolvableViewConst s) -> specs::PackageInfo; + auto make_package_info(const solv::ObjPool& pool, solv::ObjSolvableViewConst s) + -> specs::PackageInfo; [[nodiscard]] auto libsolv_read_json( // solv::ObjRepoView repo, @@ -135,8 +135,8 @@ namespace mamba::solver::libsolv const Request::Flags& flags ) -> Solution; - [[nodiscard]] auto - installed_python(const solv::ObjPool& pool) -> std::optional; + [[nodiscard]] auto installed_python(const solv::ObjPool& pool) + -> std::optional; [[nodiscard]] auto solution_needs_python_relink( // const solv::ObjPool& pool, diff --git a/libmamba/src/solver/libsolv/matcher.cpp b/libmamba/src/solver/libsolv/matcher.cpp index 71efbd3cec..354bde52ca 100644 --- a/libmamba/src/solver/libsolv/matcher.cpp +++ b/libmamba/src/solver/libsolv/matcher.cpp @@ -182,8 +182,8 @@ namespace mamba::solver::libsolv .value(); } - auto - Matcher::get_channels(const specs::UnresolvedChannel& uc) -> expected_t + auto Matcher::get_channels(const specs::UnresolvedChannel& uc) + -> expected_t { // Channel maps require converting channel to string because unresolved channels are // awkward to compare. diff --git a/libmamba/src/solver/libsolv/unsolvable.cpp b/libmamba/src/solver/libsolv/unsolvable.cpp index cbbdcbbea7..2187e95f37 100644 --- a/libmamba/src/solver/libsolv/unsolvable.cpp +++ b/libmamba/src/solver/libsolv/unsolvable.cpp @@ -563,8 +563,8 @@ namespace mamba::solver::libsolv return out; } - auto - UnSolvable::explain_problems(Database& pool, const ProblemsMessageFormat& format) const -> std::string + auto UnSolvable::explain_problems(Database& pool, const ProblemsMessageFormat& format) const + -> std::string { std::stringstream ss; diff --git a/libmamba/src/solver/problems_graph.cpp b/libmamba/src/solver/problems_graph.cpp index 6e1c40f092..25cf5ca7f2 100644 --- a/libmamba/src/solver/problems_graph.cpp +++ b/libmamba/src/solver/problems_graph.cpp @@ -213,10 +213,9 @@ namespace mamba::solver * @return For each node type, a partition of the the indices in @p of that type.. */ template - auto merge_node_indices( - const node_type_list& nodes_by_type, - CompFunc&& merge_criteria - ) -> node_type_list> + auto + merge_node_indices(const node_type_list& nodes_by_type, CompFunc&& merge_criteria) + -> node_type_list> { auto merge_func = [&merge_criteria](const auto& node_indices_of_one_node_type) { @@ -532,10 +531,9 @@ namespace mamba::solver * If two groups contain a node that are respectively in conflicts, then they are in * conflicts. */ - auto merge_conflicts( - const ProblemsGraph::conflicts_t& old_conflicts, - const node_id_mapping& old_to_new - ) -> CompressedProblemsGraph::conflicts_t + auto + merge_conflicts(const ProblemsGraph::conflicts_t& old_conflicts, const node_id_mapping& old_to_new) + -> CompressedProblemsGraph::conflicts_t { auto new_conflicts = CompressedProblemsGraph::conflicts_t(); for (const auto& [old_from, old_with] : old_conflicts) @@ -1254,8 +1252,8 @@ namespace mamba::solver template auto concat_nodes_impl(const std::vector& ids) -> Node; auto concat_nodes(const std::vector& ids) -> node_t; - auto - concat_edges(const std::vector& from, const std::vector& to) -> edge_t; + auto concat_edges(const std::vector& from, const std::vector& to) + -> edge_t; }; /************************************* @@ -1313,8 +1311,8 @@ namespace mamba::solver * Sort suffices such that if one ends with the other, the longest one is put first. */ template - constexpr auto - sorted_suffix(std::array arr) -> std::array + constexpr auto sorted_suffix(std::array arr) + -> std::array { std::sort( arr.begin(), @@ -1654,8 +1652,8 @@ namespace mamba::solver return out; } - auto - problem_tree_msg(const CompressedProblemsGraph& pbs, const ProblemsMessageFormat& format) -> std::string + auto problem_tree_msg(const CompressedProblemsGraph& pbs, const ProblemsMessageFormat& format) + -> std::string { std::stringstream ss; print_problem_tree_msg(ss, pbs, format); diff --git a/libmamba/src/specs/authentication_info.cpp b/libmamba/src/specs/authentication_info.cpp index 1016736245..10c724639e 100644 --- a/libmamba/src/specs/authentication_info.cpp +++ b/libmamba/src/specs/authentication_info.cpp @@ -87,15 +87,15 @@ std::hash::operator()( } auto -std::hash::operator()(const mamba::specs::BearerToken& auth -) const -> std::size_t +std::hash::operator()(const mamba::specs::BearerToken& auth) const + -> std::size_t { return std::hash{}(auth.token); } auto -std::hash::operator()(const mamba::specs::CondaToken& auth -) const -> std::size_t +std::hash::operator()(const mamba::specs::CondaToken& auth) const + -> std::size_t { return std::hash{}(auth.token); } diff --git a/libmamba/src/specs/build_number_spec.cpp b/libmamba/src/specs/build_number_spec.cpp index 90222da43c..abf0e4a72d 100644 --- a/libmamba/src/specs/build_number_spec.cpp +++ b/libmamba/src/specs/build_number_spec.cpp @@ -19,8 +19,8 @@ namespace mamba::specs * BuildNumberPredicate BinaryOperators Implementation * *********************************************************/ - auto - BuildNumberPredicate::free_interval::operator()(const BuildNumber&, const BuildNumber&) const -> bool + auto BuildNumberPredicate::free_interval::operator()(const BuildNumber&, const BuildNumber&) const + -> bool { return true; } @@ -98,8 +98,8 @@ namespace mamba::specs } auto -fmt::formatter::parse(format_parse_context& ctx -) -> decltype(ctx.begin()) +fmt::formatter::parse(format_parse_context& ctx) + -> decltype(ctx.begin()) { // make sure that range is empty if (ctx.begin() != ctx.end() && *ctx.begin() != '}') @@ -253,8 +253,8 @@ namespace mamba::specs } auto -fmt::formatter::parse(format_parse_context& ctx -) -> decltype(ctx.begin()) +fmt::formatter::parse(format_parse_context& ctx) + -> decltype(ctx.begin()) { // make sure that range is empty if (ctx.begin() != ctx.end() && *ctx.begin() != '}') diff --git a/libmamba/src/specs/channel.cpp b/libmamba/src/specs/channel.cpp index 9781cefdde..977d97b390 100644 --- a/libmamba/src/specs/channel.cpp +++ b/libmamba/src/specs/channel.cpp @@ -20,14 +20,14 @@ namespace mamba::specs * NameWeakener Implementation * *********************************/ - auto ChannelResolveParams::NameWeakener::make_first_key(std::string_view key - ) const -> std::string_view + auto ChannelResolveParams::NameWeakener::make_first_key(std::string_view key) const + -> std::string_view { return key; } - auto ChannelResolveParams::NameWeakener::weaken_key(std::string_view key - ) const -> std::optional + auto ChannelResolveParams::NameWeakener::weaken_key(std::string_view key) const + -> std::optional { return std::get<0>(util::rsplit_once(key, '/')); } @@ -328,7 +328,8 @@ namespace mamba::specs return uri.pretty_str(); } - auto resolve_path_location(std::string location, ChannelResolveParamsView params) -> std::string + auto resolve_path_location(std::string location, ChannelResolveParamsView params) + -> std::string { if (util::url_has_scheme(location)) { @@ -387,8 +388,8 @@ namespace mamba::specs return url.pretty_str(StripScheme::no, '/', Credentials::Remove); } - auto - resolve_url(UnresolvedChannel&& uc, ChannelResolveParamsView params) -> expected_parse_t + auto resolve_url(UnresolvedChannel&& uc, ChannelResolveParamsView params) + -> expected_parse_t { assert(util::url_has_scheme(uc.location())); assert(util::url_get_scheme(uc.location()) != "file"); @@ -450,7 +451,8 @@ namespace mamba::specs return out; } - auto resolve_name_from_alias(UnresolvedChannel&& uc, ChannelResolveParamsView params) -> Channel + auto resolve_name_from_alias(UnresolvedChannel&& uc, ChannelResolveParamsView params) + -> Channel { auto url = params.channel_alias; url.append_path(uc.location()); @@ -462,8 +464,8 @@ namespace mamba::specs }; } - auto - resolve_name(UnresolvedChannel&& uc, ChannelResolveParamsView params) -> Channel::channel_list + auto resolve_name(UnresolvedChannel&& uc, ChannelResolveParamsView params) + -> Channel::channel_list { if (auto it = params.custom_channels.find_weaken(uc.location()); it != params.custom_channels.cend()) @@ -561,8 +563,8 @@ namespace mamba::specs * Implementation of std::hash * *********************************/ -auto ::std::hash::operator()(const mamba::specs::Channel - & chan) const -> std::size_t +auto ::std::hash::operator()(const mamba::specs::Channel & chan) const + -> std::size_t { return mamba::util::hash_combine( mamba::util::hash_vals(chan.url(), chan.display_name()), diff --git a/libmamba/src/specs/chimera_string_spec.cpp b/libmamba/src/specs/chimera_string_spec.cpp index 01bc227264..9627b6a0ac 100644 --- a/libmamba/src/specs/chimera_string_spec.cpp +++ b/libmamba/src/specs/chimera_string_spec.cpp @@ -46,7 +46,8 @@ namespace mamba::specs [[nodiscard]] auto is_likely_glob(std::string_view pattern) -> bool { - constexpr auto is_likely_glob_char = [](char c) -> bool { + constexpr auto is_likely_glob_char = [](char c) -> bool + { return util::is_alphanum(c) || (c == '-') || (c == '_') || (c == GlobSpec::glob_pattern); }; @@ -125,8 +126,8 @@ namespace mamba::specs } auto -fmt::formatter::parse(format_parse_context& ctx -) -> decltype(ctx.begin()) +fmt::formatter::parse(format_parse_context& ctx) + -> decltype(ctx.begin()) { // make sure that range is empty if (ctx.begin() != ctx.end() && *ctx.begin() != '}') diff --git a/libmamba/src/specs/conda_url.cpp b/libmamba/src/specs/conda_url.cpp index 46b45a0d1a..886731ea64 100644 --- a/libmamba/src/specs/conda_url.cpp +++ b/libmamba/src/specs/conda_url.cpp @@ -24,8 +24,8 @@ namespace mamba::specs * * Not a static function, it is needed in "channel_spec.cpp". */ - auto find_slash_and_platform(std::string_view path - ) -> std::tuple> + auto find_slash_and_platform(std::string_view path) + -> std::tuple> { static constexpr auto npos = std::string_view::npos; diff --git a/libmamba/src/specs/glob_spec.cpp b/libmamba/src/specs/glob_spec.cpp index 723ff13cbb..8293fda91c 100644 --- a/libmamba/src/specs/glob_spec.cpp +++ b/libmamba/src/specs/glob_spec.cpp @@ -56,10 +56,8 @@ fmt::formatter::parse(format_parse_context& ctx) -> decl } auto -fmt::formatter::format( - const ::mamba::specs::GlobSpec& spec, - format_context& ctx -) const -> decltype(ctx.out()) +fmt::formatter::format(const ::mamba::specs::GlobSpec& spec, format_context& ctx) const + -> decltype(ctx.out()) { return fmt::format_to(ctx.out(), "{}", spec.str()); } diff --git a/libmamba/src/specs/match_spec.cpp b/libmamba/src/specs/match_spec.cpp index d314c26f55..09d763af8c 100644 --- a/libmamba/src/specs/match_spec.cpp +++ b/libmamba/src/specs/match_spec.cpp @@ -180,7 +180,8 @@ namespace mamba::specs { return util::strip_if( str, - [](char c) -> bool { + [](char c) -> bool + { return !util::is_graphic(c) || (c == MatchSpec::preferred_quote) || (c == MatchSpec::alt_quote); } @@ -312,8 +313,8 @@ namespace mamba::specs ); } - [[nodiscard]] auto split_attribute_val(std::string_view key_val - ) -> expected_parse_t>> + [[nodiscard]] auto split_attribute_val(std::string_view key_val) + -> expected_parse_t>> { // Forbid known ambiguity if (util::starts_with(key_val, "version")) @@ -427,7 +428,8 @@ namespace mamba::specs assert(start < end); return set_matchspec_attributes(spec, str.substr(start + 1, end - start - 1)) .and_then( // - [&]() { + [&]() + { return rparse_and_set_matchspec_attributes( spec, str.substr(0, start_end.first) @@ -438,8 +440,8 @@ namespace mamba::specs ); } - auto split_version_and_build(std::string_view str - ) -> std::pair + auto split_version_and_build(std::string_view str) + -> std::pair { str = util::strip(str); diff --git a/libmamba/src/specs/unresolved_channel.cpp b/libmamba/src/specs/unresolved_channel.cpp index 012c2402d2..95d56a28ac 100644 --- a/libmamba/src/specs/unresolved_channel.cpp +++ b/libmamba/src/specs/unresolved_channel.cpp @@ -26,8 +26,8 @@ namespace mamba::specs { // Defined in conda_url.cpp - [[nodiscard]] auto find_slash_and_platform(std::string_view path - ) -> std::tuple>; + [[nodiscard]] auto find_slash_and_platform(std::string_view path) + -> std::tuple>; auto UnresolvedChannel::parse_platform_list(std::string_view plats) -> platform_set { @@ -68,8 +68,8 @@ namespace mamba::specs return { {}, {} }; } - auto split_location_platform(std::string_view str - ) -> expected_parse_t> + auto split_location_platform(std::string_view str) + -> expected_parse_t> { if (util::ends_with(str, ']')) { @@ -247,10 +247,8 @@ namespace mamba::specs } auto -fmt::formatter::format( - const UnresolvedChannel& uc, - format_context& ctx -) const -> format_context::iterator +fmt::formatter::format(const UnresolvedChannel& uc, format_context& ctx) const + -> format_context::iterator { auto out = fmt::format_to(ctx.out(), "{}", uc.location()); if (!uc.platform_filters().empty()) diff --git a/libmamba/src/specs/version.cpp b/libmamba/src/specs/version.cpp index 9a0bade8f9..286ceeffeb 100644 --- a/libmamba/src/specs/version.cpp +++ b/libmamba/src/specs/version.cpp @@ -176,8 +176,8 @@ namespace mamba::specs } auto -fmt::formatter::parse(format_parse_context& ctx -) -> decltype(ctx.begin()) +fmt::formatter::parse(format_parse_context& ctx) + -> decltype(ctx.begin()) { // make sure that range is empty if (ctx.begin() != ctx.end() && *ctx.begin() != '}') @@ -404,8 +404,8 @@ namespace mamba::specs { }; - [[maybe_unused]] auto - starts_with_three_way(const AlwaysEqual&, const AlwaysEqual&) -> strong_ordering + [[maybe_unused]] auto starts_with_three_way(const AlwaysEqual&, const AlwaysEqual&) + -> strong_ordering { // This comparison should not happen with the current usage. assert(false); @@ -424,8 +424,8 @@ namespace mamba::specs return strong_ordering::equal; } - auto - starts_with_three_way(const VersionPartAtom& a, const VersionPartAtom& b) -> strong_ordering + auto starts_with_three_way(const VersionPartAtom& a, const VersionPartAtom& b) + -> strong_ordering { if ((a.numeral() == b.numeral()) && b.literal().empty()) { @@ -533,8 +533,8 @@ namespace mamba::specs } template - auto parse_leading_epoch(std::string_view str - ) -> expected_parse_t> + auto parse_leading_epoch(std::string_view str) + -> expected_parse_t> { const auto delim_pos = str.find(Version::epoch_delim); // No epoch is specified @@ -574,8 +574,8 @@ namespace mamba::specs return { maybe_integer.value(), rest }; } - auto - parse_leading_literal(std::string_view str) -> std::pair + auto parse_leading_literal(std::string_view str) + -> std::pair { const auto [literal, rest] = util::lstrip_if_parts( str, @@ -584,8 +584,8 @@ namespace mamba::specs return { literal, rest }; } - auto - parse_leading_part_atom(std::string_view str) -> std::pair + auto parse_leading_part_atom(std::string_view str) + -> std::pair { assert(!str.empty()); @@ -694,8 +694,8 @@ namespace mamba::specs return { std::move(parts) }; } - auto parse_trailing_local_version(std::string_view str - ) -> expected_parse_t> + auto parse_trailing_local_version(std::string_view str) + -> expected_parse_t> { const auto delim_pos = str.rfind(Version::local_delim); // No local is specified @@ -791,8 +791,8 @@ fmt::formatter::parse(format_parse_context& ctx) -> declt } auto -fmt::formatter::format(const ::mamba::specs::Version v, format_context& ctx) - const -> decltype(ctx.out()) +fmt::formatter::format(const ::mamba::specs::Version v, format_context& ctx) const + -> decltype(ctx.out()) { auto out = ctx.out(); if (v.epoch() != 0) diff --git a/libmamba/src/specs/version_spec.cpp b/libmamba/src/specs/version_spec.cpp index c68058a68c..8f784a26fb 100644 --- a/libmamba/src/specs/version_spec.cpp +++ b/libmamba/src/specs/version_spec.cpp @@ -29,8 +29,8 @@ namespace mamba::specs return true; } - auto - VersionPredicate::starts_with::operator()(const Version& point, const Version& prefix) const -> bool + auto VersionPredicate::starts_with::operator()(const Version& point, const Version& prefix) const + -> bool { return point.starts_with(prefix); } @@ -41,7 +41,8 @@ namespace mamba::specs } auto - VersionPredicate::not_starts_with::operator()(const Version& point, const Version& prefix) const -> bool + VersionPredicate::not_starts_with::operator()(const Version& point, const Version& prefix) const + -> bool { return !point.starts_with(prefix); } @@ -52,13 +53,14 @@ namespace mamba::specs } auto - VersionPredicate::compatible_with::operator()(const Version& point, const Version& older) const -> bool + VersionPredicate::compatible_with::operator()(const Version& point, const Version& older) const + -> bool { return point.compatible_with(older, level); } - auto - operator==(VersionPredicate::compatible_with lhs, VersionPredicate::compatible_with rhs) -> bool + auto operator==(VersionPredicate::compatible_with lhs, VersionPredicate::compatible_with rhs) + -> bool { return lhs.level == rhs.level; } @@ -180,8 +182,8 @@ namespace mamba::specs } auto -fmt::formatter::parse(format_parse_context& ctx -) -> decltype(ctx.begin()) +fmt::formatter::parse(format_parse_context& ctx) + -> decltype(ctx.begin()) { if (auto it = std::find(ctx.begin(), ctx.end(), 'b'); it < ctx.end()) { diff --git a/libmamba/src/util/encoding.cpp b/libmamba/src/util/encoding.cpp index 665794548a..ab30d3867d 100644 --- a/libmamba/src/util/encoding.cpp +++ b/libmamba/src/util/encoding.cpp @@ -144,8 +144,8 @@ namespace mamba::util } // TODO(C++20): use iterators return type - auto - hex_to_bytes_to(std::string_view hex, std::byte* out) noexcept -> tl::expected + auto hex_to_bytes_to(std::string_view hex, std::byte* out) noexcept + -> tl::expected { auto error = EncodingError::Ok; hex_to_bytes_to(hex, out, error); diff --git a/libmamba/src/util/string.cpp b/libmamba/src/util/string.cpp index 0b45e3bccc..d6d78ab920 100644 --- a/libmamba/src/util/string.cpp +++ b/libmamba/src/util/string.cpp @@ -285,8 +285,8 @@ namespace mamba::util * Implementation of remove prefix/suffix functions * ******************************************************/ - auto - split_prefix(std::string_view str, std::string_view prefix) -> std::array + auto split_prefix(std::string_view str, std::string_view prefix) + -> std::array { if (starts_with(str, prefix)) { @@ -315,8 +315,8 @@ namespace mamba::util return std::get<1>(split_prefix(str, c)); } - auto - split_suffix(std::string_view str, std::string_view suffix) -> std::array + auto split_suffix(std::string_view str, std::string_view suffix) + -> std::array { if (ends_with(str, suffix)) { @@ -478,14 +478,14 @@ namespace mamba::util return lstrip_parts_impl(input, c); } - auto - lstrip_parts(std::string_view input, std::string_view chars) -> std::array + auto lstrip_parts(std::string_view input, std::string_view chars) + -> std::array { return lstrip_parts_impl(input, chars); } - auto - lstrip_parts(std::wstring_view input, std::wstring_view chars) -> std::array + auto lstrip_parts(std::wstring_view input, std::wstring_view chars) + -> std::array { return lstrip_parts_impl(input, chars); } @@ -517,14 +517,14 @@ namespace mamba::util return rstrip_parts_impl(input, c); } - auto - rstrip_parts(std::string_view input, std::string_view chars) -> std::array + auto rstrip_parts(std::string_view input, std::string_view chars) + -> std::array { return rstrip_parts_impl(input, chars); } - auto - rstrip_parts(std::wstring_view input, std::wstring_view chars) -> std::array + auto rstrip_parts(std::wstring_view input, std::wstring_view chars) + -> std::array { return rstrip_parts_impl(input, chars); } @@ -558,14 +558,14 @@ namespace mamba::util return strip_parts_impl(input, c); } - auto - strip_parts(std::string_view input, std::string_view chars) -> std::array + auto strip_parts(std::string_view input, std::string_view chars) + -> std::array { return strip_parts_impl(input, chars); } - auto - strip_parts(std::wstring_view input, std::wstring_view chars) -> std::array + auto strip_parts(std::wstring_view input, std::wstring_view chars) + -> std::array { return strip_parts_impl(input, chars); } @@ -767,8 +767,8 @@ namespace mamba::util } // TODO(C++20) lazy_split_view is a range - auto - split(std::wstring_view input, wchar_t sep, std::size_t max_split) -> std::vector + auto split(std::wstring_view input, wchar_t sep, std::size_t max_split) + -> std::vector { const auto sep_arr = std::array{ sep, L'\0' }; return split(input, sep_arr.data(), max_split); @@ -796,8 +796,8 @@ namespace mamba::util } // TODO(C++20) lazy_split_view is a range - auto - rsplit(std::wstring_view input, wchar_t sep, std::size_t max_split) -> std::vector + auto rsplit(std::wstring_view input, wchar_t sep, std::size_t max_split) + -> std::vector { const auto sep_arr = std::array{ sep, L'\0' }; return rsplit(input, sep_arr.data(), max_split); @@ -897,8 +897,8 @@ namespace mamba::util return concat_dedup_splits_impl(str1, str2, sep); } - auto - concat_dedup_splits(std::string_view str1, std::string_view str2, std::string_view sep) -> std::string + auto concat_dedup_splits(std::string_view str1, std::string_view str2, std::string_view sep) + -> std::string { return concat_dedup_splits_impl(str1, str2, sep); } diff --git a/libmamba/src/util/url.cpp b/libmamba/src/util/url.cpp index aeb2ed4db0..480f2012e6 100644 --- a/libmamba/src/util/url.cpp +++ b/libmamba/src/util/url.cpp @@ -52,8 +52,8 @@ namespace mamba::util CurlUrl(); - [[nodiscard]] auto - get_part(::CURLUPart part, flag_type flags = 0) const -> std::optional; + [[nodiscard]] auto get_part(::CURLUPart part, flag_type flags = 0) const + -> std::optional; private: @@ -99,8 +99,8 @@ namespace mamba::util size_type m_len = { -1 }; }; - auto - CurlUrl::parse(const std::string& url, flag_type flags) -> tl::expected + auto CurlUrl::parse(const std::string& url, flag_type flags) + -> tl::expected { auto out = CurlUrl(); const CURLUcode uc = ::curl_url_set(out.m_handle.get(), CURLUPART_URL, url.c_str(), flags); @@ -445,8 +445,8 @@ namespace mamba::util ); } - auto - URL::authority_elems(Credentials credentials, Decode::yes_type) const -> std::array + auto URL::authority_elems(Credentials credentials, Decode::yes_type) const + -> std::array { return authority_elems_impl( authentication_elems(credentials, Decode::yes), diff --git a/libmamba/src/validation/keys.cpp b/libmamba/src/validation/keys.cpp index 443561c812..7016a39dc9 100644 --- a/libmamba/src/validation/keys.cpp +++ b/libmamba/src/validation/keys.cpp @@ -82,7 +82,7 @@ namespace mamba::validation RoleFullKeys::RoleFullKeys(const std::map& keys_, const std::size_t& threshold_) : keys(keys_) - , threshold(threshold_){}; + , threshold(threshold_) {}; auto RoleFullKeys::to_keys() const -> std::map { diff --git a/libmamba/src/validation/tools.cpp b/libmamba/src/validation/tools.cpp index ded92117d6..31ddfcd567 100644 --- a/libmamba/src/validation/tools.cpp +++ b/libmamba/src/validation/tools.cpp @@ -42,8 +42,8 @@ namespace mamba::validation namespace { template - [[nodiscard]] auto - hex_to_bytes_arr(const B& buffer, int& error_code) noexcept -> std::array + [[nodiscard]] auto hex_to_bytes_arr(const B& buffer, int& error_code) noexcept + -> std::array { auto out = std::array{}; auto err = util::EncodingError::Ok; @@ -53,8 +53,8 @@ namespace mamba::validation } template - [[nodiscard]] auto - hex_to_bytes_vec(const B& buffer, int& error_code) noexcept -> std::vector + [[nodiscard]] auto hex_to_bytes_vec(const B& buffer, int& error_code) noexcept + -> std::vector { auto out = std::vector(buffer.size() / 2); auto err = util::EncodingError::Ok; @@ -133,8 +133,8 @@ namespace mamba::validation } auto generate_ed25519_keypair() -> std::pair< - std::array, - std::array> + std::array, + std::array> { std::array pk, sk; generate_ed25519_keypair(pk.data(), sk.data()); @@ -288,14 +288,15 @@ namespace mamba::validation return verify(data, bin_pk.data(), bin_signature.data()); } - auto - verify_gpg_hashed_msg(const std::byte* data, const std::byte* pk, const std::byte* signature) -> int + auto verify_gpg_hashed_msg(const std::byte* data, const std::byte* pk, const std::byte* signature) + -> int { return verify(data, MAMBA_SHA256_SIZE_BYTES, pk, signature); } auto - verify_gpg_hashed_msg(const std::string& data, const std::byte* pk, const std::byte* signature) -> int + verify_gpg_hashed_msg(const std::string& data, const std::byte* pk, const std::byte* signature) + -> int { int error = 0; auto data_bin = hex_to_bytes_arr(data, error); diff --git a/libmamba/src/validation/update_framework_v0_6.cpp b/libmamba/src/validation/update_framework_v0_6.cpp index 70c8c3881d..d51ff62648 100644 --- a/libmamba/src/validation/update_framework_v0_6.cpp +++ b/libmamba/src/validation/update_framework_v0_6.cpp @@ -146,8 +146,8 @@ namespace mamba::validation::v0_6 } auto - RootImpl::upgraded_signature(const nlohmann::json& j, const std::string& pk, const std::byte* sk) - const -> RoleSignature + RootImpl::upgraded_signature(const nlohmann::json& j, const std::string& pk, const std::byte* sk) const + -> RoleSignature { std::array sig_bin; sign(j.dump(), sk, sig_bin.data()); diff --git a/libmamba/tests/src/solver/libsolv/test_database.cpp b/libmamba/tests/src/solver/libsolv/test_database.cpp index d8a4d105a6..bb2a1a8512 100644 --- a/libmamba/tests/src/solver/libsolv/test_database.cpp +++ b/libmamba/tests/src/solver/libsolv/test_database.cpp @@ -22,8 +22,8 @@ using namespace mamba::solver; namespace { - auto - mkpkg(std::string name, std::string version, std::vector deps = {}) -> specs::PackageInfo + auto mkpkg(std::string name, std::string version, std::vector deps = {}) + -> specs::PackageInfo { auto out = specs::PackageInfo(); out.name = std::move(name); diff --git a/libmamba/tests/src/solver/libsolv/test_solver.cpp b/libmamba/tests/src/solver/libsolv/test_solver.cpp index 5263975c1d..63b35ce07d 100644 --- a/libmamba/tests/src/solver/libsolv/test_solver.cpp +++ b/libmamba/tests/src/solver/libsolv/test_solver.cpp @@ -25,7 +25,8 @@ using namespace mamba; using namespace mamba::solver; auto -find_actions_with_name(const Solution& solution, std::string_view name) -> std::vector +find_actions_with_name(const Solution& solution, std::string_view name) + -> std::vector { auto out = std::vector(); for (const auto& action : solution.actions) diff --git a/libmamba/tests/src/solver/test_problems_graph.cpp b/libmamba/tests/src/solver/test_problems_graph.cpp index 87223292b2..9ff270c2a5 100644 --- a/libmamba/tests/src/solver/test_problems_graph.cpp +++ b/libmamba/tests/src/solver/test_problems_graph.cpp @@ -297,10 +297,9 @@ namespace ); } - auto make_platform_channels( - std::vector&& channels, - const std::vector& platforms - ) -> std::vector + auto + make_platform_channels(std::vector&& channels, const std::vector& platforms) + -> std::vector { auto add_plat = [&platforms](const auto& chan) { return fmt::format("{}[{}]", chan, fmt::join(platforms, ",")); }; diff --git a/libmamba/tests/src/specs/test_channel.cpp b/libmamba/tests/src/specs/test_channel.cpp index 7da74db183..5e597dcb15 100644 --- a/libmamba/tests/src/specs/test_channel.cpp +++ b/libmamba/tests/src/specs/test_channel.cpp @@ -233,9 +233,8 @@ TEST_SUITE("specs::channel") { auto make_typical_params = []() -> ChannelResolveParams { - auto make_channel = [](std::string_view loc, const ChannelResolveParams& params) { - return Channel::resolve(UnresolvedChannel::parse(loc).value(), params).value().at(0); - }; + auto make_channel = [](std::string_view loc, const ChannelResolveParams& params) + { return Channel::resolve(UnresolvedChannel::parse(loc).value(), params).value().at(0); }; auto params = ChannelResolveParams{}; params.platforms = { "linux-64", "noarch" }; diff --git a/libmamba/tests/src/validation/test_update_framework_v0_6.cpp b/libmamba/tests/src/validation/test_update_framework_v0_6.cpp index fcfbae7d19..b96caef24a 100644 --- a/libmamba/tests/src/validation/test_update_framework_v0_6.cpp +++ b/libmamba/tests/src/validation/test_update_framework_v0_6.cpp @@ -176,8 +176,8 @@ class RootImplT_v0_6 std::unique_ptr channel_dir; - auto generate_role_secrets(int count - ) -> std::map> + auto generate_role_secrets(int count) + -> std::map> { std::map> role_secrets; @@ -757,8 +757,8 @@ class KeyMgrT_v06 : public RootImplT_v0_6 return update_key_mgr.patch(sig_patch); } - auto - write_key_mgr_file(const nl::json& j, const std::string& filename = "key_mgr.json") -> fs::u8path + auto write_key_mgr_file(const nl::json& j, const std::string& filename = "key_mgr.json") + -> fs::u8path { fs::u8path p = channel_dir->path() / filename; @@ -1030,8 +1030,8 @@ class PkgMgrT_v06 : public KeyMgrT_v06 return update_pkg_mgr.patch(sig_patch); } - auto - write_pkg_mgr_file(const nl::json& j, const std::string& filename = "pkg_mgr.json") -> fs::u8path + auto write_pkg_mgr_file(const nl::json& j, const std::string& filename = "pkg_mgr.json") + -> fs::u8path { fs::u8path p = channel_dir->path() / filename; diff --git a/libmamba/tests/src/validation/test_update_framework_v1.cpp b/libmamba/tests/src/validation/test_update_framework_v1.cpp index 4444e64cd1..ee574af9e0 100644 --- a/libmamba/tests/src/validation/test_update_framework_v1.cpp +++ b/libmamba/tests/src/validation/test_update_framework_v1.cpp @@ -133,8 +133,8 @@ class RootImplT_v1 secrets_type secrets; - auto generate_role_secrets(int count - ) -> std::map> + auto generate_role_secrets(int count) + -> std::map> { std::map> role_secrets; diff --git a/libmambapy/src/libmambapy/bindings/legacy.cpp b/libmambapy/src/libmambapy/bindings/legacy.cpp index 17c48894e3..dbfa4375f7 100644 --- a/libmambapy/src/libmambapy/bindings/legacy.cpp +++ b/libmambapy/src/libmambapy/bindings/legacy.cpp @@ -371,7 +371,8 @@ bind_submodule_impl(pybind11::module_ m) py::enum_(m, "SolverRuleinfo") .def(py::init( - [](py::args, py::kwargs) -> SolverRuleinfoV2Migrator { + [](py::args, py::kwargs) -> SolverRuleinfoV2Migrator + { throw std::runtime_error("Direct access to libsolv objects is not longer supported."); } )); @@ -579,7 +580,8 @@ bind_submodule_impl(pybind11::module_ m) const std::string& full_url, MultiPackageCache& caches, const std::string& repodata_fn, - const std::string& url) { + const std::string& url) + { self.create(context, channel_context, channel, platform, full_url, caches, repodata_fn, url); }, py::arg("context"), diff --git a/libmambapy/src/libmambapy/bindings/solver_libsolv.cpp b/libmambapy/src/libmambapy/bindings/solver_libsolv.cpp index a9d1fa7fe5..985afb48b2 100644 --- a/libmambapy/src/libmambapy/bindings/solver_libsolv.cpp +++ b/libmambapy/src/libmambapy/bindings/solver_libsolv.cpp @@ -225,12 +225,12 @@ namespace mambapy py::arg("format") ); - constexpr auto solver_flags_v2_migrator = [](Solver&, py::args, py::kwargs) { + constexpr auto solver_flags_v2_migrator = [](Solver&, py::args, py::kwargs) + { throw std::runtime_error("All flags need to be passed in the libmambapy.solver.Request."); }; - constexpr auto solver_job_v2_migrator = [](Solver&, py::args, py::kwargs) { - throw std::runtime_error("All jobs need to be passed in the libmambapy.solver.Request."); - }; + constexpr auto solver_job_v2_migrator = [](Solver&, py::args, py::kwargs) + { throw std::runtime_error("All jobs need to be passed in the libmambapy.solver.Request."); }; py::class_(m, "Solver") // .def(py::init()) diff --git a/libmambapy/src/libmambapy/bindings/specs.cpp b/libmambapy/src/libmambapy/bindings/specs.cpp index 21556dfa0d..bbe1d74155 100644 --- a/libmambapy/src/libmambapy/bindings/specs.cpp +++ b/libmambapy/src/libmambapy/bindings/specs.cpp @@ -122,7 +122,8 @@ namespace mambapy ) .def( "user", - [](const CondaURL& self, bool decode) { + [](const CondaURL& self, bool decode) + { return decode ? self.user(CondaURL::Decode::yes) : self.user(CondaURL::Decode::no); }, @@ -145,7 +146,8 @@ namespace mambapy .def("has_user", [](const CondaURL& self) { return self.has_user(); }) .def( "password", - [](const CondaURL& self, bool decode) { + [](const CondaURL& self, bool decode) + { return decode ? self.password(CondaURL::Decode::yes) : self.password(CondaURL::Decode::no); }, @@ -197,7 +199,8 @@ namespace mambapy .def("authority", [](const CondaURL& self) { return self.authority(); }) .def( "path", - [](const CondaURL& self, bool decode) { + [](const CondaURL& self, bool decode) + { return decode ? self.path(CondaURL::Decode::yes) : self.path(CondaURL::Decode::no); }, @@ -778,7 +781,8 @@ namespace mambapy .def( // V2 Migation: Hard deprecation since errors would be hard to track. py::init( - [](std::string_view) -> MatchSpec { + [](std::string_view) -> MatchSpec + { throw std::invalid_argument( "Use 'MatchSpec.parse' to create a new object from a string" );