Misc: Fix deprecated implicit conversion of fstring->string_view

src/common/error.h

@@ -87,7 +87,7 @@ public:
   template<typename... T>
   void SetStringFmt(fmt::format_string<T...> fmt, T&&... args)
   {
-    SetStringFmtArgs(fmt, fmt::make_format_args(args...));
+    SetStringFmtArgs(fmt.get(), fmt::make_format_args(args...));
   }
 
   void AddPrefix(std::string_view prefix);
@@ -95,7 +95,7 @@ public:
   template<typename... T>
   void AddPrefixFmt(fmt::format_string<T...> fmt, T&&... args)
   {
-    AddPrefixFmtArgs(fmt, fmt::make_format_args(args...));
+    AddPrefixFmtArgs(fmt.get(), fmt::make_format_args(args...));
   }
 
   void AddSuffix(std::string_view suffix);
@@ -103,7 +103,7 @@ public:
   template<typename... T>
   void AddSuffixFmt(fmt::format_string<T...> fmt, T&&... args)
   {
-    AddSuffixFmtArgs(fmt, fmt::make_format_args(args...));
+    AddSuffixFmtArgs(fmt.get(), fmt::make_format_args(args...));
   }
 
   /// Sets a formatted message.
@@ -111,7 +111,7 @@ public:
   static void SetStringFmt(Error* errptr, fmt::format_string<T...> fmt, T&&... args)
   {
     if (errptr)
-      errptr->SetStringFmtArgs(fmt, fmt::make_format_args(args...));
+      errptr->SetStringFmtArgs(fmt.get(), fmt::make_format_args(args...));
   }
 
   static void AddPrefix(Error* errptr, std::string_view prefix);
@@ -120,7 +120,7 @@ public:
   static void AddPrefixFmt(Error* errptr, fmt::format_string<T...> fmt, T&&... args)
   {
     if (errptr)
-      errptr->AddPrefixFmtArgs(fmt, fmt::make_format_args(args...));
+      errptr->AddPrefixFmtArgs(fmt.get(), fmt::make_format_args(args...));
   }
 
   static void AddSuffix(Error* errptr, std::string_view prefix);
@@ -129,7 +129,7 @@ public:
   static void AddSuffixFmt(Error* errptr, fmt::format_string<T...> fmt, T&&... args)
   {
     if (errptr)
-      errptr->AddSuffixFmtArgs(fmt, fmt::make_format_args(args...));
+      errptr->AddSuffixFmtArgs(fmt.get(), fmt::make_format_args(args...));
   }
 
   Error& operator=(const Error& e);

src/common/log.h

@@ -142,14 +142,14 @@ void WriteFuncNameFmtArgs(MessageCategory cat, const char* function_name, fmt::s
 template<typename... T>
 ALWAYS_INLINE void Write(MessageCategory cat, fmt::format_string<T...> fmt, T&&... args)
 {
-  WriteFmtArgs(cat, fmt, fmt::make_format_args(args...));
+  WriteFmtArgs(cat, fmt.get(), fmt::make_format_args(args...));
 }
 
 template<typename... T>
 ALWAYS_INLINE void WriteFuncName(MessageCategory cat, const char* function_name, fmt::format_string<T...> fmt,
                                  T&&... args)
 {
-  WriteFuncNameFmtArgs(cat, function_name, fmt, fmt::make_format_args(args...));
+  WriteFuncNameFmtArgs(cat, function_name, fmt.get(), fmt::make_format_args(args...));
 }
 
 } // namespace Log

src/common/progress_callback.h

@@ -16,7 +16,7 @@
   void from(fmt::format_string<T...> fmt, T&&... args)                                                                 \
   {                                                                                                                    \
     TinyString str;                                                                                                    \
-    fmt::vformat_to(std::back_inserter(str), fmt, fmt::make_format_args(args...));                                     \
+    fmt::vformat_to(std::back_inserter(str), fmt.get(), fmt::make_format_args(args...));                               \
     to(str.view());                                                                                                    \
   }
 

src/common/small_string.h

@@ -416,7 +416,7 @@ template<typename... T>
 ALWAYS_INLINE SmallStackString<L> SmallStackString<L>::from_format(fmt::format_string<T...> fmt, T&&... args)
 {
   SmallStackString<L> ret;
-  fmt::vformat_to(std::back_inserter(ret), fmt, fmt::make_format_args(args...));
+  fmt::vformat_to(std::back_inserter(ret), fmt.get(), fmt::make_format_args(args...));
   return ret;
 }
 
@@ -436,14 +436,14 @@ using LargeString = SmallStackString<512>;
 template<typename... T>
 ALWAYS_INLINE void SmallStringBase::append_format(fmt::format_string<T...> fmt, T&&... args)
 {
-  fmt::vformat_to(std::back_inserter(*this), fmt, fmt::make_format_args(args...));
+  fmt::vformat_to(std::back_inserter(*this), fmt.get(), fmt::make_format_args(args...));
 }
 
 template<typename... T>
 ALWAYS_INLINE void SmallStringBase::prepend_format(fmt::format_string<T...> fmt, T&&... args)
 {
   TinyString str;
-  fmt::vformat_to(std::back_inserter(str), fmt, fmt::make_format_args(args...));
+  fmt::vformat_to(std::back_inserter(str), fmt.get(), fmt::make_format_args(args...));
   prepend(str);
 }
 
@@ -451,7 +451,7 @@ template<typename... T>
 ALWAYS_INLINE void SmallStringBase::format(fmt::format_string<T...> fmt, T&&... args)
 {
   clear();
-  fmt::vformat_to(std::back_inserter(*this), fmt, fmt::make_format_args(args...));
+  fmt::vformat_to(std::back_inserter(*this), fmt.get(), fmt::make_format_args(args...));
 }
 
 #ifdef _MSC_VER

src/core/achievements.cpp

@@ -344,7 +344,7 @@ template<typename... T>
 void Achievements::ReportFmtError(fmt::format_string<T...> fmt, T&&... args)
 {
   TinyString str;
-  fmt::vformat_to(std::back_inserter(str), fmt, fmt::make_format_args(args...));
+  fmt::vformat_to(std::back_inserter(str), fmt.get(), fmt::make_format_args(args...));
   ReportError(str);
 }
 
@@ -352,7 +352,7 @@ template<typename... T>
 void Achievements::ReportRCError(int err, fmt::format_string<T...> fmt, T&&... args)
 {
   TinyString str;
-  fmt::vformat_to(std::back_inserter(str), fmt, fmt::make_format_args(args...));
+  fmt::vformat_to(std::back_inserter(str), fmt.get(), fmt::make_format_args(args...));
   str.append_format("{} ({})", rc_error_str(err), err);
   ReportError(str);
 }

src/core/cheats.cpp

@@ -83,13 +83,13 @@ public:
   {
     if (!stop_on_error)
     {
-      Log::WriteFmtArgs(Log::PackCategory(Log::Channel::Cheats, Log::Level::Warning, Log::Color::StrongOrange), fmt,
-                        fmt::make_format_args(args...));
+      Log::WriteFmtArgs(Log::PackCategory(Log::Channel::Cheats, Log::Level::Warning, Log::Color::StrongOrange),
+                        fmt.get(), fmt::make_format_args(args...));
       return true;
     }
 
     if (error)
-      error->SetString(fmt::vformat(fmt, fmt::make_format_args(args...)));
+      error->SetString(fmt::vformat(fmt.get(), fmt::make_format_args(args...)));
 
     return false;
   }

src/core/game_database.cpp

@@ -572,7 +572,7 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
   };
   const auto append_message_fmt = [&messages]<typename... T>(fmt::format_string<T...> fmt, T&&... args) {
     messages.append(" \u2022 ");
-    messages.append_vformat(fmt, fmt::make_format_args(args...));
+    messages.append_vformat(fmt.get(), fmt::make_format_args(args...));
     messages.append('\n');
   };
 

src/core/system.cpp

@@ -4829,7 +4829,7 @@ void System::WarnAboutUnsafeSettings()
   };
   const auto append_format = [&messages]<typename... T>(fmt::format_string<T...> fmt, T&&... args) {
     messages.append(" \u2022 ");
-    messages.append_vformat(fmt, fmt::make_format_args(args...));
+    messages.append_vformat(fmt.get(), fmt::make_format_args(args...));
     messages.append('\n');
   };
   const auto has_trait = [](GameDatabase::Trait trait) {

src/updater/updater_progress_callback.h

@@ -24,7 +24,7 @@ public:
   void from(fmt::format_string<T...> fmt, T&&... args)                                                                 \
   {                                                                                                                    \
     TinyString str;                                                                                                    \
-    fmt::vformat_to(std::back_inserter(str), fmt, fmt::make_format_args(args...));                                     \
+    fmt::vformat_to(std::back_inserter(str), fmt.get(), fmt::make_format_args(args...));                               \
     to(str.view());                                                                                                    \
   }
 

src/util/cue_parser.cpp

@@ -23,7 +23,7 @@ template<typename... T>
 static void SetError(u32 line_number, Error* error, fmt::format_string<T...> fmt, T&&... args)
 {
   SmallString str;
-  str.vformat(fmt, fmt::make_format_args(args...));
+  str.vformat(fmt.get(), fmt::make_format_args(args...));
 
   ERROR_LOG("Cue parse error at line {}: {}", line_number, str);
   Error::SetStringFmt(error, "Cue parse error at line {}: {}", line_number, str);

src/util/gpu_device.h

@@ -90,7 +90,7 @@ public:
   template<typename... T>
   void SetDebugName(fmt::format_string<T...> fmt, T&&... args)
   {
-    SetDebugName(TinyString::from_vformat(fmt, fmt::make_format_args(args...)));
+    SetDebugName(TinyString::from_vformat(fmt.get(), fmt::make_format_args(args...)));
   }
 #endif
 
@@ -113,7 +113,7 @@ public:
   template<typename... T>
   void SetDebugName(fmt::format_string<T...> fmt, T&&... args)
   {
-    SetDebugName(TinyString::from_vformat(fmt, fmt::make_format_args(args...)));
+    SetDebugName(TinyString::from_vformat(fmt.get(), fmt::make_format_args(args...)));
   }
 #endif
 
@@ -411,7 +411,7 @@ public:
   template<typename... T>
   void SetDebugName(fmt::format_string<T...> fmt, T&&... args)
   {
-    SetDebugName(TinyString::from_vformat(fmt, fmt::make_format_args(args...)));
+    SetDebugName(TinyString::from_vformat(fmt.get(), fmt::make_format_args(args...)));
   }
 #endif
 };
@@ -778,12 +778,12 @@ public:
   template<typename... T>
   void PushDebugGroup(fmt::format_string<T...> fmt, T&&... args)
   {
-    PushDebugGroup(TinyString::from_vformat(fmt, fmt::make_format_args(args...)));
+    PushDebugGroup(TinyString::from_vformat(fmt.get(), fmt::make_format_args(args...)));
   }
   template<typename... T>
   void InsertDebugMessage(fmt::format_string<T...> fmt, T&&... args)
   {
-    InsertDebugMessage(TinyString::from_vformat(fmt, fmt::make_format_args(args...)));
+    InsertDebugMessage(TinyString::from_vformat(fmt.get(), fmt::make_format_args(args...)));
   }
 #endif
 
@@ -1004,7 +1004,7 @@ struct GLAutoPop
   GLAutoPop(fmt::format_string<T...> fmt, T&&... args)
   {
     if (g_gpu_device->IsDebugDevice()) [[unlikely]]
-      g_gpu_device->PushDebugGroup(SmallString::from_vformat(fmt, fmt::make_format_args(args...)));
+      g_gpu_device->PushDebugGroup(SmallString::from_vformat(fmt.get(), fmt::make_format_args(args...)));
   }
 
   ~GLAutoPop()

src/util/gpu_texture.h

@@ -156,7 +156,7 @@ public:
   template<typename... T>
   void SetDebugName(fmt::format_string<T...> fmt, T&&... args)
   {
-    SetDebugName(TinyString::from_vformat(fmt, fmt::make_format_args(args...)));
+    SetDebugName(TinyString::from_vformat(fmt.get(), fmt::make_format_args(args...)));
   }
 #endif
 
@@ -232,7 +232,7 @@ public:
   template<typename... T>
   void SetDebugName(fmt::format_string<T...> fmt, T&&... args)
   {
-    SetDebugName(TinyString::from_vformat(fmt, fmt::make_format_args(args...)));
+    SetDebugName(TinyString::from_vformat(fmt.get(), fmt::make_format_args(args...)));
   }
 #endif
 

src/util/postprocessing_shader_slang.cpp

@@ -499,14 +499,14 @@ std::string_view PostProcessing::StripCommentsAndWhitespace(std::string_view lin
 template<typename... T>
 inline void PostProcessing::SlangShaderPreprocessor::Write(fmt::format_string<T...> fmt, T&&... args)
 {
-  fmt::vformat_to(std::back_inserter(m_shader_code[m_current_stage]), fmt, fmt::make_format_args(args...));
+  fmt::vformat_to(std::back_inserter(m_shader_code[m_current_stage]), fmt.get(), fmt::make_format_args(args...));
 }
 
 template<typename... T>
 inline void PostProcessing::SlangShaderPreprocessor::SetError(fmt::format_string<T...> fmt, T&&... args)
 {
   std::string msg = fmt::format("{}:{}: {}", GetCurrentFilename(), m_current_line_number,
-                                fmt::vformat(fmt, fmt::make_format_args(args...)));
+                                fmt::vformat(fmt.get(), fmt::make_format_args(args...)));
   ERROR_LOG(msg);
   Error::SetString(m_error, std::move(msg));
 }