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

diff --git a/src/Config.cpp b/src/Config.cpp
index a244fd58765b18a9e63aa72f8ba95277929b705d..328e962d784d493690848328175adb5ba3b855a2 100644 (file)
--- 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 235714b30019133415ac286791a15636844f9721..f8780efd0c6fa7f521db047255bb2935cf7724ca 100644 (file)
--- 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 229468b35f26332cf127df74b444d7c4dd127b7c..8a869b940bc6aab0f636c3777e24c1dbcdc02535 100644 (file)
--- 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 8e1091bda7301f45c9fdcc7be114a55595b888a8..0850bb91c6040017985ef7a69babe2b1c0a7cca0 100644 (file)
--- 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 dc55dd4e0b1998188068b5431544cfb3449c62ea..3fa6f7e1d9995626792208951461b5d2f94a455e 100644 (file)
--- 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 6493df20bc6076ee9bfa6c276e0606023928c792..96deb698aab883b7eeb7559fe74501d05752f1f1 100644 (file)
--- 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 f09885b79a62b0d135dce8b12284442f18519d17..3066ff37e1421dd836811284fa6e7f53204ae81a 100644 (file)
--- 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 0d1b1555cdb15a974bb5d493bb260f7cf5a81f04..3bf62142136f0ba35102bcbaedb5f9819fc86aee 100644 (file)
--- 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 9f1d603a04f5f832d8c85f9a4272aebfaea50fbe..0554c6d7f710b7c666cde5d2d55b7d235e93d3b7 100644 (file)
--- 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 9efffa9a23b420bc35f6065cd30d0dbc81fa6030..e508ec28ed2cb85469a98058d08954a817c1cda4 100644 (file)
--- 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 4cfe6bee600900db832d30b4a6a3cb428ab711f2..926feca5778fdca9c443c002bcba72d2f96ceb0d 100644 (file)
--- 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 ad73fbb26986d192edede1f1b2830b2d62fd1b66..465e9677ee8baedccf9e89f69c16eaab85ba6bd8 100644 (file)
--- 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 6e18be522ee16ec74ec0990a0e3a2711cb9d702c..1022195a8131c9877b2e8dcd5316f4ffb904f821 100644 (file)
--- 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 77c255059a75460c03572e9403e8e93fd34e1201..c2e6c0333205268a174f0b3514ce6dca99e6bf5e 100644 (file)
--- 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 d542239306fc9b7eeecdbd7b0951d6179da32498..2d60dfbe93323db4b86068c4664796a81c8261b1 100644 (file)
--- 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 4b4d51fd847bca5df4cd239d556df6111dbc9372..94a6b0c7cf702f028f86d048f1105ad005b158cd 100644 (file)
--- 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 8024a4a4dd629d2249e9038ee163a9177da84f70..77a96291fdc9222be9108fedf5932a70ebe83043 100644 (file)
--- 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 702f241bd70b664907021218c7ec595b72cf6863..f25102664fc2b26eccb8a97f44b27200825dd205 100644 (file)
--- 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 2b83fd7a47bccba3cb9b1e8e31ecafe2bd1aafd2..fceb2c738778fcb8a853ee258f25faf7cf677784 100644 (file)
--- 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 2e0d5e35e6fe54647e8422a51131f76e91cc351e..85063da751e3032ca17363d64ae14abd83bf8c13 100644 (file)
--- 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 6fda850f07932ed6496a8f1a1a07b8e9c073a238..30acb0fcfc77d71bcd3e99d37f8ee20749e783ba 100644 (file)
--- 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 29b825a61777add6d09c274a6694926a4ed6e59b..cf5a8ed5be833ae29f2a1ef17687b88ac7cdf86d 100644 (file)
--- 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 b0e302a954a5d23a9fa098842a69d151d0ef8a1c..2eb20ad340f74de1480467fb8f7bcbe40ec88391 100644 (file)
--- 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 5c5845b6be86c5496ba2a1bfe583967fac6dc969..d76942725cf917e50b185b998c94630d5be4304b 100644 (file)
--- 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 0f64f0a468584641eefa9301bd5ed1a2fced139a..2ea741fac5a222990367279e71285efb1ca75030 100644 (file)
--- 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 fa4b6abfe11fcbfba66a9ae3cc5c1811909b4ff8..c78f52885e5666e21dba73ee225fd1a0684e0647 100644 (file)
--- 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 3de75c84ace9c4fd14caf0aa94590f869f65b089..506ff6bcf756fe829975d833bbc1417f71f1f7ad 100644 (file)
--- 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 fc6f06804338242bfe60c1ea5af44fd76471b877..a55e26fa14521e03389d34d87e70c7152b1d0c27 100644 (file)
--- 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 750000d82c18f2198ecf730063527c9dc68a37e0..a0216066234da52548d75da629582bfc2cffdca8 100644 (file)
--- 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 50ba754d237ed229733db67ea8eb8293a489caf2..6de7729db982be3af325ee47b3e6a9c4f4977469 100644 (file)
--- 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 5fdf1717b10b5d4cfbe160597497c86e9321bc73..768505543785bf065752c18055ad965598417cc3 100644 (file)
--- 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 0778b96de6beb3f51f98f976cd91447f08610195..a64e153824b3a2cfa1fc9ac978bd720fa156601b 100644 (file)
--- 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 299963d52df219953e11c09f8960da1f32261fb4..6316b23210da7347f8ea88f710f7934185f94acd 100644 (file)
--- 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 2318a39d708d233dd05e2c331726976e4c5c379c..9c0db1086ee22e7caabc29407737136f00c695b6 100644 (file)
--- 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 32026c8d2e7be192deddd79da0956378fd6c508b..53bfdee8d348d43e230f7b5e6b85eb7527c2cff0 100644 (file)
--- 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 55ffc0fc28d3c27b8bb7fe655d98c05fa964741f..cbc36311a2be2de4430717dd933fa6a954ca98b9 100644 (file)
--- 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 05840ad78c21cbbd6663e2fe1bcccdc325122f02..7430c7d0ee9983fee1e66d0117aef26616f15606 100644 (file)
--- 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 1964174cbfb01900434c1ec0e7fa4b570cc96aab..a3dff93c86b998a4bb0336e5d09ede43138f0047 100644 (file)
--- 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 2727d566381836ffd32f78e442db991df5885403..9880d1fcc185cd6ef9d0e29c40287ccce435242a 100644 (file)
--- 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 f330156e08d1b15f7eca3b17a025450728640ac1..e4b03efbecbebd944f4af5999d1beb5696017c23 100644 (file)
--- 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 3baca88f4f0e23646a5ef225bc808c36be0e4a58..58d6c017dac2b514202e23bc6bc42f92ef784367 100644 (file)
--- 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 5e4385ef211649c69fd086673d0797f1e9729c94..95a943d8d95d0aa50811599cf304d79a4fe0d02b 100644 (file)
--- 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 4ef39044171bd26b2b9652cb22a989c7ffb49f47..51dca6cda562906b1595e8ef4404c4098a2395a6 100644 (file)
--- 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 2f07a905f4685da2ab17553146d8ddf55f85e235..f0fbecd63cce02cd5f7cba94386d1ed62553e154 100644 (file)
--- 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 11773cf9cf4551b73ea5a8ed5a8461f56deb3297..41b36fe337d11eb4e40c85b920ab6fd3e9b482bf 100644 (file)
--- 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 af419cf473e7c0b4db29a5d4b9890e74109c3638..dba3e9aed0d3676b2716dd6114b1aded9cadc835 100644 (file)
--- 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 3ef36543ba531ce47133c37a67e3bbf8c4c78d59..3b502181ca106eccdd7b6819b77527b799c4a939 100644 (file)
--- 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 5e64c958bf7a1b1fa117f00f1e2bc83581546f14..a415602df22aa0cd8342c5231c75f56cba55aa93 100644 (file)
--- 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 84c7022ca7d93273feaed1638b13e7d6dec9b368..4de2ec9bb933837e20937e4acad77fd8cedee7ca 100644 (file)
--- 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 a556f82cc4cf8dc8a188d44b3fa655e700bf9dee..768f69ad045a15eab8b5c2216551337d4b6e5345 100644 (file)
--- 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 d729c8afb4d965184e046a2033ff030d9fcbb016..53ebbc21451c8b37f2f301052ab9da94524e7269 100644 (file)
--- 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 109e06f46a6ed2dad370cad247164a82ccca6494..03579277508cb19148d8992030abe29ef77dd8a7 100644 (file)
--- 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 02c6161cb87955dae30d1baca899e3026c62b0b9..416c4463dd309b0cf5b586d3b30bbf48b71764fc 100644 (file)
--- 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 26da83e3c6af92051d61d9e4eeb0c846d84b3055..6f0268ce172789bed4e495485d618b6071a51cd6 100644 (file)
--- 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 83cf9c638a2987ce442d1256d6599c2b615f8fb0..34b9c2f2c35e538fec6cc1c8ec0d97b764dd1deb 100644 (file)
--- 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 e5c40b6b550a192d8e0429525fb6b40bd2ccee76..8ffbdff2511325d25511e813b524bce3cf0c8307 100644 (file)
--- 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 46f4ce8c3fd0a2b4cae2b1aa3d6cd3a284f3095f..e9a8073e29950f3b8e74cec38f536088a706c9c4 100644 (file)
--- 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 882c7e88dc7b93885300dd67f6326d236e61c624..59bb6abdbccb5355470594405154e147c1c0f311 100644 (file)
--- 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>