mirror of https://github.com/mamba-org/mamba.git
Fix some warnings (#3595)
This commit is contained in:
parent
7623caa96c
commit
6467000748
|
@ -170,7 +170,7 @@ namespace mamba
|
|||
{
|
||||
public:
|
||||
|
||||
MessageLogger(const char* file, int line, log_level level);
|
||||
MessageLogger(log_level level);
|
||||
~MessageLogger();
|
||||
|
||||
std::stringstream& stream();
|
||||
|
@ -181,8 +181,6 @@ namespace mamba
|
|||
|
||||
private:
|
||||
|
||||
std::string m_file;
|
||||
int m_line;
|
||||
log_level m_level;
|
||||
std::stringstream m_stream;
|
||||
|
||||
|
@ -199,7 +197,7 @@ namespace mamba
|
|||
#undef LOG_ERROR
|
||||
#undef LOG_CRITICAL
|
||||
|
||||
#define LOG(severity) mamba::MessageLogger(__FILE__, __LINE__, severity).stream()
|
||||
#define LOG(severity) mamba::MessageLogger(severity).stream()
|
||||
#define LOG_TRACE LOG(mamba::log_level::trace)
|
||||
#define LOG_DEBUG LOG(mamba::log_level::debug)
|
||||
#define LOG_INFO LOG(mamba::log_level::info)
|
||||
|
|
|
@ -21,7 +21,7 @@ namespace solv
|
|||
|
||||
namespace mamba
|
||||
{
|
||||
class Palette;
|
||||
struct Palette;
|
||||
}
|
||||
|
||||
namespace mamba::solver::libsolv
|
||||
|
|
|
@ -71,7 +71,7 @@ namespace mamba
|
|||
}
|
||||
|
||||
std::regex spec_pat(regex);
|
||||
auto all_records = std::move(prefix_data.all_pkg_mgr_records());
|
||||
auto all_records = prefix_data.all_pkg_mgr_records();
|
||||
|
||||
if (ctx.output_params.json)
|
||||
{
|
||||
|
|
|
@ -472,17 +472,6 @@ namespace mamba
|
|||
return *(p_data->p_progress_bar_manager);
|
||||
}
|
||||
|
||||
std::string strip_file_prefix(const std::string& file)
|
||||
{
|
||||
#ifdef _WIN32
|
||||
char sep = '\\';
|
||||
#else
|
||||
char sep = '/';
|
||||
#endif
|
||||
size_t pos = file.rfind(sep);
|
||||
return pos != std::string::npos ? file.substr(pos + 1, std::string::npos) : file;
|
||||
}
|
||||
|
||||
void Console::json_print()
|
||||
{
|
||||
print(p_data->json_log.unflatten().dump(4), true);
|
||||
|
@ -557,10 +546,8 @@ namespace mamba
|
|||
static std::vector<std::pair<std::string, log_level>> m_buffer;
|
||||
};
|
||||
|
||||
MessageLogger::MessageLogger(const char* file, int line, log_level level)
|
||||
: m_file(strip_file_prefix(file))
|
||||
, m_line(line)
|
||||
, m_level(level)
|
||||
MessageLogger::MessageLogger(log_level level)
|
||||
: m_level(level)
|
||||
, m_stream()
|
||||
{
|
||||
}
|
||||
|
|
|
@ -1902,8 +1902,7 @@ namespace mamba
|
|||
{
|
||||
for (auto& [label, bars] : m_labels)
|
||||
{
|
||||
std::size_t current = 0, total = 0, in_progress = 0, speed = 0, active_count = 0,
|
||||
total_count = 0;
|
||||
std::size_t current = 0, total = 0, in_progress = 0, speed = 0;
|
||||
bool any_spinner = false;
|
||||
bool any_started = false;
|
||||
std::vector<ProgressBar::time_point_t> start_times = {};
|
||||
|
@ -1916,7 +1915,6 @@ namespace mamba
|
|||
{
|
||||
current += bar->current();
|
||||
total += bar->total();
|
||||
++total_count;
|
||||
|
||||
if (!bar->unset())
|
||||
{
|
||||
|
@ -1926,7 +1924,6 @@ namespace mamba
|
|||
{
|
||||
speed += bar->speed();
|
||||
in_progress += (bar->total() - bar->current());
|
||||
++active_count;
|
||||
aggregate_bar_ptr->add_active_task(bar->prefix());
|
||||
any_started = true;
|
||||
}
|
||||
|
|
|
@ -749,7 +749,7 @@ namespace mamba
|
|||
{
|
||||
const ShellInitPathsWindowsCmd paths{ root_prefix };
|
||||
|
||||
for (const auto directory : paths.every_generated_directories_paths())
|
||||
for (const auto& directory : paths.every_generated_directories_paths())
|
||||
{
|
||||
// Maybe the prefix isn't writable. No big deal, just keep going.
|
||||
std::error_code maybe_error [[maybe_unused]];
|
||||
|
|
|
@ -962,7 +962,7 @@ namespace mamba::download
|
|||
{
|
||||
new_mirror = find_mirror(
|
||||
m_mirror_set,
|
||||
[this, iteration](const auto& mirror) {
|
||||
[iteration](const auto& mirror) {
|
||||
return iteration > mirror->failed_transfers()
|
||||
&& mirror->can_accept_more_connections();
|
||||
}
|
||||
|
|
|
@ -58,7 +58,10 @@ namespace mamba::download
|
|||
TEST_CASE("PassThroughMirror")
|
||||
{
|
||||
std::unique_ptr<Mirror> mir = make_mirror("");
|
||||
CHECK_EQ(typeid(*mir), typeid(PassThroughMirror));
|
||||
// `mir_ref` is used here to provide an explicit expression to `typeid`
|
||||
// and avoid expression with side effects evaluation warning
|
||||
auto& mir_ref = *mir;
|
||||
CHECK_EQ(typeid(mir_ref), typeid(PassThroughMirror));
|
||||
|
||||
Mirror::request_generator_list req_gen = mir->get_request_generators("", "");
|
||||
CHECK_EQ(req_gen.size(), 1);
|
||||
|
@ -75,7 +78,10 @@ namespace mamba::download
|
|||
SUBCASE("https")
|
||||
{
|
||||
std::unique_ptr<Mirror> mir = make_mirror("https://conda.anaconda.org/conda-forge");
|
||||
CHECK_EQ(typeid(*mir), typeid(HTTPMirror));
|
||||
// `mir_ref` is used here to provide an explicit expression to `typeid`
|
||||
// and avoid expression with side effects evaluation warning
|
||||
auto& mir_ref = *mir;
|
||||
CHECK_EQ(typeid(mir_ref), typeid(HTTPMirror));
|
||||
|
||||
Mirror::request_generator_list req_gen = mir->get_request_generators("", "");
|
||||
CHECK_EQ(req_gen.size(), 1);
|
||||
|
@ -94,7 +100,10 @@ namespace mamba::download
|
|||
SUBCASE("http")
|
||||
{
|
||||
std::unique_ptr<Mirror> mir = make_mirror("http://conda.anaconda.org/conda-forge");
|
||||
CHECK_EQ(typeid(*mir), typeid(HTTPMirror));
|
||||
// `mir_ref` is used here to provide an explicit expression to `typeid`
|
||||
// and avoid expression with side effects evaluation warning
|
||||
auto& mir_ref = *mir;
|
||||
CHECK_EQ(typeid(mir_ref), typeid(HTTPMirror));
|
||||
|
||||
Mirror::request_generator_list req_gen = mir->get_request_generators("", "");
|
||||
CHECK_EQ(req_gen.size(), 1);
|
||||
|
@ -113,7 +122,10 @@ namespace mamba::download
|
|||
SUBCASE("file")
|
||||
{
|
||||
std::unique_ptr<Mirror> mir = make_mirror("file://channel_path");
|
||||
CHECK_EQ(typeid(*mir), typeid(HTTPMirror));
|
||||
// `mir_ref` is used here to provide an explicit expression to `typeid`
|
||||
// and avoid expression with side effects evaluation warning
|
||||
auto& mir_ref = *mir;
|
||||
CHECK_EQ(typeid(mir_ref), typeid(HTTPMirror));
|
||||
|
||||
Mirror::request_generator_list req_gen = mir->get_request_generators("", "");
|
||||
CHECK_EQ(req_gen.size(), 1);
|
||||
|
@ -135,7 +147,10 @@ namespace mamba::download
|
|||
SUBCASE("Request repodata.json")
|
||||
{
|
||||
std::unique_ptr<Mirror> mir = make_mirror("oci://ghcr.io/channel-mirrors/conda-forge");
|
||||
CHECK_EQ(typeid(*mir), typeid(OCIMirror));
|
||||
// `mir_ref` is used here to provide an explicit expression to `typeid`
|
||||
// and avoid expression with side effects evaluation warning
|
||||
auto& mir_ref = *mir;
|
||||
CHECK_EQ(typeid(mir_ref), typeid(OCIMirror));
|
||||
|
||||
Mirror::request_generator_list req_gen = mir->get_request_generators(
|
||||
"linux-64/repodata.json",
|
||||
|
@ -164,7 +179,10 @@ namespace mamba::download
|
|||
SUBCASE("Request spec with sha")
|
||||
{
|
||||
std::unique_ptr<Mirror> mir = make_mirror("oci://ghcr.io/channel-mirrors/conda-forge");
|
||||
CHECK_EQ(typeid(*mir), typeid(OCIMirror));
|
||||
// `mir_ref` is used here to provide an explicit expression to `typeid`
|
||||
// and avoid expression with side effects evaluation warning
|
||||
auto& mir_ref = *mir;
|
||||
CHECK_EQ(typeid(mir_ref), typeid(OCIMirror));
|
||||
|
||||
Mirror::request_generator_list req_gen = mir->get_request_generators(
|
||||
"linux-64/pandoc-3.2-ha770c72_0.conda",
|
||||
|
|
Loading…
Reference in New Issue