main.cc: simplify (#1119)

src/Cabin.cc

@@ -3,6 +3,7 @@
 #include "Algos.hpp"
 #include "Cli.hpp"
 #include "Cmd.hpp"
+#include "Logger.hpp"
 #include "Rustify/Result.hpp"
 #include "TermColor.hpp"
 
@@ -12,6 +13,7 @@
 #include <span>
 #include <string>
 #include <string_view>
+#include <utility>
 #include <vector>
 
 namespace cabin {
@@ -120,11 +122,13 @@ colorizeAnyhowError(std::string s) {
   return s;
 }
 
-Result<void, std::string>
-cliMain(const std::span<char* const> args) noexcept {
-  return parseArgs(args).map_err([](const auto& e) {
-    return colorizeAnyhowError(e->what());
-  });
+Result<void, void>
+cliMain(int argc, char* argv[]) noexcept {  // NOLINT(*-avoid-c-arrays)
+  // Drop the first argument (program name)
+  const std::span<char* const> args(argv + 1, argv + argc);
+  return parseArgs(args)
+      .map_err([](const auto& e) { return colorizeAnyhowError(e->what()); })
+      .map_err([](std::string e) { logger::error("{}", std::move(e)); });
 }
 
 }  // namespace cabin

src/Cabin.hpp

@@ -2,11 +2,9 @@
 
 #include "Rustify/Result.hpp"
 
-#include <span>
-#include <string>
-
 namespace cabin {
 
-Result<void, std::string> cliMain(std::span<char* const> args) noexcept;
+// NOLINTNEXTLINE(*-avoid-c-arrays)
+Result<void, void> cliMain(int argc, char* argv[]) noexcept;
 
 }  // namespace cabin

src/main.cc

@@ -1,11 +1,6 @@
 #include "Cabin.hpp"
-#include "Logger.hpp"
-
-#include <span>
 
 int
 main(int argc, char* argv[]) {
-  return cabin::cliMain(std::span<char* const>(argv + 1, argv + argc))
-      .map_err([](const auto& e) { cabin::logger::error("{}", e); })
-      .is_err();
+  return cabin::cliMain(argc, argv).is_err();
 }