Merge pull request #1617 from alebastr/fmt-9

fix: adapt to fmt 9.0.0 breaking changes

src/modules/clock.cpp

@@ -1,15 +1,10 @@
 #include "modules/clock.hpp"
 
+#include <fmt/chrono.h>
 #include <spdlog/spdlog.h>
 
-#include <iomanip>
-#if FMT_VERSION < 60000
-#include <fmt/time.h>
-#else
-#include <fmt/chrono.h>
-#endif
-
 #include <ctime>
+#include <iomanip>
 #include <sstream>
 #include <type_traits>
 

src/modules/mpd/state.cpp

@@ -10,6 +10,13 @@ namespace waybar::modules {
 }  // namespace waybar::modules
 #endif
 
+#if FMT_VERSION >= 90000
+/* Satisfy fmt 9.x deprecation of implicit conversion of enums to int */
+auto format_as(enum mpd_idle val) {
+  return static_cast<std::underlying_type_t<enum mpd_idle>>(val);
+}
+#endif
+
 namespace waybar::modules::detail {
 
 #define IDLE_RUN_NOIDLE_AND_CMD(...)                                      \

src/modules/sni/host.cpp

@@ -1,6 +1,5 @@
 #include "modules/sni/host.hpp"
 
-#include <fmt/ostream.h>
 #include <spdlog/spdlog.h>
 
 namespace waybar::modules::SNI {

src/modules/sway/bar.cpp

@@ -1,6 +1,5 @@
 #include "modules/sway/bar.hpp"
 
-#include <fmt/ostream.h>
 #include <spdlog/spdlog.h>
 
 #include <sstream>