deps: update fmt to latest version (#3403)

This updates `fmt` to the latest version and moves to just being a copy
of their repo to make updating easier (no editing their cmake / figuring
out which files to minimally include).

The motivation for this is now that we switched to C++ 20, there were a
ton of deprecated function usages that is going away in future compiler
versions. This gets rid of all those warnings.

.clang-format

@@ -10,7 +10,7 @@ IncludeCategories:
     Priority: 2
   - Regex: '^(<|")common.*'
     Priority: 3
-  - Regex: '^"third-party.*'
+  - Regex: '^"(third-party|fmt|curl).*'
     Priority: 4
     SortPriority: 5
   - Regex: '.*'

CMakeLists.txt

@@ -221,6 +221,10 @@ build_third_party_lib(tree-sitter tree-sitter)
 # native OS dialogs for error messages
 build_third_party_lib(libtinyfiledialogs libtinyfiledialogs)
 
+# build format library
+include_directories(third-party/fmt/include)
+build_third_party_lib(fmt fmt)
+
 # build common library
 add_subdirectory(common)
 
@@ -273,9 +277,6 @@ include(test/CMakeLists.txt)
 # build lzokay library
 build_third_party_lib(lzokay lzokay)
 
-# build format library
-build_third_party_lib(fmt fmt)
-
 build_third_party_lib(stb_image stb_image)
 build_third_party_lib(tiny_gltf tiny_gltf)
 build_third_party_lib(xdelta3 xdelta3)

common/audio/audio_formats.cpp

@@ -3,7 +3,7 @@
 #include "common/log/log.h"
 #include "common/util/BinaryWriter.h"
 
-#include "third-party/fmt/core.h"
+#include "fmt/core.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 "third-party/fmt/core.h"
+#include "fmt/core.h"
 
 #ifdef __linux
 #include <fcntl.h>

common/cross_sockets/XSocket.cpp

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

common/cross_sockets/XSocketClient.cpp

@@ -15,7 +15,7 @@
 #endif
 #include "common/repl/nrepl/ReplServer.h"
 
-#include "third-party/fmt/core.h"
+#include "fmt/core.h"
 // clang-format on
 
 XSocketClient::XSocketClient(int _tcp_port) {

common/cross_sockets/XSocketServer.cpp

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

common/dma/dma.cpp

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

common/dma/dma.h

@@ -11,7 +11,7 @@
 #include "common/common_types.h"
 #include "common/util/Assert.h"
 
-#include "third-party/fmt/core.h"
+#include "fmt/core.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 "third-party/fmt/core.h"
+#include "fmt/core.h"
 
 /*!
  * Convert a DMA chain to an array of bytes that can be directly fed to VIF.

common/dma/gs.cpp

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

common/formatter/formatter.cpp

@@ -8,7 +8,7 @@
 
 #include "tree_sitter/api.h"
 
-#include "third-party/fmt/core.h"
+#include "fmt/core.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 "third-party/fmt/core.h"
+#include "fmt/core.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 "third-party/fmt/core.h"
+#include "fmt/core.h"
 
 namespace formatter_rules {
 

common/global_profiler/GlobalProfiler.cpp

@@ -9,7 +9,7 @@
 #include "common/util/FileUtil.h"
 #include "common/common_types.h"
 
-#include "third-party/fmt/core.h"
+#include "fmt/core.h"
 #include "third-party/json.hpp"
 
 #ifdef OS_POSIX
@@ -175,7 +175,7 @@ void GlobalProfiler::dump_to_json(const std::string& path) {
       lg::debug("out of order: {} {} {} ms", event.ts / 1000.f, info.debug / 1000.f,
                 (info.debug - event.ts) / 1000000.f);
       lg::debug("  idx: {}, range {} {}", event_idx, info.lowest_at_target, info.highest_at_target);
-      lg::debug("  now: {}", m_next_idx);
+      lg::debug("  now: {}", m_next_idx.load());
     }
     info.debug = event.ts;
   }

common/goos/Interpreter.cpp

@@ -16,7 +16,7 @@
 #include "common/util/string_util.h"
 #include "common/util/unicode_util.h"
 
-#include "third-party/fmt/core.h"
+#include "fmt/core.h"
 
 namespace goos {
 Interpreter::Interpreter(const std::string& username) {

common/goos/Object.cpp

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

common/goos/ParseHelpers.cpp

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

common/goos/PrettyPrinter.cpp

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

common/goos/PrettyPrinter2.cpp

@@ -3,8 +3,8 @@
 #include "common/common_types.h"
 #include "common/util/Assert.h"
 
-#include "third-party/fmt/core.h"
+#include "fmt/core.h"
-#include "third-party/fmt/format.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 "third-party/fmt/core.h"
+#include "fmt/core.h"
 
 namespace pretty_print {
 namespace {

common/goos/Reader.cpp

@@ -16,7 +16,7 @@
 #include "common/util/FileUtil.h"
 #include "common/util/FontUtils.h"
 
-#include "third-party/fmt/core.h"
+#include "fmt/core.h"
 
 namespace goos {
 

common/goos/TextDB.cpp

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

common/log/log.cpp

@@ -5,7 +5,7 @@
 #include <cstdlib>
 #include <mutex>
 
-#include "third-party/fmt/color.h"
+#include "fmt/color.h"
 #ifdef _WIN32  // see lg::initialize
 #define NOMINMAX
 #define WIN32_LEAN_AND_MEAN

common/log/log.h

@@ -7,8 +7,8 @@
 #endif
 #include <string>
 
-#include "third-party/fmt/color.h"
+#include "fmt/color.h"
-#include "third-party/fmt/core.h"
+#include "fmt/core.h"
 
 namespace lg {
 

common/math/Vector.h

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

common/repl/config.cpp

@@ -2,7 +2,7 @@
 
 #include "common/versions/versions.h"
 
-#include "third-party/fmt/core.h"
+#include "fmt/core.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 "third-party/fmt/core.h"
+#include "fmt/core.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 "third-party/fmt/core.h"
+#include "fmt/core.h"
 
 #ifdef _WIN32
 #define NOMINMAX

common/repl/util.cpp

@@ -5,8 +5,8 @@
 #include "common/util/string_util.h"
 #include "common/versions/versions.h"
 
-#include "third-party/fmt/color.h"
+#include "fmt/color.h"
-#include "third-party/fmt/core.h"
+#include "fmt/core.h"
 #include "third-party/replxx/include/replxx.hxx"
 // TODO - expand a list of hints (ie. a hint for defun to show at a glance how to write a function,
 // or perhaps, show the docstring for the current function being used?)

common/serialization/subtitles/subtitles.cpp

@@ -5,7 +5,7 @@
 #include "common/util/FileUtil.h"
 #include "common/util/json_util.h"
 
-#include "third-party/fmt/core.h"
+#include "fmt/core.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 "third-party/fmt/core.h"
+#include "fmt/core.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 "third-party/fmt/core.h"
+#include "fmt/core.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 "third-party/fmt/core.h"
+#include "fmt/core.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 "third-party/fmt/core.h"
+#include "fmt/core.h"
 
 namespace {
 // debug prints for the reverse lookup

common/type_system/TypeSpec.cpp

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

common/type_system/TypeSystem.cpp

@@ -14,8 +14,8 @@
 #include "common/util/Assert.h"
 #include "common/util/math_util.h"
 
-#include "third-party/fmt/color.h"
+#include "fmt/color.h"
-#include "third-party/fmt/core.h"
+#include "fmt/core.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 "third-party/fmt/core.h"
+#include "fmt/core.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 "third-party/fmt/core.h"
+#include "fmt/core.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 "third-party/fmt/core.h"
+#include "fmt/core.h"
 #include "third-party/fpng/fpng.cpp"
 #include "third-party/fpng/fpng.h"
 #include "third-party/lzokay/lzokay.hpp"

common/util/FontUtils.cpp

@@ -16,8 +16,8 @@
 
 #include "common/util/Assert.h"
 
-#include "third-party/fmt/core.h"
+#include "fmt/core.h"
-#include "third-party/fmt/format.h"
+#include "fmt/format.h"
 
 const std::unordered_map<std::string, GameTextVersion> sTextVerEnumMap = {
     {"jak1-v1", GameTextVersion::JAK1_V1},

common/util/compress.cpp

@@ -5,7 +5,7 @@
 
 #include "common/util/Assert.h"
 
-#include "third-party/fmt/core.h"
+#include "fmt/core.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 "third-party/fmt/core.h"
+#include "fmt/core.h"
 
 /*!
  * Assert false if the char[] has non-null data after the null terminated string.

common/util/print_float.cpp

@@ -5,8 +5,8 @@
 #include "common/goal_constants.h"
 #include "common/util/Assert.h"
 
+#include "fmt/core.h"
 #include "third-party/dragonbox.h"
-#include "third-party/fmt/core.h"
 
 /*!
  * Convert a float to a string. The string is _always_ in this format:
@@ -219,4 +219,4 @@ bool proper_float(float value) {
   } else {
     return true;
   }
-}
+}

common/versions/versions.cpp

@@ -3,8 +3,8 @@
 #include "common/util/Assert.h"
 #include "common/versions/revision.h"
 
-#include "third-party/fmt/core.h"
+#include "fmt/core.h"
-#include "third-party/fmt/format.h"
+#include "fmt/format.h"
 
 GameVersion game_name_to_version(const std::string& name) {
   if (name == "jak1") {

decompiler/Disasm/Instruction.cpp

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

decompiler/Disasm/InstructionDecode.cpp

@@ -10,7 +10,7 @@
 
 #include "decompiler/ObjectFile/LinkedObjectFile.h"
 
-#include "third-party/fmt/core.h"
+#include "fmt/core.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 "third-party/fmt/core.h"
+#include "fmt/core.h"
 
 namespace decompiler {
 InstructionParser::InstructionParser() {

decompiler/Disasm/Register.cpp

@@ -9,7 +9,7 @@
 
 #include "common/util/Assert.h"
 
-#include "third-party/fmt/format.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 namespace Reg {

decompiler/Function/Warnings.h

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

decompiler/IR2/AtomicOp.cpp

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

decompiler/IR2/AtomicOpTypeAnalysis.cpp

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

decompiler/IR2/Form.cpp

@@ -12,7 +12,7 @@
 #include "decompiler/util/data_decompile.h"
 #include "decompiler/util/sparticle_decompile.h"
 
-#include "third-party/fmt/ranges.h"
+#include "fmt/ranges.h"
 
 namespace decompiler {
 

decompiler/IR2/IR2_common.h

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

decompiler/IR2/LabelDB.cpp

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

decompiler/ObjectFile/LinkedObjectFile.cpp

@@ -16,7 +16,7 @@
 #include "decompiler/Disasm/InstructionDecode.h"
 #include "decompiler/config.h"
 
-#include "third-party/fmt/core.h"
+#include "fmt/core.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 "third-party/fmt/core.h"
+#include "fmt/core.h"
 
 namespace decompiler {
 /*!

decompiler/VuDisasm/VuDisassembler.cpp

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

decompiler/VuDisasm/VuInstruction.cpp

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

decompiler/analysis/.clang-format

@@ -1,4 +0,0 @@
----
-BasedOnStyle: Chromium
-ColumnLimit: 100
-SortIncludes: true

decompiler/analysis/analyze_inspect_method.cpp

@@ -1,5 +1,7 @@
 #include "analyze_inspect_method.h"
+
 #include "common/log/log.h"
+
 #include "decompiler/Disasm/InstructionMatching.h"
 #include "decompiler/ObjectFile/LinkedObjectFile.h"
 

decompiler/analysis/atomic_op_builder.cpp

@@ -1,8 +1,10 @@
+#include "atomic_op_builder.h"
+
 #include <memory>
 
-#include "atomic_op_builder.h"
 #include "common/log/log.h"
 #include "common/symbols.h"
+
 #include "decompiler/Disasm/DecompilerLabel.h"
 #include "decompiler/Disasm/InstructionMatching.h"
 #include "decompiler/Function/Function.h"

decompiler/analysis/cfg_builder.cpp

@@ -4,7 +4,9 @@
  */
 
 #include "cfg_builder.h"
+
 #include "common/log/log.h"
+
 #include "decompiler/Function/Function.h"
 #include "decompiler/IR2/Form.h"
 #include "decompiler/ObjectFile/LinkedObjectFile.h"

decompiler/analysis/expression_build.cpp

@@ -1,6 +1,8 @@
 #include "expression_build.h"
+
 #include "common/goos/PrettyPrinter.h"
 #include "common/log/log.h"
+
 #include "decompiler/Function/Function.h"
 #include "decompiler/IR2/Form.h"
 #include "decompiler/IR2/FormStack.h"

decompiler/analysis/final_output.cpp

@@ -1,5 +1,7 @@
 #include "final_output.h"
+
 #include "common/goos/PrettyPrinter.h"
+
 #include "decompiler/IR2/Form.h"
 #include "decompiler/IR2/GenericElementMatcher.h"
 #include "decompiler/ObjectFile/LinkedObjectFile.h"

decompiler/analysis/find_defpartgroup.cpp

@@ -1,6 +1,8 @@
 #include "find_defpartgroup.h"
+
 #include "common/goos/PrettyPrinter.h"
 #include "common/util/BitUtils.h"
+
 #include "decompiler/IR2/Form.h"
 #include "decompiler/IR2/GenericElementMatcher.h"
 #include "decompiler/ObjectFile/LinkedObjectFile.h"

decompiler/analysis/find_defstates.cpp

@@ -1,9 +1,11 @@
 
 
 #include "find_defstates.h"
+
 #include "common/goos/PrettyPrinter.h"
 #include "common/log/log.h"
 #include "common/type_system/state.h"
+
 #include "decompiler/IR2/Form.h"
 #include "decompiler/IR2/GenericElementMatcher.h"
 #include "decompiler/ObjectFile/LinkedObjectFile.h"

decompiler/analysis/find_skelgroups.cpp

@@ -1,8 +1,10 @@
 
 
 #include "find_skelgroups.h"
+
 #include "common/goos/PrettyPrinter.h"
 #include "common/math/Vector.h"
+
 #include "decompiler/IR2/Form.h"
 #include "decompiler/IR2/GenericElementMatcher.h"
 #include "decompiler/ObjectFile/LinkedObjectFile.h"

decompiler/analysis/inline_asm_rewrite.cpp

@@ -1,6 +1,8 @@
 #include "inline_asm_rewrite.h"
+
 #include "common/goos/PrettyPrinter.h"
 #include "common/log/log.h"
+
 #include "decompiler/Function/Function.h"
 #include "decompiler/IR2/Form.h"
 #include "decompiler/IR2/FormStack.h"

decompiler/analysis/insert_lets.cpp

@@ -1,3 +1,5 @@
+#include "insert_lets.h"
+
 #include <algorithm>
 #include <array>
 #include <limits>
@@ -7,10 +9,10 @@
 #include "common/log/log.h"
 #include "common/util/Assert.h"
 #include "common/util/print_float.h"
+
 #include "decompiler/IR2/GenericElementMatcher.h"
 #include "decompiler/IR2/bitfields.h"
 #include "decompiler/util/DecompilerTypeSystem.h"
-#include "insert_lets.h"
 
 namespace decompiler {
 

decompiler/analysis/mips2c.cpp

@@ -1,10 +1,11 @@
-#include <set>
-
 #include "mips2c.h"
 
+#include <set>
+
 #include "common/log/log.h"
 #include "common/symbols.h"
 #include "common/util/print_float.h"
+
 #include "decompiler/Disasm/InstructionMatching.h"
 #include "decompiler/Function/Function.h"
 #include "decompiler/ObjectFile/LinkedObjectFile.h"

decompiler/analysis/reg_usage.cpp

@@ -1,4 +1,5 @@
 #include "reg_usage.h"
+
 #include "decompiler/Function/Function.h"
 
 namespace decompiler {

decompiler/analysis/stack_spill.cpp

@@ -1,8 +1,10 @@
+#include "stack_spill.h"
+
 #include <stdexcept>
 
 #include "decompiler/Disasm/DecompilerLabel.h"
-#include "stack_spill.h"
+
-#include "third-party/fmt/core.h"
+#include "fmt/core.h"
 
 namespace decompiler {
 

decompiler/analysis/stack_spill.h

@@ -5,6 +5,7 @@
 #include <vector>
 
 #include "common/util/Range.h"
+
 #include "decompiler/Disasm/Instruction.h"
 #include "decompiler/util/StackSpillMap.h"
 

decompiler/analysis/static_refs.cpp

@@ -1,6 +1,8 @@
 #include "static_refs.h"
+
 #include "common/goos/PrettyPrinter.h"
 #include "common/log/log.h"
+
 #include "decompiler/Function/Function.h"
 #include "decompiler/ObjectFile/LinkedObjectFile.h"
 #include "decompiler/analysis/final_output.h"

decompiler/analysis/symbol_def_map.cpp

@@ -1,7 +1,10 @@
 #include "symbol_def_map.h"
+
 #include "common/link_types.h"
 #include "common/log/log.h"
+
 #include "decompiler/ObjectFile/ObjectFileDB.h"
+
 #include "third-party/json.hpp"
 
 namespace decompiler {

decompiler/analysis/type_analysis.cpp

@@ -1,4 +1,5 @@
 #include "type_analysis.h"
+
 #include "common/log/log.h"
 
 namespace decompiler {

decompiler/analysis/type_analysis.h

@@ -5,6 +5,7 @@
 #include <vector>
 
 #include "common/type_system/TypeSpec.h"
+
 #include "decompiler/ObjectFile/LinkedObjectFile.h"
 #include "decompiler/config.h"
 #include "decompiler/util/DecompilerTypeSystem.h"

decompiler/analysis/variable_naming.cpp

@@ -1,12 +1,16 @@
+#include "variable_naming.h"
+
 #include <set>
 
+#include "reg_usage.h"
+
 #include "common/log/log.h"
+
 #include "decompiler/Function/Function.h"
 #include "decompiler/IR2/Env.h"
 #include "decompiler/util/DecompilerTypeSystem.h"
-#include "reg_usage.h"
+
-#include "third-party/fmt/core.h"
+#include "fmt/core.h"
-#include "variable_naming.h"
 
 namespace decompiler {
 

decompiler/analysis/variable_naming.h

@@ -20,12 +20,12 @@
 #include <unordered_map>
 #include <vector>
 
+#include "common/util/Assert.h"
+
 #include "decompiler/Disasm/Register.h"
 #include "decompiler/IR2/IR2_common.h"
 #include "decompiler/util/TP_Type.h"
 
-#include "common/util/Assert.h"
-
 namespace decompiler {
 
 class Function;

decompiler/config.cpp

@@ -6,7 +6,7 @@
 
 #include "decompiler/util/config_parsers.h"
 
-#include "third-party/fmt/core.h"
+#include "fmt/core.h"
 #include "third-party/json.hpp"
 
 namespace decompiler {

decompiler/data/StrFileReader.cpp

@@ -13,7 +13,7 @@
 #include "game/common/overlord_common.h"
 #include "game/common/str_rpc_types.h"
 
-#include "third-party/fmt/format.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 StrFileReader::StrFileReader(const fs::path& file_path, GameVersion version) : m_version(version) {

decompiler/data/TextureDB.cpp

@@ -3,7 +3,7 @@
 #include "common/log/log.h"
 #include "common/util/Assert.h"
 
-#include "third-party/fmt/core.h"
+#include "fmt/core.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 "third-party/fmt/core.h"
+#include "fmt/core.h"
 
 namespace decompiler {
 std::string DirTpageResult::to_source() const {

decompiler/data/game_count.cpp

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

decompiler/data/game_text.cpp

@@ -14,7 +14,7 @@
 
 #include "decompiler/ObjectFile/ObjectFileDB.h"
 
-#include "third-party/fmt/core.h"
+#include "fmt/core.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 "third-party/fmt/core.h"
+#include "fmt/core.h"
 #include "third-party/json.hpp"
 
 namespace decompiler {

decompiler/data/tpage.cpp

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

decompiler/level_extractor/MercData.cpp

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

decompiler/level_extractor/extract_actors.cpp

@@ -2,7 +2,7 @@
 
 #include "common/goos/PrettyPrinter2.h"
 
-#include "third-party/fmt/core.h"
+#include "fmt/core.h"
 #include "third-party/json.hpp"
 
 namespace decompiler {
@@ -146,4 +146,4 @@ std::string extract_actors_to_json(const level_tools::DrawableInlineArrayActor&
   return json.dump(2);
 }
 
-}  // namespace decompiler
+}  // namespace decompiler

decompiler/util/DataParser.cpp

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

decompiler/util/Error.h

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

decompiler/util/TP_Type.cpp

@@ -1,6 +1,6 @@
 #include "TP_Type.h"
 
-#include "third-party/fmt/core.h"
+#include "fmt/core.h"
 
 namespace decompiler {
 u32 regs_to_gpr_mask(const std::vector<Register>& regs) {
@@ -231,4 +231,4 @@ TypeSpec TP_Type::typespec() const {
       return {};
   }
 }
-}  // namespace decompiler
+}  // namespace decompiler

decompiler/util/data_decompile.cpp

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

decompiler/util/sparticle_decompile.cpp

@@ -6,7 +6,7 @@
 
 #include "decompiler/util/data_decompile.h"
 
-#include "third-party/fmt/format.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 // sparticle fields.

game/graphics/opengl_renderer/BucketRenderer.cpp

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

game/graphics/opengl_renderer/DepthCue.cpp

@@ -2,7 +2,7 @@
 
 #include "game/graphics/opengl_renderer/dma_helpers.h"
 
-#include "third-party/fmt/core.h"
+#include "fmt/core.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 "third-party/fmt/core.h"
+#include "fmt/core.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 "third-party/fmt/core.h"
+#include "fmt/core.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 "third-party/fmt/core.h"
+#include "fmt/core.h"
 #include "third-party/imgui/imgui.h"
 
 TextureUploadHandler::TextureUploadHandler(const std::string& name,