From 2db3a20ff9d431b30056a5f58143761a9e2dd757 Mon Sep 17 00:00:00 2001
From: Franco <francomaro@gmail.com>
Date: Mon, 18 Sep 2023 02:33:23 -0300
Subject: [PATCH] Minor fixes to some 'for' and 'includes'.

---
 src/common/host_memory.cpp                              | 6 +++---
 src/core/arm/dynarmic/arm_dynarmic_32.h                 | 2 +-
 src/core/hle/service/nvdrv/core/nvmap.h                 | 5 ++---
 src/tests/common/fibers.cpp                             | 2 +-
 src/tests/video_core/memory_tracker.cpp                 | 2 +-
 src/video_core/macro/macro_hle.h                        | 6 ++----
 src/video_core/renderer_vulkan/vk_render_pass_cache.cpp | 2 +-
 src/video_core/texture_cache/texture_cache.h            | 5 ++---
 8 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/common/host_memory.cpp b/src/common/host_memory.cpp
index d46677d15b..e1b6f4abbc 100644
--- a/src/common/host_memory.cpp
+++ b/src/common/host_memory.cpp
@@ -4,8 +4,8 @@
 #ifdef _WIN32
 
 #include <iterator>
-#include <tsl/robin_map.h>
 #include <boost/icl/separate_interval_set.hpp>
+#include <tsl/robin_map.h>
 
 #include <windows.h>
 #include "common/dynamic_library.h"
@@ -347,8 +347,8 @@ private:
     PFN_MapViewOfFile3 pfn_MapViewOfFile3{};
     PFN_UnmapViewOfFile2 pfn_UnmapViewOfFile2{};
 
-    std::mutex placeholder_mutex;                                 ///< Mutex for placeholders
-    boost::icl::separate_interval_set<size_t> placeholders;       ///< Mapped placeholders
+    std::mutex placeholder_mutex;                             ///< Mutex for placeholders
+    boost::icl::separate_interval_set<size_t> placeholders;   ///< Mapped placeholders
     tsl::robin_map<size_t, size_t> placeholder_host_pointers; ///< Placeholder backing offset
 };
 
diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.h b/src/core/arm/dynarmic/arm_dynarmic_32.h
index 322ab28535..7f8bdc1e08 100644
--- a/src/core/arm/dynarmic/arm_dynarmic_32.h
+++ b/src/core/arm/dynarmic/arm_dynarmic_32.h
@@ -6,9 +6,9 @@
 #include <atomic>
 #include <memory>
 
-#include <tsl/robin_map.h>
 #include <dynarmic/interface/A32/a32.h>
 #include <dynarmic/interface/A64/a64.h>
+#include <tsl/robin_map.h>
 #include "common/common_types.h"
 #include "common/hash.h"
 #include "core/arm/arm_interface.h"
diff --git a/src/core/hle/service/nvdrv/core/nvmap.h b/src/core/hle/service/nvdrv/core/nvmap.h
index ad77feedae..437d4f6249 100644
--- a/src/core/hle/service/nvdrv/core/nvmap.h
+++ b/src/core/hle/service/nvdrv/core/nvmap.h
@@ -150,9 +150,8 @@ private:
     std::list<std::shared_ptr<Handle>> unmap_queue{};
     std::mutex unmap_queue_lock{}; //!< Protects access to `unmap_queue`
 
-    tsl::robin_map<Handle::Id, std::shared_ptr<Handle>>
-        handles{};           //!< Main owning map of handles
-    std::mutex handles_lock; //!< Protects access to `handles`
+    tsl::robin_map<Handle::Id, std::shared_ptr<Handle>> handles{}; //!< Main owning map of handles
+    std::mutex handles_lock;                                       //!< Protects access to `handles`
 
     static constexpr u32 HandleIdIncrement{
         4}; //!< Each new handle ID is an increment of 4 from the previous
diff --git a/src/tests/common/fibers.cpp b/src/tests/common/fibers.cpp
index d01d8d6727..7c9be11a3f 100644
--- a/src/tests/common/fibers.cpp
+++ b/src/tests/common/fibers.cpp
@@ -10,9 +10,9 @@
 #include <thread>
 #include <vector>
 
-#include <tsl/robin_map.h>
 #include <catch2/catch_test_macros.hpp>
 
+#include <tsl/robin_map.h>
 #include "common/common_types.h"
 #include "common/fiber.h"
 
diff --git a/src/tests/video_core/memory_tracker.cpp b/src/tests/video_core/memory_tracker.cpp
index 1d8b3da227..f0ed07a686 100644
--- a/src/tests/video_core/memory_tracker.cpp
+++ b/src/tests/video_core/memory_tracker.cpp
@@ -4,8 +4,8 @@
 #include <memory>
 #include <stdexcept>
 
-#include <tsl/robin_map.h>
 #include <catch2/catch_test_macros.hpp>
+#include <tsl/robin_map.h>
 
 #include "common/alignment.h"
 #include "common/common_types.h"
diff --git a/src/video_core/macro/macro_hle.h b/src/video_core/macro/macro_hle.h
index f2100f8e3c..0597a0a0ac 100644
--- a/src/video_core/macro/macro_hle.h
+++ b/src/video_core/macro/macro_hle.h
@@ -5,7 +5,6 @@
 
 #include <functional>
 #include <memory>
-#include <unordered_map>
 #include <tsl/robin_map.h>
 
 #include "common/common_types.h"
@@ -27,8 +26,7 @@ public:
 
 private:
     Engines::Maxwell3D& maxwell3d;
-    tsl::robin_map<u64, std::function<std::unique_ptr<CachedMacro>(Engines::Maxwell3D&)>>
-        builders;
-};
+        tsl::robin_map<u64, std::function<std::unique_ptr<CachedMacro>(Engines::Maxwell3D&)>> builders;
+ };
 
 } // namespace Tegra
diff --git a/src/video_core/renderer_vulkan/vk_render_pass_cache.cpp b/src/video_core/renderer_vulkan/vk_render_pass_cache.cpp
index e6dbc3bf13..0e41617248 100644
--- a/src/video_core/renderer_vulkan/vk_render_pass_cache.cpp
+++ b/src/video_core/renderer_vulkan/vk_render_pass_cache.cpp
@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include <tsl/robin_map.h>
 #include <boost/container/static_vector.hpp>
+#include <tsl/robin_map.h>
 
 #include "video_core/renderer_vulkan/maxwell_to_vk.h"
 #include "video_core/renderer_vulkan/vk_render_pass_cache.h"
diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h
index d20a4436a0..61e95f4b6b 100644
--- a/src/video_core/texture_cache/texture_cache.h
+++ b/src/video_core/texture_cache/texture_cache.h
@@ -1982,9 +1982,8 @@ void TextureCache<P>::UnregisterImage(ImageId image_id) {
     image.flags &= ~ImageFlagBits::BadOverlap;
     lru_cache.Free(image.lru_index);
     const auto& clear_page_table =
-        [image_id](u64 page,
-                   tsl::robin_map<u64, std::vector<ImageId>, Common::IdentityHash<u64>>&
-                       selected_page_table) {
+        [image_id](u64 page, tsl::robin_map<u64, std::vector<ImageId>, Common::IdentityHash<u64>>&
+                                 selected_page_table) {
             const auto page_it = selected_page_table.find(page);
             if (page_it == selected_page_table.end()) {
                 ASSERT_MSG(false, "Unregistering unregistered page=0x{:x}", page << YUZU_PAGEBITS);