From f3a8fd608a9776ef0a5f547da918a32cf6074060 Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Sat, 23 May 2020 23:50:00 +0800
Subject: ...

---
 include/cru/common/format.hpp | 97 -------------------------------------------
 include/cru/common/logger.hpp | 12 +++---
 2 files changed, 6 insertions(+), 103 deletions(-)
 delete mode 100644 include/cru/common/format.hpp

(limited to 'include/cru/common')

diff --git a/include/cru/common/format.hpp b/include/cru/common/format.hpp
deleted file mode 100644
index 4276880e..00000000
--- a/include/cru/common/format.hpp
+++ /dev/null
@@ -1,97 +0,0 @@
-#pragma once
-#include "pre_config.hpp"
-
-#include <sstream>
-#include <string>
-#include <string_view>
-
-namespace cru::util {
-namespace details {
-template <typename TChar>
-struct FormatTrait {};
-
-template <>
-struct FormatTrait<char> {
-  using StringType = std::string;
-  using ViewType = std::string_view;
-  using StreamType = std::stringstream;
-  static constexpr ViewType placeholder = "{}";
-};
-
-template <>
-struct FormatTrait<wchar_t> {
-  using StringType = std::wstring;
-  using ViewType = std::wstring_view;
-  using StreamType = std::wstringstream;
-  static constexpr ViewType placeholder = L"{}";
-};
-}  // namespace details
-
-template <typename TFormatTrait, typename T>
-struct Formatter {
-  static typename TFormatTrait::StringType Format(const T& value) {
-    typename TFormatTrait::StreamType stream;
-    stream << value;
-    return stream.str();
-  }
-};
-
-namespace details {
-template <typename TString>
-void FormatInternal(TString& string) {
-  using Trait = FormatTrait<TString::value_type>;
-  constexpr const auto& placeholder = Trait::placeholder;
-
-  const auto find_result = string.find(placeholder);
-  if (find_result != TString::npos)
-    throw std::invalid_argument("There is more placeholders than args.");
-}
-
-template <typename TString, typename T, typename... TRest>
-void FormatInternal(TString& string, const T& arg, const TRest&... args) {
-  using Trait = FormatTrait<TString::value_type>;
-  constexpr const auto& placeholder = Trait::placeholder;
-
-  const auto find_result = string.find(placeholder);
-  if (find_result == TString::npos)
-    throw std::invalid_argument("There is less placeholders than args.");
-
-  string.replace(find_result, 2, Formatter<Trait, T>::Format(arg));
-  FormatInternal<TString>(string, args...);
-}
-}  // namespace details
-
-template <typename... T>
-std::wstring Format(std::wstring format, const T&... args) {
-  details::FormatInternal(format, args...);
-  return format;
-}
-
-template <typename... T>
-std::string Format(std::string format, const T&... args) {
-  details::FormatInternal(format, args...);
-  return format;
-}
-
-// Why is two overloads below exist?
-// Because people should be able to pass string_view instance as format.
-// However, the two overloads above do not accept string_view as format due to
-// conversion from string_view to string is explicit.
-//
-// Why not just overload but SFINAE?
-// Because I want to make two overloads below worse than the two ones above.
-// Otherwise it will be ambiguous when pass const char* as format.
-//
-
-template <typename T, typename... TArgs>
-auto Format(T format, const TArgs&... args)
-    -> std::enable_if_t<std::is_same_v<T, std::wstring_view>, std::wstring> {
-  return Format(std::wstring{format}, args...);
-}
-
-template <typename T, typename... TArgs>
-auto Format(T format, const TArgs&... args)
-    -> std::enable_if_t<std::is_same_v<T, std::string_view>, std::string> {
-  return Format(std::string{format}, args...);
-}
-}  // namespace cru::util
diff --git a/include/cru/common/logger.hpp b/include/cru/common/logger.hpp
index 38ddb6eb..ab3f2250 100644
--- a/include/cru/common/logger.hpp
+++ b/include/cru/common/logger.hpp
@@ -1,8 +1,8 @@
 #pragma once
-
 #include "cru/common/base.hpp"
-#include "cru/common/format.hpp"
 
+#include <fmt/format.h>
+#include <fmt/ostream.h>
 #include <iostream>
 #include <list>
 #include <memory>
@@ -68,25 +68,25 @@ template <typename... TArgs>
 void Debug([[maybe_unused]] TArgs&&... args) {
 #ifdef CRU_DEBUG
   Logger::GetInstance()->Log(LogLevel::Debug,
-                             util::Format(std::forward<TArgs>(args)...));
+                             fmt::format(std::forward<TArgs>(args)...));
 #endif
 }
 
 template <typename... TArgs>
 void Info(TArgs&&... args) {
   Logger::GetInstance()->Log(LogLevel::Info,
-                             util::Format(std::forward<TArgs>(args)...));
+                             fmt::format(std::forward<TArgs>(args)...));
 }
 
 template <typename... TArgs>
 void Warn(TArgs&&... args) {
   Logger::GetInstance()->Log(LogLevel::Warn,
-                             util::Format(std::forward<TArgs>(args)...));
+                             fmt::format(std::forward<TArgs>(args)...));
 }
 
 template <typename... TArgs>
 void Error(TArgs&&... args) {
   Logger::GetInstance()->Log(LogLevel::Error,
-                             util::Format(std::forward<TArgs>(args)...));
+                             fmt::format(std::forward<TArgs>(args)...));
 }
 }  // namespace cru::log
-- 
cgit v1.2.3