From f8c06b27ae0d586f237e302a8f47e13458a1fba9 Mon Sep 17 00:00:00 2001
From: Alex <alexisr245@gmail.com>
Date: Fri, 26 Apr 2019 21:49:16 +0200
Subject: [PATCH] Revert "feat(Cpu): dynamic fmt args"

This reverts commit 2d9bcb1a2df916e4a6846659ce91c5cd8038097e.
---
 src/modules/cpu.cpp | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/modules/cpu.cpp b/src/modules/cpu.cpp
index 656436d1..880a05a5 100644
--- a/src/modules/cpu.cpp
+++ b/src/modules/cpu.cpp
@@ -13,20 +13,13 @@ waybar::modules::Cpu::Cpu(const std::string& id, const Json::Value& config)
 }
 
 auto waybar::modules::Cpu::update() -> void {
-  std::vector<fmt::basic_format_arg<fmt::format_context>> args;
-  if (format_.find("{load}") != std::string::npos) {
-    auto cpu_load = getCpuLoad();
-    args.emplace_back(fmt::internal::make_arg<fmt::format_context>(fmt::arg("load", cpu_load)));
+  // TODO: as creating dynamic fmt::arg arrays is buggy we have to calc both
+  auto cpu_load = getCpuLoad();
+  auto [cpu_usage, tooltip] = getCpuUsage();
+  if (tooltipEnabled()) {
+    label_.set_tooltip_text(tooltip);
   }
-  if (format_.find("{usage}") != std::string::npos) {
-    auto [cpu_usage, tooltip] = getCpuUsage();
-    args.emplace_back(fmt::internal::make_arg<fmt::format_context>(fmt::arg("usage", cpu_usage)));
-    if (tooltipEnabled()) {
-      label_.set_tooltip_text(tooltip);
-    }
-  }
-  label_.set_markup(
-      fmt::vformat(format_, fmt::basic_format_args<fmt::format_context>(args.data(), args.size())));
+  label_.set_markup(fmt::format(format_, fmt::arg("load", cpu_load), fmt::arg("usage", cpu_usage)));
 }
 
 uint16_t waybar::modules::Cpu::getCpuLoad() {