Converted use of _format UDL to fmt::format

3 files changed, 10 insertions, 19 deletions

diff --git a/zenserver/cache/cachetracking.cpp b/zenserver/cache/cachetracking.cpp
index ae132f37f..9119e3122 100644
--- a/zenserver/cache/cachetracking.cpp
+++ b/zenserver/cache/cachetracking.cpp
@@ -26,8 +26,6 @@ ZEN_THIRD_PARTY_INCLUDES_END
 
 namespace zen {
 
-using namespace fmt::literals;
-
 namespace rocksdb = ROCKSDB_NAMESPACE;
 
 static constinit auto Epoch = std::chrono::time_point<std::chrono::system_clock>{};
@@ -180,14 +178,14 @@ struct ZenCacheTracker::Impl
 		}
 		else
 		{
-			throw std::runtime_error("column family iteration failed for '{}': '{}'"_format(RocksdbPath, Status.getState()).c_str());
+			throw std::runtime_error(fmt::format("column family iteration failed for '{}': '{}'", RocksdbPath, Status.getState()).c_str());
 		}
 
 		Status = rocksdb::DB::Open(Options, RocksdbPath, ColumnDescriptors, &m_RocksDbColumnHandles, &Db);
 
 		if (!Status.ok())
 		{
-			throw std::runtime_error("database open failed for '{}': '{}'"_format(RocksdbPath, Status.getState()).c_str());
+			throw std::runtime_error(fmt::format("database open failed for '{}': '{}'", RocksdbPath, Status.getState()).c_str());
 		}
 
 		m_RocksDb.reset(Db);
@@ -297,7 +295,6 @@ ZenCacheTracker::IterateSnapshots(std::function<void(uint64_t TimeStamp, CbObjec
 
 TEST_CASE("z$.tracker")
 {
-	using namespace fmt::literals;
 	using namespace std::literals;
 
 	const uint64_t t0 = GetCurrentCacheTimeStamp();
diff --git a/zenserver/cache/structuredcache.cpp b/zenserver/cache/structuredcache.cpp
index 1d43d372b..3bcc3be87 100644
--- a/zenserver/cache/structuredcache.cpp
+++ b/zenserver/cache/structuredcache.cpp
@@ -813,8 +813,6 @@ HttpStructuredCacheService::HandleRpcGetCacheRecords(zen::HttpServerRequest& Req
 {
 	ZEN_TRACE_CPU("Z$::RpcGetCacheRecords");
 
-	using namespace fmt::literals;
-
 	CbPackage			  RpcResponse;
 	CacheRecordPolicy	  Policy;
 	CbObjectView		  Params = RpcRequest["Params"sv].AsObjectView();
@@ -1011,8 +1009,6 @@ HttpStructuredCacheService::HandleRpcGetCachePayloads(zen::HttpServerRequest& Re
 {
 	ZEN_TRACE_CPU("Z$::RpcGetCachePayloads");
 
-	using namespace fmt::literals;
-
 	ZEN_ASSERT(RpcRequest["Method"sv].AsString() == "GetCachePayloads"sv);
 
 	std::vector<CacheChunkRequest> ChunkRequests;
diff --git a/zenserver/cache/structuredcachestore.cpp b/zenserver/cache/structuredcachestore.cpp
index e74becb3a..4dd2f4264 100644
--- a/zenserver/cache/structuredcachestore.cpp
+++ b/zenserver/cache/structuredcachestore.cpp
@@ -38,7 +38,6 @@ ZEN_THIRD_PARTY_INCLUDES_END
 
 namespace zen {
 
-using namespace fmt::literals;
 namespace fs = std::filesystem;
 
 static CbObject
@@ -1066,14 +1065,14 @@ ZenCacheDiskLayer::CacheBucket::PutStandaloneCacheValue(const IoHash& HashKey, c
 
 	if (Ec)
 	{
-		throw std::system_error(Ec, "Failed to open temporary file for put at '{}'"_format(m_BucketDir));
+		throw std::system_error(Ec, fmt::format("Failed to open temporary file for put at '{}'", m_BucketDir));
 	}
 
 	DataFile.WriteAll(Value.Value, Ec);
 
 	if (Ec)
 	{
-		throw std::system_error(Ec, "Failed to write payload ({} bytes) to file"_format(NiceBytes(Value.Value.Size())));
+		throw std::system_error(Ec, fmt::format("Failed to write payload ({} bytes) to file", NiceBytes(Value.Value.Size())));
 	}
 
 	// Move file into place (atomically)
@@ -1113,7 +1112,7 @@ ZenCacheDiskLayer::CacheBucket::PutStandaloneCacheValue(const IoHash& HashKey, c
 
 		if (Ec)
 		{
-			throw std::system_error(Ec, "Failed to finalize file '{}'"_format(DataFilePath.ToUtf8()));
+			throw std::system_error(Ec, fmt::format("Failed to finalize file '{}'", DataFilePath.ToUtf8()));
 		}
 	}
 
@@ -1396,7 +1395,6 @@ ZenCacheDiskLayer::TotalSize() const
 #if ZEN_WITH_TESTS
 
 using namespace std::literals;
-using namespace fmt::literals;
 
 namespace testutils {
 	IoHash CreateKey(size_t KeyValue) { return IoHash::HashBuffer(&KeyValue, sizeof(size_t)); }
@@ -1483,7 +1481,7 @@ TEST_CASE("z$.size")
 			for (size_t Key = 0; Key < Count; ++Key)
 			{
 				const size_t Bucket = Key % 4;
-				Zcs.Put("test_bucket-{}"_format(Bucket), IoHash::HashBuffer(&Key, sizeof(uint32_t)), {.Value = Buffer});
+				Zcs.Put(fmt::format("test_bucket-{}", Bucket), IoHash::HashBuffer(&Key, sizeof(uint32_t)), {.Value = Buffer});
 			}
 
 			CacheSize = Zcs.StorageSize();
@@ -1501,7 +1499,7 @@ TEST_CASE("z$.size")
 
 			for (size_t Bucket = 0; Bucket < 4; ++Bucket)
 			{
-				Zcs.DropBucket("test_bucket-{}"_format(Bucket));
+				Zcs.DropBucket(fmt::format("test_bucket-{}", Bucket));
 			}
 			CHECK_EQ(0, Zcs.StorageSize().DiskSize);
 		}
@@ -1526,7 +1524,7 @@ TEST_CASE("z$.size")
 			for (size_t Key = 0; Key < Count; ++Key)
 			{
 				const size_t Bucket = Key % 4;
-				Zcs.Put("test_bucket-{}"_format(Bucket), IoHash::HashBuffer(&Key, sizeof(uint32_t)), {.Value = Buffer});
+				Zcs.Put(fmt::format("test_bucket-{}", Bucket), IoHash::HashBuffer(&Key, sizeof(uint32_t)), {.Value = Buffer});
 			}
 
 			CacheSize = Zcs.StorageSize();
@@ -1544,7 +1542,7 @@ TEST_CASE("z$.size")
 
 			for (size_t Bucket = 0; Bucket < 4; ++Bucket)
 			{
-				Zcs.DropBucket("test_bucket-{}"_format(Bucket));
+				Zcs.DropBucket(fmt::format("test_bucket-{}", Bucket));
 			}
 			CHECK_EQ(0, Zcs.StorageSize().DiskSize);
 		}
@@ -1585,7 +1583,7 @@ TEST_CASE("z$.gc")
 
 			for (size_t Idx = 0; auto& Cid : Cids)
 			{
-				Record.AddBinaryAttachment("attachment-{}"_format(Idx++), Cid);
+				Record.AddBinaryAttachment(fmt::format("attachment-{}", Idx++), Cid);
 			}
 
 			IoBuffer Buffer = Record.Save().GetBuffer().AsIoBuffer();