diff options
| author | Martin Ridgers <[email protected]> | 2022-01-10 12:07:03 +0100 |
|---|---|---|
| committer | Martin Ridgers <[email protected]> | 2022-01-10 13:22:28 +0100 |
| commit | 9086231f3923c0df6d9ef817441bfae5e134e8ff (patch) | |
| tree | 739a41ca51910d9319cb6c04af435bf9b4c6d5cd /zenserver/cache/structuredcachestore.cpp | |
| parent | Vcpkg's manifest mode is no longer in use (diff) | |
| download | zen-9086231f3923c0df6d9ef817441bfae5e134e8ff.tar.xz zen-9086231f3923c0df6d9ef817441bfae5e134e8ff.zip | |
Converted use of _format UDL to fmt::format
Diffstat (limited to 'zenserver/cache/structuredcachestore.cpp')
| -rw-r--r-- | zenserver/cache/structuredcachestore.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
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(); |