From c124c4c8186ce95e5d6c4f6be179bfa75266e095 Mon Sep 17 00:00:00 2001
From: Wolf Vollprecht <w.vollprecht@gmail.com>
Date: Fri, 20 May 2022 18:06:44 +0200
Subject: [PATCH] reduce number of compiler warnings (#1691)

---
 libmamba/src/api/repoquery.cpp | 2 ++
 libmamba/src/core/output.cpp   | 3 ++-
 libmamba/src/core/util.cpp     | 2 +-
 libmamba/src/core/util_os.cpp  | 2 +-
 libmambapy/src/main.cpp        | 2 ++
 micromamba/src/completer.cpp   | 4 ++--
 6 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/libmamba/src/api/repoquery.cpp b/libmamba/src/api/repoquery.cpp
index 9c319ccd8e..e406771f2e 100644
--- a/libmamba/src/api/repoquery.cpp
+++ b/libmamba/src/api/repoquery.cpp
@@ -80,6 +80,7 @@ namespace mamba
             switch (format)
             {
                 case QueryResultFormat::kTREE:
+                case QueryResultFormat::kPRETTY:
                     res.tree(std::cout);
                     break;
                 case QueryResultFormat::kJSON:
@@ -95,6 +96,7 @@ namespace mamba
             switch (format)
             {
                 case QueryResultFormat::kTREE:
+                case QueryResultFormat::kPRETTY:
                     res.tree(std::cout);
                     break;
                 case QueryResultFormat::kJSON:
diff --git a/libmamba/src/core/output.cpp b/libmamba/src/core/output.cpp
index a63122226f..e5b1116282 100644
--- a/libmamba/src/core/output.cpp
+++ b/libmamba/src/core/output.cpp
@@ -257,8 +257,9 @@ namespace mamba
      * Console *
      ***********/
 
-    struct ConsoleData
+    class ConsoleData
     {
+    public:
         std::mutex m_mutex;
         std::unique_ptr<ProgressBarManager> p_progress_bar_manager;
 
diff --git a/libmamba/src/core/util.cpp b/libmamba/src/core/util.cpp
index 0e2ea1e58e..eaff83e0e6 100644
--- a/libmamba/src/core/util.cpp
+++ b/libmamba/src/core/util.cpp
@@ -1022,7 +1022,7 @@ namespace mamba
                 return signum;
             });
 
-        MainExecutor::instance().take_ownership(std::move(t.extract()));
+        MainExecutor::instance().take_ownership(t.extract());
 
         {
             std::unique_lock<std::mutex> l(m);
diff --git a/libmamba/src/core/util_os.cpp b/libmamba/src/core/util_os.cpp
index bfc7049f18..0ff6147eee 100644
--- a/libmamba/src/core/util_os.cpp
+++ b/libmamba/src/core/util_os.cpp
@@ -423,7 +423,7 @@ namespace mamba
         // Enable buffering to prevent VS from chopping up UTF-8 byte sequences
         setvbuf(stdout, nullptr, _IOFBF, 1000);
 #else
-        static constexpr char* utf8_locales[] = {
+        static constexpr const char* utf8_locales[] = {
             "C.UTF-8",
             "POSIX.UTF-8",
             "en_US.UTF-8",
diff --git a/libmambapy/src/main.cpp b/libmambapy/src/main.cpp
index a5d4bcf582..a42e541d17 100644
--- a/libmambapy/src/main.cpp
+++ b/libmambapy/src/main.cpp
@@ -215,6 +215,7 @@ PYBIND11_MODULE(bindings, m)
                  switch (format)
                  {
                      case query::TREE:
+                     case query::PRETTY:
                          res.tree(res_stream);
                          break;
                      case query::JSON:
@@ -237,6 +238,7 @@ PYBIND11_MODULE(bindings, m)
                  switch (format)
                  {
                      case query::TREE:
+                     case query::PRETTY:
                          res.tree(res_stream);
                          break;
                      case query::JSON:
diff --git a/micromamba/src/completer.cpp b/micromamba/src/completer.cpp
index 41b35a6229..c07445616b 100644
--- a/micromamba/src/completer.cpp
+++ b/micromamba/src/completer.cpp
@@ -92,7 +92,7 @@ add_activate_completion(CLI::App* app, std::vector<std::string>& completer_args,
 
     // Mock functions just for completion
     CLI::App* activate_subcom = app->add_subcommand("activate");
-    CLI::App* deactivate_subcom = app->add_subcommand("deactivate");
+    app->add_subcommand("deactivate");
     activate_subcom->callback(
         [app, &completer_args, &completed]()
         {
@@ -124,7 +124,7 @@ add_ps_completion(CLI::App* app, std::vector<std::string>& completer_args, bool&
                           { complete_options(list_subcom, completer_args, completed); });
 
     stop_subcom->callback(
-        [app, &completer_args, &completed]()
+        [&completer_args, &completed]()
         {
             if (completer_args.size() == 1)
             {