From: Joel Rosdahl <joel@rosdahl.net>
Date: Mon, 19 Feb 2024 19:26:12 +0000 (+0100)
Subject: chore: Rename util/fmtmacros.hpp to util/format.hpp
X-Git-Tag: v4.10~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f66b3a79d7531b33eeb50051ef993572eaa98110;p=thirdparty%2Fccache.git

chore: Rename util/fmtmacros.hpp to util/format.hpp
---

diff --git a/src/Config.cpp b/src/Config.cpp
index a244fd58..328e962d 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -33,7 +33,7 @@
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/string.hpp>
 #include <util/wincompat.hpp>
 
diff --git a/src/Hash.cpp b/src/Hash.cpp
index 235714b3..f8780efd 100644
--- a/src/Hash.cpp
+++ b/src/Hash.cpp
@@ -20,7 +20,7 @@
 
 #include <util/Fd.hpp>
 #include <util/file.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/logging.hpp>
 #include <util/string.hpp>
 #include <util/wincompat.hpp>
diff --git a/src/InodeCache.cpp b/src/InodeCache.cpp
index 229468b3..8a869b94 100644
--- a/src/InodeCache.cpp
+++ b/src/InodeCache.cpp
@@ -29,7 +29,7 @@
 #include <util/TemporaryFile.hpp>
 #include <util/conversion.hpp>
 #include <util/file.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/logging.hpp>
 
 #include <fcntl.h>
diff --git a/src/MiniTrace.cpp b/src/MiniTrace.cpp
index 8e1091bd..0850bb91 100644
--- a/src/MiniTrace.cpp
+++ b/src/MiniTrace.cpp
@@ -26,7 +26,7 @@
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/wincompat.hpp>
 
 #ifdef HAVE_UNISTD_H
diff --git a/src/ProgressBar.cpp b/src/ProgressBar.cpp
index dc55dd4e..3fa6f7e1 100644
--- a/src/ProgressBar.cpp
+++ b/src/ProgressBar.cpp
@@ -19,7 +19,7 @@
 #include "ProgressBar.hpp"
 
 #include <util/assertions.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/wincompat.hpp>
 
 #ifdef _WIN32
diff --git a/src/Util.cpp b/src/Util.cpp
index 6493df20..96deb698 100644
--- a/src/Util.cpp
+++ b/src/Util.cpp
@@ -26,7 +26,7 @@
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/logging.hpp>
 #include <util/path.hpp>
 #include <util/string.hpp>
diff --git a/src/argprocessing.cpp b/src/argprocessing.cpp
index f09885b7..3066ff37 100644
--- a/src/argprocessing.cpp
+++ b/src/argprocessing.cpp
@@ -27,7 +27,7 @@
 #include <util/PathString.hpp>
 #include <util/assertions.hpp>
 #include <util/filesystem.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/logging.hpp>
 #include <util/path.hpp>
 #include <util/string.hpp>
diff --git a/src/ccache.cpp b/src/ccache.cpp
index 0d1b1555..3bf62142 100644
--- a/src/ccache.cpp
+++ b/src/ccache.cpp
@@ -55,7 +55,7 @@
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/logging.hpp>
 #include <util/path.hpp>
 #include <util/process.hpp>
diff --git a/src/compopt.cpp b/src/compopt.cpp
index 9f1d603a..0554c6d7 100644
--- a/src/compopt.cpp
+++ b/src/compopt.cpp
@@ -18,7 +18,7 @@
 
 #include "compopt.hpp"
 
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 
 // The option it too hard to handle at all.
 int TOO_HARD = 1 << 0;
diff --git a/src/core/AtomicFile.cpp b/src/core/AtomicFile.cpp
index 9efffa9a..e508ec28 100644
--- a/src/core/AtomicFile.cpp
+++ b/src/core/AtomicFile.cpp
@@ -23,7 +23,7 @@
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 
 namespace fs = util::filesystem;
 
diff --git a/src/core/CacheEntry.cpp b/src/core/CacheEntry.cpp
index 4cfe6bee..926feca5 100644
--- a/src/core/CacheEntry.cpp
+++ b/src/core/CacheEntry.cpp
@@ -29,7 +29,7 @@
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/logging.hpp>
 #include <util/zstd.hpp>
 
diff --git a/src/core/CacheEntryDataReader.hpp b/src/core/CacheEntryDataReader.hpp
index ad73fbb2..465e9677 100644
--- a/src/core/CacheEntryDataReader.hpp
+++ b/src/core/CacheEntryDataReader.hpp
@@ -20,7 +20,7 @@
 
 #include <core/exceptions.hpp>
 #include <util/conversion.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/string.hpp>
 
 #include <third_party/nonstd/span.hpp>
diff --git a/src/core/CacheEntryDataWriter.hpp b/src/core/CacheEntryDataWriter.hpp
index 6e18be52..1022195a 100644
--- a/src/core/CacheEntryDataWriter.hpp
+++ b/src/core/CacheEntryDataWriter.hpp
@@ -20,7 +20,7 @@
 
 #include <core/exceptions.hpp>
 #include <util/conversion.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/string.hpp>
 
 #include <third_party/nonstd/span.hpp>
diff --git a/src/core/FileRecompressor.cpp b/src/core/FileRecompressor.cpp
index 77c25505..c2e6c033 100644
--- a/src/core/FileRecompressor.cpp
+++ b/src/core/FileRecompressor.cpp
@@ -24,7 +24,7 @@
 #include <core/exceptions.hpp>
 #include <util/expected.hpp>
 #include <util/file.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 
 using util::DirEntry;
 
diff --git a/src/core/Manifest.cpp b/src/core/Manifest.cpp
index d5422393..2d60dfbe 100644
--- a/src/core/Manifest.cpp
+++ b/src/core/Manifest.cpp
@@ -25,7 +25,7 @@
 #include <core/exceptions.hpp>
 #include <hashutil.hpp>
 #include <util/XXH3_64.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/logging.hpp>
 #include <util/string.hpp>
 
diff --git a/src/core/Result.cpp b/src/core/Result.cpp
index 4b4d51fd..94a6b0c7 100644
--- a/src/core/Result.cpp
+++ b/src/core/Result.cpp
@@ -32,7 +32,7 @@
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/logging.hpp>
 #include <util/path.hpp>
 #include <util/string.hpp>
diff --git a/src/core/ResultExtractor.cpp b/src/core/ResultExtractor.cpp
index 8024a4a4..77a96291 100644
--- a/src/core/ResultExtractor.cpp
+++ b/src/core/ResultExtractor.cpp
@@ -25,7 +25,7 @@
 #include <util/DirEntry.hpp>
 #include <util/expected.hpp>
 #include <util/file.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/wincompat.hpp>
 
 #include <fcntl.h>
diff --git a/src/core/ResultInspector.cpp b/src/core/ResultInspector.cpp
index 702f241b..f2510266 100644
--- a/src/core/ResultInspector.cpp
+++ b/src/core/ResultInspector.cpp
@@ -20,7 +20,7 @@
 
 #include "Context.hpp"
 
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/logging.hpp>
 
 namespace core {
diff --git a/src/core/ResultRetriever.cpp b/src/core/ResultRetriever.cpp
index 2b83fd7a..fceb2c73 100644
--- a/src/core/ResultRetriever.cpp
+++ b/src/core/ResultRetriever.cpp
@@ -29,7 +29,7 @@
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/logging.hpp>
 #include <util/path.hpp>
 #include <util/string.hpp>
diff --git a/src/core/Statistics.cpp b/src/core/Statistics.cpp
index 2e0d5e35..85063da7 100644
--- a/src/core/Statistics.cpp
+++ b/src/core/Statistics.cpp
@@ -21,7 +21,7 @@
 #include <Config.hpp>
 #include <Util.hpp>
 #include <util/TextTable.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/logging.hpp>
 #include <util/string.hpp>
 #include <util/time.hpp>
diff --git a/src/core/StatsLog.cpp b/src/core/StatsLog.cpp
index 6fda850f..30acb0fc 100644
--- a/src/core/StatsLog.cpp
+++ b/src/core/StatsLog.cpp
@@ -20,7 +20,7 @@
 
 #include <core/Statistics.hpp>
 #include <util/FileStream.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/logging.hpp>
 
 #include <cstring>
diff --git a/src/core/common.cpp b/src/core/common.cpp
index 29b825a6..cf5a8ed5 100644
--- a/src/core/common.cpp
+++ b/src/core/common.cpp
@@ -26,7 +26,7 @@
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/path.hpp>
 
 using IncludeDelimiter = util::Tokenizer::IncludeDelimiter;
diff --git a/src/core/mainoptions.cpp b/src/core/mainoptions.cpp
index b0e302a9..2eb20ad3 100644
--- a/src/core/mainoptions.cpp
+++ b/src/core/mainoptions.cpp
@@ -48,7 +48,7 @@
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/logging.hpp>
 #include <util/string.hpp>
 
diff --git a/src/core/types.cpp b/src/core/types.cpp
index 5c5845b6..d7694272 100644
--- a/src/core/types.cpp
+++ b/src/core/types.cpp
@@ -21,7 +21,7 @@
 #include <Config.hpp>
 #include <core/exceptions.hpp>
 #include <util/assertions.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 
 namespace core {
 
diff --git a/src/execute.cpp b/src/execute.cpp
index 0f64f0a4..2ea741fa 100644
--- a/src/execute.cpp
+++ b/src/execute.cpp
@@ -35,7 +35,7 @@
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/logging.hpp>
 #include <util/path.hpp>
 #include <util/string.hpp>
diff --git a/src/hashutil.cpp b/src/hashutil.cpp
index fa4b6abf..c78f5288 100644
--- a/src/hashutil.cpp
+++ b/src/hashutil.cpp
@@ -27,7 +27,7 @@
 #include <core/exceptions.hpp>
 #include <util/DirEntry.hpp>
 #include <util/file.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/logging.hpp>
 #include <util/string.hpp>
 #include <util/time.hpp>
diff --git a/src/storage/Storage.cpp b/src/storage/Storage.cpp
index 3de75c84..506ff6bc 100644
--- a/src/storage/Storage.cpp
+++ b/src/storage/Storage.cpp
@@ -27,7 +27,7 @@
 #include <storage/remote/FileStorage.hpp>
 #include <storage/remote/HttpStorage.hpp>
 #include <util/assertions.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/logging.hpp>
 #ifdef HAVE_REDIS_STORAGE_BACKEND
 #  include <storage/remote/RedisStorage.hpp>
diff --git a/src/storage/local/LocalStorage.cpp b/src/storage/local/LocalStorage.cpp
index fc6f0680..a55e26fa 100644
--- a/src/storage/local/LocalStorage.cpp
+++ b/src/storage/local/LocalStorage.cpp
@@ -38,7 +38,7 @@
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/logging.hpp>
 #include <util/process.hpp>
 #include <util/string.hpp>
diff --git a/src/storage/local/StatsFile.cpp b/src/storage/local/StatsFile.cpp
index 750000d8..a0216066 100644
--- a/src/storage/local/StatsFile.cpp
+++ b/src/storage/local/StatsFile.cpp
@@ -22,7 +22,7 @@
 #include <core/exceptions.hpp>
 #include <util/LockFile.hpp>
 #include <util/file.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/logging.hpp>
 
 namespace storage::local {
diff --git a/src/storage/local/util.cpp b/src/storage/local/util.cpp
index 50ba754d..6de7729d 100644
--- a/src/storage/local/util.cpp
+++ b/src/storage/local/util.cpp
@@ -23,7 +23,7 @@
 #include <util/PathString.hpp>
 #include <util/expected.hpp>
 #include <util/file.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/string.hpp>
 
 using util::DirEntry;
diff --git a/src/storage/remote/FileStorage.cpp b/src/storage/remote/FileStorage.cpp
index 5fdf1717..76850554 100644
--- a/src/storage/remote/FileStorage.cpp
+++ b/src/storage/remote/FileStorage.cpp
@@ -28,7 +28,7 @@
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/logging.hpp>
 #include <util/string.hpp>
 
diff --git a/src/storage/remote/HttpStorage.cpp b/src/storage/remote/HttpStorage.cpp
index 0778b96d..a64e1538 100644
--- a/src/storage/remote/HttpStorage.cpp
+++ b/src/storage/remote/HttpStorage.cpp
@@ -24,7 +24,7 @@
 #include <storage/Storage.hpp>
 #include <util/assertions.hpp>
 #include <util/expected.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/logging.hpp>
 #include <util/string.hpp>
 #include <util/types.hpp>
diff --git a/src/storage/remote/RedisStorage.cpp b/src/storage/remote/RedisStorage.cpp
index 299963d5..6316b232 100644
--- a/src/storage/remote/RedisStorage.cpp
+++ b/src/storage/remote/RedisStorage.cpp
@@ -23,7 +23,7 @@
 #include <storage/Storage.hpp>
 #include <util/assertions.hpp>
 #include <util/expected.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/logging.hpp>
 #include <util/string.hpp>
 #include <util/wincompat.hpp> // for timeval
diff --git a/src/test_lockfile.cpp b/src/test_lockfile.cpp
index 2318a39d..9c0db108 100644
--- a/src/test_lockfile.cpp
+++ b/src/test_lockfile.cpp
@@ -19,7 +19,7 @@
 #include <Config.hpp>
 #include <util/LockFile.hpp>
 #include <util/LongLivedLockFileManager.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/logging.hpp>
 #include <util/string.hpp>
 
diff --git a/src/util/DirEntry.cpp b/src/util/DirEntry.cpp
index 32026c8d..53bfdee8 100644
--- a/src/util/DirEntry.cpp
+++ b/src/util/DirEntry.cpp
@@ -21,7 +21,7 @@
 #include <util/Finalizer.hpp>
 #include <util/PathString.hpp>
 #include <util/file.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/logging.hpp>
 #include <util/wincompat.hpp>
 
diff --git a/src/util/LockFile.cpp b/src/util/LockFile.cpp
index 55ffc0fc..cbc36311 100644
--- a/src/util/LockFile.cpp
+++ b/src/util/LockFile.cpp
@@ -26,7 +26,7 @@
 #include <util/error.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/logging.hpp>
 #include <util/process.hpp>
 #include <util/wincompat.hpp>
diff --git a/src/util/MemoryMap.cpp b/src/util/MemoryMap.cpp
index 05840ad7..7430c7d0 100644
--- a/src/util/MemoryMap.cpp
+++ b/src/util/MemoryMap.cpp
@@ -18,7 +18,7 @@
 
 #include "MemoryMap.hpp"
 
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/wincompat.hpp>
 
 #include <cstring>
diff --git a/src/util/TemporaryFile.cpp b/src/util/TemporaryFile.cpp
index 1964174c..a3dff93c 100644
--- a/src/util/TemporaryFile.cpp
+++ b/src/util/TemporaryFile.cpp
@@ -21,7 +21,7 @@
 #include <util/PathString.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/process.hpp>
 
 #include <cstdlib>
diff --git a/src/util/TextTable.cpp b/src/util/TextTable.cpp
index 2727d566..9880d1fc 100644
--- a/src/util/TextTable.cpp
+++ b/src/util/TextTable.cpp
@@ -19,7 +19,7 @@
 #include "TextTable.hpp"
 
 #include <util/assertions.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 
 #include <third_party/fmt/core.h>
 
diff --git a/src/util/assertions.cpp b/src/util/assertions.cpp
index f330156e..e4b03efb 100644
--- a/src/util/assertions.cpp
+++ b/src/util/assertions.cpp
@@ -20,7 +20,7 @@
 
 #include <util/assertions.hpp>
 #include <util/filesystem.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 
 namespace fs = util::filesystem;
 
diff --git a/src/util/environment.cpp b/src/util/environment.cpp
index 3baca88f..58d6c017 100644
--- a/src/util/environment.cpp
+++ b/src/util/environment.cpp
@@ -18,7 +18,7 @@
 
 #include "environment.hpp"
 
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/wincompat.hpp>
 
 namespace util {
diff --git a/src/util/expected.hpp b/src/util/expected.hpp
index 5e4385ef..95a943d8 100644
--- a/src/util/expected.hpp
+++ b/src/util/expected.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 
 #include <string_view>
 #include <utility>
diff --git a/src/util/file.cpp b/src/util/file.cpp
index 4ef39044..51dca6cd 100644
--- a/src/util/file.cpp
+++ b/src/util/file.cpp
@@ -28,7 +28,7 @@
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/logging.hpp>
 
 #ifdef HAVE_UNISTD_H
diff --git a/src/util/fmtmacros.hpp b/src/util/format.hpp
similarity index 100%
rename from src/util/fmtmacros.hpp
rename to src/util/format.hpp
diff --git a/src/util/logging.cpp b/src/util/logging.cpp
index 2f07a905..f0fbecd6 100644
--- a/src/util/logging.cpp
+++ b/src/util/logging.cpp
@@ -21,7 +21,7 @@
 
 #include <util/FileStream.hpp>
 #include <util/file.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/logging.hpp>
 #include <util/time.hpp>
 
diff --git a/src/util/path.cpp b/src/util/path.cpp
index 11773cf9..41b36fe3 100644
--- a/src/util/path.cpp
+++ b/src/util/path.cpp
@@ -21,7 +21,7 @@
 #include <Util.hpp>
 #include <util/DirEntry.hpp>
 #include <util/filesystem.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/string.hpp>
 
 #ifdef _WIN32
diff --git a/src/util/string.cpp b/src/util/string.cpp
index af419cf4..dba3e9ae 100644
--- a/src/util/string.cpp
+++ b/src/util/string.cpp
@@ -19,7 +19,7 @@
 #include "string.hpp"
 
 #include <util/assertions.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 
 #include <algorithm>
 #include <cctype>
diff --git a/unittest/TestUtil.cpp b/unittest/TestUtil.cpp
index 3ef36543..3b502181 100644
--- a/unittest/TestUtil.cpp
+++ b/unittest/TestUtil.cpp
@@ -21,7 +21,7 @@
 #include <core/exceptions.hpp>
 #include <util/expected.hpp>
 #include <util/filesystem.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 
 namespace fs = util::filesystem;
 
diff --git a/unittest/main.cpp b/unittest/main.cpp
index 5e64c958..a415602d 100644
--- a/unittest/main.cpp
+++ b/unittest/main.cpp
@@ -18,7 +18,7 @@
 
 #include <util/environment.hpp>
 #include <util/filesystem.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/path.hpp>
 
 #define DOCTEST_THREAD_LOCAL // Avoid MinGW thread_local bug
diff --git a/unittest/test_Config.cpp b/unittest/test_Config.cpp
index 84c7022c..4de2ec9b 100644
--- a/unittest/test_Config.cpp
+++ b/unittest/test_Config.cpp
@@ -23,7 +23,7 @@
 #include <core/exceptions.hpp>
 #include <util/environment.hpp>
 #include <util/file.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 
 #include "third_party/doctest.h"
 
diff --git a/unittest/test_Depfile.cpp b/unittest/test_Depfile.cpp
index a556f82c..768f69ad 100644
--- a/unittest/test_Depfile.cpp
+++ b/unittest/test_Depfile.cpp
@@ -21,7 +21,7 @@
 #include "TestUtil.hpp"
 
 #include <util/filesystem.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 
 #include "third_party/doctest.h"
 
diff --git a/unittest/test_Util.cpp b/unittest/test_Util.cpp
index d729c8af..53ebbc21 100644
--- a/unittest/test_Util.cpp
+++ b/unittest/test_Util.cpp
@@ -24,7 +24,7 @@
 #include <util/environment.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/path.hpp>
 #include <util/wincompat.hpp>
 
diff --git a/unittest/test_argprocessing.cpp b/unittest/test_argprocessing.cpp
index 109e06f4..03579277 100644
--- a/unittest/test_argprocessing.cpp
+++ b/unittest/test_argprocessing.cpp
@@ -25,7 +25,7 @@
 #include <Util.hpp>
 #include <core/Statistic.hpp>
 #include <util/file.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/path.hpp>
 #include <util/string.hpp>
 #include <util/wincompat.hpp>
diff --git a/unittest/test_ccache.cpp b/unittest/test_ccache.cpp
index 02c6161c..416c4463 100644
--- a/unittest/test_ccache.cpp
+++ b/unittest/test_ccache.cpp
@@ -22,7 +22,7 @@
 
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/path.hpp>
 #include <util/wincompat.hpp>
 
diff --git a/unittest/test_core_common.cpp b/unittest/test_core_common.cpp
index 26da83e3..6f0268ce 100644
--- a/unittest/test_core_common.cpp
+++ b/unittest/test_core_common.cpp
@@ -22,7 +22,7 @@
 #include <util/DirEntry.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 
 #include <third_party/doctest.h>
 
diff --git a/unittest/test_storage_local_StatsFile.cpp b/unittest/test_storage_local_StatsFile.cpp
index 83cf9c63..34b9c2f2 100644
--- a/unittest/test_storage_local_StatsFile.cpp
+++ b/unittest/test_storage_local_StatsFile.cpp
@@ -22,7 +22,7 @@
 #include <core/Statistic.hpp>
 #include <storage/local/StatsFile.hpp>
 #include <util/file.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 
 #include <third_party/doctest.h>
 
diff --git a/unittest/test_storage_local_util.cpp b/unittest/test_storage_local_util.cpp
index e5c40b6b..8ffbdff2 100644
--- a/unittest/test_storage_local_util.cpp
+++ b/unittest/test_storage_local_util.cpp
@@ -21,7 +21,7 @@
 #include <storage/local/util.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 
 #include <third_party/doctest.h>
 
diff --git a/unittest/test_util_file.cpp b/unittest/test_util_file.cpp
index 46f4ce8c..e9a8073e 100644
--- a/unittest/test_util_file.cpp
+++ b/unittest/test_util_file.cpp
@@ -23,7 +23,7 @@
 #include <util/Fd.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/string.hpp>
 
 #include <third_party/doctest.h>
diff --git a/unittest/test_util_path.cpp b/unittest/test_util_path.cpp
index 882c7e88..59bb6abd 100644
--- a/unittest/test_util_path.cpp
+++ b/unittest/test_util_path.cpp
@@ -17,7 +17,7 @@
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 #include <Util.hpp>
-#include <util/fmtmacros.hpp>
+#include <util/format.hpp>
 #include <util/path.hpp>
 
 #include <third_party/doctest.h>