From e90c724cfdc969a52f7d587711bb7b67e437fad2 Mon Sep 17 00:00:00 2001
From: lhofhansl <larsh@apache.org>
Date: Thu, 27 Nov 2025 02:27:34 -0800
Subject: [PATCH] Use emplace instead of insert where applicable (#16699)

---
 src/client/clientmedia.cpp | 6 +++---
 src/client/minimap.cpp     | 2 +-
 src/emerge.cpp             | 2 +-
 src/itemdef.cpp            | 8 ++++----
 src/util/areastore.cpp     | 5 ++---
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/client/clientmedia.cpp b/src/client/clientmedia.cpp
index 407b1412a9..15d23bc534 100644
--- a/src/client/clientmedia.cpp
+++ b/src/client/clientmedia.cpp
@@ -99,7 +99,7 @@ void ClientMediaDownloader::addFile(const std::string &name, const std::string &
 	filestatus->received = false;
 	filestatus->sha1 = sha1;
 	filestatus->current_remote = -1;
-	m_files.insert(std::make_pair(name, filestatus));
+	m_files.emplace(name, filestatus);
 }
 
 void ClientMediaDownloader::addRemoteServer(const std::string &baseurl)
@@ -427,9 +427,9 @@ void ClientMediaDownloader::startRemoteMediaTransfers()
 					(long)g_settings->getS32("curl_file_download_timeout"));
 				httpfetch_async(fetch_request);
 
-				m_remote_file_transfers.insert(std::make_pair(
+				m_remote_file_transfers.emplace(
 							m_httpfetch_next_id,
-							name));
+							name);
 
 				filestatus->current_remote = remote_id;
 				remote->active_count++;
diff --git a/src/client/minimap.cpp b/src/client/minimap.cpp
index 5cd7dc520b..d6d45c793a 100644
--- a/src/client/minimap.cpp
+++ b/src/client/minimap.cpp
@@ -80,7 +80,7 @@ void MinimapUpdateThread::doUpdate()
 	while (popBlockUpdate(&update)) {
 		if (update.data) {
 			// Swap two values in the map using single lookup
-			auto result = m_blocks_cache.insert(std::make_pair(update.pos, update.data));
+			auto result = m_blocks_cache.emplace(update.pos, update.data);
 			if (!result.second) {
 				delete result.first->second;
 				result.first->second = update.data;
diff --git a/src/emerge.cpp b/src/emerge.cpp
index d639153058..e98ede145c 100644
--- a/src/emerge.cpp
+++ b/src/emerge.cpp
@@ -390,7 +390,7 @@ bool EmergeManager::pushBlockEmergeData(
 		}
 	}
 
-	auto findres = m_blocks_enqueued.insert(std::make_pair(pos, BlockEmergeData()));
+	auto findres = m_blocks_enqueued.emplace(pos, BlockEmergeData());
 
 	BlockEmergeData &bedata = findres.first->second;
 	*entry_already_exists   = !findres.second;
diff --git a/src/itemdef.cpp b/src/itemdef.cpp
index 9d5a8a3258..a592076145 100644
--- a/src/itemdef.cpp
+++ b/src/itemdef.cpp
@@ -466,22 +466,22 @@ public:
 		hand_def->name.clear();
 		hand_def->wield_image = "wieldhand.png";
 		hand_def->tool_capabilities = new ToolCapabilities;
-		m_item_definitions.insert(std::make_pair("", hand_def));
+		m_item_definitions.emplace("", hand_def);
 
 		ItemDefinition* unknown_def = new ItemDefinition;
 		unknown_def->type = ITEM_NODE;
 		unknown_def->name = "unknown";
-		m_item_definitions.insert(std::make_pair("unknown", unknown_def));
+		m_item_definitions.emplace("unknown", unknown_def);
 
 		ItemDefinition* air_def = new ItemDefinition;
 		air_def->type = ITEM_NODE;
 		air_def->name = "air";
-		m_item_definitions.insert(std::make_pair("air", air_def));
+		m_item_definitions.emplace("air", air_def);
 
 		ItemDefinition* ignore_def = new ItemDefinition;
 		ignore_def->type = ITEM_NODE;
 		ignore_def->name = "ignore";
-		m_item_definitions.insert(std::make_pair("ignore", ignore_def));
+		m_item_definitions.emplace("ignore", ignore_def);
 	}
 
 	virtual void registerItem(const ItemDefinition &def)
diff --git a/src/util/areastore.cpp b/src/util/areastore.cpp
index 67bf4113a3..11cca37911 100644
--- a/src/util/areastore.cpp
+++ b/src/util/areastore.cpp
@@ -178,8 +178,7 @@ bool VectorAreaStore::insertArea(Area *a)
 {
 	if (a->id == U32_MAX)
 		a->id = getNextId();
-	std::pair<AreaMap::iterator, bool> res =
-			areas_map.insert(std::make_pair(a->id, *a));
+	auto res = areas_map.emplace(a->id, *a);
 	if (!res.second)
 		// ID is not unique
 		return false;
@@ -249,7 +248,7 @@ bool SpatialAreaStore::insertArea(Area *a)
 {
 	if (a->id == U32_MAX)
 		a->id = getNextId();
-	if (!areas_map.insert(std::make_pair(a->id, *a)).second)
+	if (!areas_map.emplace(a->id, *a).second)
 		// ID is not unique
 		return false;
 	m_tree->insertData(0, nullptr, get_spatial_region(a->minedge, a->maxedge), a->id);