folkslinux
/
mamba
mirror of https://github.com/mamba-org/mamba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

formatting

This commit is contained in:
Klaim (Joël Lamotte) 2025-07-01 17:37:50 +02:00
parent 65f5112283
commit 94a96548d2
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libmamba/include/mamba/download/mirror.hpp
View File

@ -66,7 +66,8 @@ namespace mamba::download
MirrorRequest& operator=(MirrorRequest&&) = default; MirrorRequest& operator=(MirrorRequest&&) = default;
}; };
struct MirrorStats // Moved out of Mirror internals because of compilers not agreeing: https://godbolt.org/z/GcjWhrb9W struct MirrorStats // Moved out of Mirror internals because of compilers not agreeing:
// https://godbolt.org/z/GcjWhrb9W
{ {
std::optional<std::size_t> allowed_connections = std::nullopt; std::optional<std::size_t> allowed_connections = std::nullopt;
std::size_t max_tried_connections = 0; std::size_t max_tried_connections = 0;
@ -121,7 +122,6 @@ namespace mamba::download
static_assert(std::default_initializable<MirrorStats>); static_assert(std::default_initializable<MirrorStats>);
util::synchronized_value<MirrorStats> m_stats; util::synchronized_value<MirrorStats> m_stats;
}; };
std::unique_ptr<Mirror> make_mirror(std::string url); std::unique_ptr<Mirror> make_mirror(std::string url);

6
libmamba/src/core/output.cpp
View File

@ -25,9 +25,9 @@
#include "mamba/core/tasksync.hpp" #include "mamba/core/tasksync.hpp"
#include "mamba/core/thread_utils.hpp" #include "mamba/core/thread_utils.hpp"
#include "mamba/core/util.hpp" #include "mamba/core/util.hpp"
#include "mamba/util/synchronized_value.hpp"
#include "mamba/specs/conda_url.hpp" #include "mamba/specs/conda_url.hpp"
#include "mamba/util/string.hpp" #include "mamba/util/string.hpp"
#include "mamba/util/synchronized_value.hpp"
#include "mamba/util/url_manip.hpp" #include "mamba/util/url_manip.hpp"
#include "progress_bar_impl.hpp" #include "progress_bar_impl.hpp"
@ -276,7 +276,6 @@ namespace mamba
using ConsoleBuffer = std::vector<std::string>; using ConsoleBuffer = std::vector<std::string>;
class ConsoleData class ConsoleData
{ {
public: public:
@ -305,6 +304,7 @@ namespace mamba
std::unique_ptr<ProgressBarManager> progress_bar_manager; std::unique_ptr<ProgressBarManager> progress_bar_manager;
ConsoleBuffer buffer; ConsoleBuffer buffer;
}; };
util::synchronized_value<Data> m_synched_data; util::synchronized_value<Data> m_synched_data;
TaskSynchronizer m_tasksync; TaskSynchronizer m_tasksync;
@ -450,7 +450,7 @@ namespace mamba
name, name,
{ {
.graphics = context().graphics_params, .graphics = context().graphics_params,
.ascii_only = context().ascii_only, .ascii_only = context().ascii_only,
}, },
expected_total expected_total
); );

2
libmamba/src/core/util.cpp
View File

@ -1066,7 +1066,7 @@ namespace mamba
#endif #endif
struct LockedFilesRegistry_Data // made public to workaround CWG2335, should be private struct LockedFilesRegistry_Data // made public to workaround CWG2335, should be private
// otherwise // otherwise
{ {
// TODO: replace by something like boost::multiindex or equivalent to avoid having // TODO: replace by something like boost::multiindex or equivalent to avoid having
// to handle 2 hashmaps // to handle 2 hashmaps