From 7673db695912ed5969a84e0262fdaecdc7c88249 Mon Sep 17 00:00:00 2001
From: Fabian Sauter <sauter.fabian@mailbox.org>
Date: Tue, 26 Jul 2022 13:39:42 +0200
Subject: [PATCH] Replaced set and list to string with fmt::join

Signed-off-by: Fabian Sauter <sauter.fabian@mailbox.org>
---
 src/Manager.cpp                       |  6 ++---
 src/include/kompute/logger/Logger.hpp |  9 -------
 src/logger/Logger.cpp                 | 39 ---------------------------
 3 files changed, 3 insertions(+), 51 deletions(-)

diff --git a/src/Manager.cpp b/src/Manager.cpp
index 211cd7967..26670c627 100644
--- a/src/Manager.cpp
+++ b/src/Manager.cpp
@@ -380,7 +380,7 @@ Manager::createDevice(const std::vector<uint32_t>& familyQueueIndices,
     }
 
     KP_LOG_DEBUG("Kompute Manager desired extension layers {}",
-                 logger::vecToString(desiredExtensions));
+                 fmt::join(desiredExtensions, ", "));
 
     std::vector<vk::ExtensionProperties> deviceExtensions =
       this->mPhysicalDevice->enumerateDeviceExtensionProperties();
@@ -390,7 +390,7 @@ Manager::createDevice(const std::vector<uint32_t>& familyQueueIndices,
         uniqueExtensionNames.insert(ext.extensionName);
     }
     KP_LOG_DEBUG("Kompute Manager available extensions {}",
-                 logger::setToString(uniqueExtensionNames));
+                 fmt::join(uniqueExtensionNames, ", "));
     std::vector<const char*> validExtensions;
     for (const std::string& ext : desiredExtensions) {
         if (uniqueExtensionNames.count(ext) != 0) {
@@ -399,7 +399,7 @@ Manager::createDevice(const std::vector<uint32_t>& familyQueueIndices,
     }
     if (desiredExtensions.size() != validExtensions.size()) {
         KP_LOG_ERROR("Kompute Manager not all extensions were added: {}",
-                     logger::vecToString(validExtensions));
+                     fmt::join(validExtensions, ", "));
     }
 
     vk::DeviceCreateInfo deviceCreateInfo(vk::DeviceCreateFlags(),
diff --git a/src/include/kompute/logger/Logger.hpp b/src/include/kompute/logger/Logger.hpp
index 977c6350e..4e3c1bd2a 100644
--- a/src/include/kompute/logger/Logger.hpp
+++ b/src/include/kompute/logger/Logger.hpp
@@ -184,15 +184,6 @@ spdlog::level::level_enum
 getLogLevel();
 
 #endif // !KOMPUTE_OPT_USE_SPDLOG
-
-std::string
-setToString(const std::set<std::string>& set);
-
-std::string
-vecToString(const std::vector<const char*>& vec);
-
-std::string
-vecToString(const std::vector<std::string>& vec);
 } // namespace logger
 
 #endif // KOMPUTE_OPT_LOG_LEVEL_DISABLED
\ No newline at end of file
diff --git a/src/logger/Logger.cpp b/src/logger/Logger.cpp
index 79cb46686..b8628788c 100644
--- a/src/logger/Logger.cpp
+++ b/src/logger/Logger.cpp
@@ -93,45 +93,6 @@ setLogLevel(const spdlog::level::level_enum level)
     spdlog::default_logger()->set_level(level);
 }
 #endif // !KOMPUTE_OPT_USE_SPDLOG
-
-std::string
-setToString(const std::set<std::string>& set)
-{
-    std::string result;
-    for (const std::string& entry : set) {
-        result += entry + ", ";
-    }
-    if (result.empty()) {
-        return result;
-    }
-    return result.substr(0, result.size() - 2); // Remove the tailing ", "
-}
-
-std::string
-vecToString(const std::vector<const char*>& vec)
-{
-    std::string result;
-    for (const char* entry : vec) {
-        result += std::string(entry) + ", ";
-    }
-    if (result.empty()) {
-        return result;
-    }
-    return result.substr(0, result.size() - 2); // Remove the tailing ", "
-}
-
-std::string
-vecToString(const std::vector<std::string>& vec)
-{
-    std::string result;
-    for (const std::string& entry : vec) {
-        result += entry + ", ";
-    }
-    if (result.empty()) {
-        return result;
-    }
-    return result.substr(0, result.size() - 2); // Remove the tailing ", "
-}
 } // namespace logger
 
 #endif