deps: update `fmt` to `11.1.4` (#3880)

Fixes #3886

common/audio/audio_formats.cpp

@@ -3,7 +3,7 @@
 #include "common/log/log.h"
 #include "common/util/BinaryWriter.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 /*!
  * Write a wave file from a vector of samples.

common/cross_os_debug/xdbg.cpp

@@ -11,7 +11,7 @@
 #include "common/goal_constants.h"
 #include "common/util/Timer.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 #ifdef __linux
 #include <fcntl.h>

common/cross_sockets/XSocket.cpp

@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "common/log/log.h"
 // clang-format on
 

common/cross_sockets/XSocketClient.cpp

@@ -5,7 +5,7 @@
 #include "common/cross_sockets/XSocket.h"
 #include "common/log/log.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 // clang-format off
 #ifdef _WIN32

common/cross_sockets/XSocketServer.cpp

@@ -4,7 +4,7 @@
 #include "common/cross_sockets/XSocket.h"
 #include "common/common_types.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 #ifdef _WIN32
 #define NOMINMAX

common/dma/dma.cpp

@@ -2,7 +2,7 @@
 
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 std::string DmaTag::print() const {
   std::string result;

common/dma/dma.h

@@ -11,7 +11,7 @@
 #include "common/common_types.h"
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 struct DmaStats {
   double sync_time_ms = 0;

common/dma/dma_copy.cpp

@@ -6,7 +6,7 @@
 #include "common/log/log.h"
 #include "common/util/Timer.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 /*!
  * Convert a DMA chain to an array of bytes that can be directly fed to VIF.

common/dma/gs.cpp

@@ -2,7 +2,6 @@
 
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
 #include "fmt/format.h"
 
 std::string reg_descriptor_name(GifTag::RegisterDescriptor reg) {

common/formatter/formatter.cpp

@@ -6,12 +6,12 @@
 #include "common/formatter/rules/rule_config.h"
 #include "common/log/log.h"
 #include "common/util/FileUtil.h"
-#include "common/util/ast_util.h"
 #include "common/util/string_util.h"
 
 #include "tree_sitter/api.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
+#include "fmt/ranges.h"
 
 // Declare the `tree_sitter_opengoal` function, which is
 // implemented by the `tree-sitter-opengoal` library.

common/formatter/formatter_tree.cpp

@@ -2,7 +2,7 @@
 
 #include "common/util/string_util.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 std::string get_source_code(const std::string& source, const TSNode& node) {
   uint32_t start = ts_node_start_byte(node);

common/formatter/rules/formatting_rules.cpp

@@ -4,7 +4,7 @@
 
 #include "common/util/string_util.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace formatter_rules {
 

common/global_profiler/GlobalProfiler.cpp

@@ -9,7 +9,7 @@
 #include "common/util/FileUtil.h"
 #include "common/common_types.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/json.hpp"
 
 #ifdef OS_POSIX

common/goos/Interpreter.cpp

@@ -16,7 +16,9 @@
 #include "common/util/string_util.h"
 #include "common/util/unicode_util.h"
 
-#include "fmt/core.h"
+#include "fmt/args.h"
+#include "fmt/base.h"
+#include "fmt/format.h"
 
 namespace goos {
 Interpreter::Interpreter(const std::string& username) {
@@ -1769,26 +1771,16 @@ Object Interpreter::eval_format(const Object& form,
     throw_eval_error(form, "format string must be a string");
   }
 
-  // Note: this might be relying on internal implementation details of libfmt to work properly
-  // and isn't a great solution.
-  std::vector<fmt::basic_format_arg<fmt::format_context>> args2;
-  std::vector<std::string> strings;
+  fmt::dynamic_format_arg_store<fmt::format_context> arg_store;
   for (size_t i = 2; i < args.unnamed.size(); i++) {
     if (args.unnamed.at(i).is_string()) {
-      strings.push_back(args.unnamed.at(i).as_string()->data);
+      arg_store.push_back(args.unnamed.at(i).as_string()->data);
     } else {
-      strings.push_back(args.unnamed.at(i).print());
+      arg_store.push_back(args.unnamed.at(i).print());
     }
   }
 
-  for (auto& x : strings) {
-    args2.push_back(fmt::detail::make_arg<fmt::format_context>(x));
-  }
-
-  auto formatted =
-      fmt::vformat(format_str.as_string()->data,
-                   fmt::format_args(args2.data(), static_cast<unsigned>(args2.size())));
-
+  auto formatted = fmt::vformat(format_str.as_string()->data, arg_store);
   if (truthy(dest)) {
     lg::print("{}", formatted.c_str());
   }

common/goos/Object.cpp

@@ -47,7 +47,7 @@
 #include "common/util/crc32.h"
 #include "common/util/print_float.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace goos {
 

common/goos/Object.h

@@ -57,7 +57,7 @@
 #include "common/util/Assert.h"
 #include "common/util/crc32.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace goos {
 

common/goos/ParseHelpers.cpp

@@ -1,6 +1,6 @@
 #include "ParseHelpers.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace goos {
 

common/goos/PrettyPrinter.cpp

@@ -15,7 +15,7 @@
 #include "common/goos/PrettyPrinter2.h"
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace pretty_print {
 

common/goos/PrettyPrinter2.cpp

@@ -3,7 +3,6 @@
 #include "common/common_types.h"
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
 #include "fmt/format.h"
 
 namespace pretty_print {

common/goos/Printer.cpp

@@ -6,7 +6,7 @@
 #include "common/goos/Object.h"
 #include "common/util/print_float.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace pretty_print {
 namespace {

common/goos/Reader.cpp

@@ -15,7 +15,8 @@
 #include "common/util/FileUtil.h"
 #include "common/util/FontUtils.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
+#include "fmt/ranges.h"
 
 namespace goos {
 

common/goos/TextDB.cpp

@@ -15,7 +15,7 @@
 
 #include "common/util/FileUtil.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace goos {
 

common/log/log.h

@@ -8,7 +8,7 @@
 #include <string>
 
 #include "fmt/color.h"
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace lg {
 
@@ -72,7 +72,7 @@ void print(const std::string& format, Args&&... args) {
 }
 template <typename... Args>
 void print(const fmt::text_style& ts, const std::string& format, Args&&... args) {
-  std::string formatted_message = fmt::format(ts, format, std::forward<Args>(args)...);
+  std::string formatted_message = fmt::vformat(ts, format, fmt::make_format_args(args...));
   internal::log_print(formatted_message.c_str());
 }
 

common/math/Vector.h

@@ -2,7 +2,7 @@
 
 #include <cmath>
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace math {
 

common/repl/config.cpp

@@ -2,7 +2,7 @@
 
 #include "common/versions/versions.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace REPL {
 void to_json(json& j, const Config& obj) {

common/repl/nrepl/ReplClient.cpp

@@ -4,7 +4,7 @@
 #include "common/cross_sockets/XSocket.h"
 #include "common/versions/versions.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 #ifdef _WIN32
 #define NOMINMAX

common/repl/nrepl/ReplServer.cpp

@@ -4,7 +4,7 @@
 #include "common/cross_sockets/XSocket.h"
 #include "common/versions/versions.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 #ifdef _WIN32
 #define NOMINMAX

common/repl/repl_wrapper.cpp

@@ -6,7 +6,8 @@
 #include "common/versions/versions.h"
 
 #include "fmt/color.h"
-#include "fmt/core.h"
+#include "fmt/format.h"
+#include "fmt/ranges.h"
 #include "third-party/replxx/include/replxx.hxx"
 
 namespace REPL {
@@ -41,7 +42,7 @@ void Wrapper::print_welcome_message(const std::vector<std::string>& loaded_proje
   message += fmt::format(fmt::emphasis::bold | fg(fmt::color::orange), "  .        ---        .");
   message +=
       fmt::format("  Project Path: {}\n",
-                  fmt::format(fg(fmt::color::gray), file_util::get_jak_project_dir().string()));
+                  fmt::styled(file_util::get_jak_project_dir().string(), fg(fmt::color::gray)));
   message += fmt::format(fmt::emphasis::bold | fg(fmt::color::orange), "  -       :===:       -");
   std::string effective_iso_path;
   if (repl_config.iso_path.empty()) {
@@ -50,7 +51,7 @@ void Wrapper::print_welcome_message(const std::vector<std::string>& loaded_proje
     effective_iso_path = repl_config.iso_path;
   }
   message +=
-      fmt::format("  ISO Data Path: {}\n", fmt::format(fg(fmt::color::gray), effective_iso_path));
+      fmt::format("  ISO Data Path: {}\n", fmt::styled(effective_iso_path, fg(fmt::color::gray)));
   message += fmt::format(fmt::emphasis::bold | fg(fmt::color::orange), "  --.   .--: :--.   .--");
   message += "  nREPL:";
   if (!nrepl_alive) {
@@ -63,7 +64,7 @@ void Wrapper::print_welcome_message(const std::vector<std::string>& loaded_proje
   message += "  Source File Search Dirs: ";
   const auto search_dir_string =
       fmt::format("{}", fmt::join(repl_config.asm_file_search_dirs, ","));
-  message += fmt::format("[{}]\n", fmt::format(fg(fmt::color::gray), search_dir_string));
+  message += fmt::format("[{}]\n", fmt::styled(search_dir_string, fg(fmt::color::gray)));
   message += fmt::format(fmt::emphasis::bold | fg(fmt::color::orange), "   .-=====-. .-=====-");
   message += fmt::format("    {} or {} for basic help and usage\n",
                          fmt::format(fg(fmt::color::cyan), "(repl-help)"),

common/serialization/subtitles/subtitles.cpp

@@ -5,7 +5,7 @@
 #include "common/util/FileUtil.h"
 #include "common/util/json_util.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 void open_subtitle_project(const std::string& project_kind,
                            const std::string& file_path,

common/serialization/subtitles/subtitles_v1.cpp

@@ -5,7 +5,7 @@
 
 #include "subtitles_v2.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 void to_json(json& j, const SubtitleCutsceneLineMetadataV1& obj) {
   json_serialize(frame_start);

common/serialization/subtitles/subtitles_v2.cpp

@@ -5,7 +5,7 @@
 
 #include "subtitles_v1.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 void to_json(json& j, const SubtitleLineMetadata& obj) {
   json_serialize(frame_start);

common/type_system/Type.cpp

@@ -10,7 +10,7 @@
 #include "common/log/log.h"
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace {
 std::string reg_kind_to_string(RegClass kind) {

common/type_system/TypeFieldLookup.cpp

@@ -9,7 +9,7 @@
 
 #include "common/log/log.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace {
 // debug prints for the reverse lookup

common/type_system/TypeSpec.cpp

@@ -7,7 +7,7 @@
 
 #include <stdexcept>
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 bool TypeTag::operator==(const TypeTag& other) const {
   return name == other.name && value == other.value;

common/type_system/TypeSystem.cpp

@@ -15,7 +15,7 @@
 #include "common/util/math_util.h"
 
 #include "fmt/color.h"
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace {
 template <typename... Args>

common/type_system/defenum.cpp

@@ -13,7 +13,7 @@
 #include "common/util/BitUtils.h"
 #include "common/util/string_util.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace {
 const goos::Object& car(const goos::Object* x) {

common/type_system/deftype.cpp

@@ -13,7 +13,7 @@
 #include "common/type_system/state.h"
 #include "common/util/string_util.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 /*!
  * Missing Features

common/util/FileUtil.cpp

@@ -22,7 +22,7 @@
 // This disables the use of PCLMULQDQ which is probably ok, but let's just be safe and disable it
 // because nobody will care if png compression is 10% slower.
 #define FPNG_NO_SSE 1
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/fpng/fpng.cpp"
 #include "third-party/fpng/fpng.h"
 #include "third-party/lzokay/lzokay.hpp"

common/util/FontUtils.cpp

@@ -16,7 +16,6 @@
 
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
 #include "fmt/format.h"
 
 const std::unordered_map<std::string, GameTextVersion> sTextVerEnumMap = {

common/util/compress.cpp

@@ -5,7 +5,7 @@
 
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/zstd/lib/zstd.h"
 
 namespace compression {

common/util/dgo_util.cpp

@@ -5,7 +5,7 @@
 #include "common/util/Assert.h"
 #include "common/versions/versions.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 /*!
  * Assert false if the char[] has non-null data after the null terminated string.

common/util/print_float.cpp

@@ -5,7 +5,7 @@
 #include "common/goal_constants.h"
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/dragonbox.h"
 
 /*!

common/versions/versions.cpp

@@ -3,7 +3,6 @@
 #include "common/util/Assert.h"
 #include "common/versions/revision.h"
 
-#include "fmt/core.h"
 #include "fmt/format.h"
 
 GameVersion game_name_to_version(const std::string& name) {

decompiler/Disasm/Instruction.cpp

@@ -10,7 +10,7 @@
 
 #include "decompiler/ObjectFile/LinkedObjectFile.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 /*!

decompiler/Disasm/InstructionDecode.cpp

@@ -10,7 +10,7 @@
 
 #include "decompiler/ObjectFile/LinkedObjectFile.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 // utility class to extract fields of an opcode.

decompiler/Disasm/InstructionParser.cpp

@@ -7,7 +7,7 @@
 #include "common/common_types.h"
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 InstructionParser::InstructionParser() {

decompiler/Function/Warnings.h

@@ -7,7 +7,7 @@
 
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 class DecompWarnings {

decompiler/IR2/AtomicOp.cpp

@@ -12,7 +12,7 @@
 
 #include "decompiler/ObjectFile/LinkedObjectFile.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 /////////////////////////////

decompiler/IR2/AtomicOpTypeAnalysis.cpp

@@ -10,7 +10,7 @@
 #include "decompiler/util/TP_Type.h"
 #include "decompiler/util/type_utils.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 

decompiler/IR2/IR2_common.h

@@ -8,7 +8,7 @@
 #include "decompiler/Function/Warnings.h"
 #include "decompiler/util/TP_Type.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 enum class AccessMode : u8 {

decompiler/IR2/LabelDB.cpp

@@ -1,6 +1,6 @@
 #include "LabelDB.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 

decompiler/ObjectFile/LinkedObjectFile.cpp

@@ -16,7 +16,7 @@
 #include "decompiler/Disasm/InstructionDecode.h"
 #include "decompiler/config.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/json.hpp"
 
 namespace decompiler {

decompiler/ObjectFile/ObjectFileDB.h

@@ -21,7 +21,7 @@
 #include "decompiler/data/TextureDB.h"
 #include "decompiler/util/DecompilerTypeSystem.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 /*!

decompiler/VuDisasm/VuDisassembler.cpp

@@ -7,7 +7,7 @@
 #include "common/util/Assert.h"
 #include "common/util/print_float.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 

decompiler/VuDisasm/VuInstruction.cpp

@@ -2,7 +2,7 @@
 
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 VuInstructionAtom VuInstructionAtom::make_vf(int idx) {

decompiler/analysis/stack_spill.cpp

@@ -4,7 +4,7 @@
 
 #include "decompiler/Disasm/DecompilerLabel.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 

decompiler/analysis/variable_naming.cpp

@@ -10,7 +10,7 @@
 #include "decompiler/IR2/Env.h"
 #include "decompiler/util/DecompilerTypeSystem.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 

decompiler/config.cpp

@@ -6,7 +6,7 @@
 
 #include "decompiler/util/config_parsers.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 

decompiler/data/TextureDB.cpp

@@ -3,7 +3,7 @@
 #include "common/log/log.h"
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #define STBI_WINDOWS_UTF8
 #include "third-party/stb_image/stb_image.h"
 

decompiler/data/dir_tpages.cpp

@@ -2,7 +2,7 @@
 
 #include "decompiler/ObjectFile/ObjectFileDB.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 std::string DirTpageResult::to_source() const {

decompiler/data/game_count.cpp

@@ -4,7 +4,7 @@
 
 #include "decompiler/ObjectFile/ObjectFileDB.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 GameCountResult process_game_count(ObjectFileData& data) {

decompiler/data/game_text.cpp

@@ -14,7 +14,7 @@
 
 #include "decompiler/ObjectFile/ObjectFileDB.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 namespace {

decompiler/data/streamed_audio.cpp

@@ -7,7 +7,7 @@
 #include "common/util/FileUtil.h"
 #include "common/util/string_util.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/json.hpp"
 
 namespace decompiler {

decompiler/data/tpage.cpp

@@ -23,7 +23,7 @@
 
 #include "decompiler/ObjectFile/ObjectFileDB.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 namespace {

decompiler/level_extractor/MercData.cpp

@@ -6,7 +6,7 @@
 #include "decompiler/ObjectFile/LinkedObjectFile.h"
 #include "decompiler/util/DecompilerTypeSystem.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 

decompiler/level_extractor/extract_actors.cpp

@@ -2,7 +2,7 @@
 
 #include "common/goos/PrettyPrinter2.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/json.hpp"
 
 namespace decompiler {

decompiler/util/DataParser.cpp

@@ -5,7 +5,7 @@
 
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 /*
  * Allowable lines:

decompiler/util/Error.h

@@ -2,7 +2,7 @@
 
 #include <stdexcept>
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 class Error : public std::runtime_error {
  public:

decompiler/util/TP_Type.cpp

@@ -1,6 +1,6 @@
 #include "TP_Type.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 u32 regs_to_gpr_mask(const std::vector<Register>& regs) {

decompiler/util/data_decompile.cpp

@@ -13,7 +13,7 @@
 #include "decompiler/ObjectFile/LinkedObjectFile.h"
 #include "decompiler/analysis/final_output.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 

game/graphics/opengl_renderer/BucketRenderer.cpp

@@ -1,6 +1,6 @@
 #include "BucketRenderer.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/imgui/imgui.h"
 
 std::string BucketRenderer::name() const {

game/graphics/opengl_renderer/DepthCue.cpp

@@ -2,7 +2,7 @@
 
 #include "game/graphics/opengl_renderer/dma_helpers.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/imgui/imgui.h"
 
 namespace {

game/graphics/opengl_renderer/DirectRenderer.cpp

@@ -6,7 +6,7 @@
 
 #include "game/graphics/pipelines/opengl.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/imgui/imgui.h"
 
 DirectRenderer::ScissorState DirectRenderer::m_scissor;

game/graphics/opengl_renderer/Profiler.cpp

@@ -5,7 +5,7 @@
 #include "common/log/log.h"
 #include "common/util/colors.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/imgui/imgui.h"
 
 ProfilerNode::ProfilerNode(const std::string& name) : m_name(name) {}

game/graphics/opengl_renderer/TextureUploadHandler.cpp

@@ -6,7 +6,7 @@
 #include "game/graphics/opengl_renderer/EyeRenderer.h"
 #include "game/graphics/pipelines/opengl.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/imgui/imgui.h"
 
 TextureUploadHandler::TextureUploadHandler(const std::string& name,

game/graphics/opengl_renderer/debug_gui.cpp

@@ -9,7 +9,7 @@
 #include "game/overlord/jak3/dma.h"
 #include "game/system/hid/sdl_util.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/imgui/imgui.h"
 #include "third-party/imgui/imgui_style.h"
 

game/graphics/opengl_renderer/sprite/Sprite3.cpp

@@ -5,7 +5,7 @@
 #include "game/graphics/opengl_renderer/background/background_common.h"
 #include "game/graphics/opengl_renderer/dma_helpers.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/imgui/imgui.h"
 
 namespace {

game/graphics/pipelines/opengl.cpp

@@ -30,7 +30,7 @@
 #include "game/system/hid/input_manager.h"
 #include "game/system/hid/sdl_util.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/SDL/include/SDL3/SDL.h"
 #include "third-party/SDL/include/SDL3/SDL_hints.h"
 #include "third-party/SDL/include/SDL3/SDL_version.h"

game/graphics/texture/TextureConverter.cpp

@@ -4,7 +4,7 @@
 #include "common/util/Assert.h"
 #include "common/util/FileUtil.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 TextureConverter::TextureConverter() {
   m_vram.resize(4 * 1024 * 1024);

game/graphics/texture/TexturePool.cpp

@@ -12,7 +12,7 @@
 #include "game/graphics/texture/jak2_tpage_dir.h"
 #include "game/graphics/texture/jak3_tpage_dir.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/imgui/imgui.h"
 
 namespace {

game/kernel/common/klink.cpp

@@ -6,7 +6,7 @@
 #include "game/kernel/common/fileio.h"
 #include "game/kernel/common/kscheme.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace {
 // turn on printf's for debugging linking issues.

game/kernel/common/kmemcard.cpp

@@ -19,7 +19,7 @@
 #include "game/sce/sif_ee.h"
 #include "game/sce/sif_ee_memcard.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 static constexpr bool memcard_debug = false;
 

game/kernel/jak1/klink.cpp

@@ -12,7 +12,7 @@
 #include "game/kernel/jak1/kscheme.h"
 #include "game/mips2c/mips2c_table.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 static constexpr bool link_debug_printfs = false;
 /*!

game/kernel/jak2/klink.cpp

@@ -13,7 +13,7 @@
 #include "game/kernel/jak2/kscheme.h"
 #include "game/mips2c/mips2c_table.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 static constexpr bool link_debug_printfs = false;
 

game/kernel/jak3/klink.cpp

@@ -12,7 +12,7 @@
 #include "game/kernel/jak3/kscheme.h"
 #include "game/mips2c/mips2c_table.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace {
 bool is_opengoal_object(void* data) {

game/mips2c/mips2c_private.h

@@ -12,7 +12,7 @@
 #include "game/common/vu.h"
 #include "game/mips2c/mips2c_table.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 // This file contains utility functions for code generated by the mips2c pass.
 // This is only useful for

game/overlord/jak1/srpc.cpp

@@ -24,7 +24,7 @@
 #include "game/sce/iop.h"
 #include "game/sound/sndshim.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/magic_enum.hpp"
 
 using namespace iop;

game/overlord/jak3/pagemanager.cpp

@@ -2,6 +2,7 @@
 
 #include <cstdlib>
 #include <cstring>
+#include <memory>
 
 #include "common/log/log.h"
 #include "common/util/Assert.h"

game/sound/989snd/loader.cpp

@@ -12,7 +12,7 @@
 
 #include "game/sound/989snd/musicbank.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace snd {
 

game/sound/989snd/midi_handler.cpp

@@ -8,7 +8,7 @@
 
 #include "game/sound/989snd/util.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace snd {
 /*

game/sound/989snd/player.cpp

@@ -6,7 +6,7 @@
 
 #include "sfxblock.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 #ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN

game/sound/sdshim.cpp

@@ -7,7 +7,7 @@
 
 #include "game/sound/common/voice.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 std::shared_ptr<snd::Voice> voices[kNVoices];
 u8 spu_memory[0x15160 * 10];

game/system/Deci2Server.cpp

@@ -12,7 +12,7 @@
 #include "common/listener_common.h"
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 #ifdef _WIN32
 #define NOMINMAX

game/system/hid/devices/game_controller.cpp

@@ -7,7 +7,7 @@
 
 #include "game/system/hid/sdl_util.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 GameController::GameController(int sdl_device_id,
                                std::shared_ptr<game_settings::InputSettings> settings)

game/system/hid/display_manager.cpp

@@ -4,7 +4,6 @@
 
 #include "common/global_profiler/GlobalProfiler.h"
 
-#include "fmt/core.h"
 #include "fmt/format.h"
 
 DisplayManager::DisplayManager(SDL_Window* window) : m_window(window) {

game/system/hid/sdl_util.cpp

@@ -2,6 +2,7 @@
 
 #include "common/log/log.h"
 
+#include "fmt/ranges.h"
 #include "third-party/SDL/include/SDL3/SDL.h"
 
 namespace sdl_util {

game/tools/filter_menu/filter_menu.cpp

@@ -2,7 +2,7 @@
 
 #include "game/graphics/gfx.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/imgui/imgui.h"
 #include "third-party/imgui/imgui_stdlib.h"
 

game/tools/subtitle_editor/subtitle_editor.cpp

@@ -10,7 +10,7 @@
 
 #include "game/runtime.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/imgui/imgui.h"
 #include "third-party/imgui/imgui_stdlib.h"
 

game/tools/subtitle_editor/subtitle_editor_db.cpp

@@ -5,7 +5,7 @@
 
 #include "game/runtime.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 void Jak1SubtitleEditorDB::update() {
   if (g_game_version != GameVersion::Jak1) {

game/tools/subtitle_editor/subtitle_editor_repl_client.cpp

@@ -4,7 +4,7 @@
 
 #include "game/runtime.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 SubtitleEditorReplClient::SubtitleEditorReplClient() {
   int port = 8181;