refactor: clean up logger.h

include/dwarfs/logger.h

@@ -21,12 +21,11 @@
 
 #pragma once
 
-#include <array>
 #include <atomic>
 #include <chrono>
 #include <cstddef>
 #include <ctime>
-#include <iostream>
+#include <iosfwd>
 #include <memory>
 #include <mutex>
 #include <optional>
@@ -59,10 +58,7 @@ class logger {
     TRACE
   };
 
-  static char level_char(level_type level) {
+  static char level_char(level_type level);
-    static std::array<char, 7> lchars = {{'F', 'E', 'W', 'I', 'V', 'D', 'T'}};
-    return lchars.at(level);
-  }
 
   virtual ~logger() = default;
 

include/dwarfs/writer/internal/detail/multi_queue_block_merger_impl.h

@@ -25,6 +25,7 @@
 #include <cassert>
 #include <condition_variable>
 #include <deque>
+#include <iostream>
 #include <mutex>
 #include <optional>
 #include <stdexcept>

src/logger.cpp

@@ -25,6 +25,7 @@
 #include <stdexcept>
 
 #include <folly/Conv.h>
+#include <folly/lang/Assume.h>
 #include <folly/small_vector.h>
 
 #include <dwarfs/config.h>
@@ -61,6 +62,26 @@ constexpr std::array<std::pair<std::string_view, logger::level_type>, 6>
 
 }
 
+char logger::level_char(level_type level) {
+  switch (level) {
+  case FATAL:
+    return 'F';
+  case ERROR:
+    return 'E';
+  case WARN:
+    return 'W';
+  case INFO:
+    return 'I';
+  case VERBOSE:
+    return 'V';
+  case DEBUG:
+    return 'D';
+  case TRACE:
+    return 'T';
+  }
+  folly::assume_unreachable();
+}
+
 std::ostream& operator<<(std::ostream& os, logger::level_type const& optval) {
   return os << logger::level_name(optval);
 }

src/writer/categorizer.cpp

@@ -20,6 +20,7 @@
  */
 
 #include <cassert>
+#include <iostream>
 #include <unordered_map>
 
 #include <boost/program_options.hpp>

test/test_logger.h

@@ -22,6 +22,7 @@
 #pragma once
 
 #include <cstdlib>
+#include <iostream>
 #include <mutex>
 #include <optional>
 #include <string>