refactor: Move fmtmacros to util

diff --git a/src/Config.cpp b/src/Config.cpp
index ca27da956fbe0c24cfaeef22c1587eab1afd8394..74aee464d8c2d4cad3999858145c5687680825a8 100644 (file)
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -25,7 +25,6 @@
 #include <core/common.hpp>
 #include <core/exceptions.hpp>
 #include <core/types.hpp>
-#include <fmtmacros.hpp>
 #include <util/DirEntry.hpp>
 #include <util/Tokenizer.hpp>
 #include <util/UmaskScope.hpp>
@@ -34,6 +33,7 @@
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/path.hpp>
 #include <util/string.hpp>
 #include <util/wincompat.hpp>

diff --git a/src/Hash.cpp b/src/Hash.cpp
index 749d0ba0f1edd02812b7684514d8ceebdfd9e879..8198e6684196ff3c34c4550ef5c3fb7172dfdf3e 100644 (file)
--- a/src/Hash.cpp
+++ b/src/Hash.cpp
@@ -19,10 +19,10 @@
 #include "Hash.hpp"
 
 #include "Logging.hpp"
-#include "fmtmacros.hpp"
 
 #include <util/Fd.hpp>
 #include <util/file.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/string.hpp>
 #include <util/wincompat.hpp>
 

diff --git a/src/InodeCache.cpp b/src/InodeCache.cpp
index 26339b5898e27c3118dde326d813fa48863e8fd6..87d4ec5e09bc679dae9b8f18c85e1b2a035b27b8 100644 (file)
--- a/src/InodeCache.cpp
+++ b/src/InodeCache.cpp
@@ -22,7 +22,6 @@
 #include "Hash.hpp"
 #include "Logging.hpp"
 #include "Util.hpp"
-#include "fmtmacros.hpp"
 
 #include <util/DirEntry.hpp>
 #include <util/Fd.hpp>
@@ -30,6 +29,7 @@
 #include <util/TemporaryFile.hpp>
 #include <util/conversion.hpp>
 #include <util/file.hpp>
+#include <util/fmtmacros.hpp>
 
 #include <fcntl.h>
 #include <libgen.h>

diff --git a/src/Logging.cpp b/src/Logging.cpp
index c9d306b89382d253ead7ae4055d3f73fb6ea3638..4090335f99d66c89ef910c6bc54228261878d5dc 100644 (file)
--- a/src/Logging.cpp
+++ b/src/Logging.cpp
@@ -24,9 +24,9 @@
 #include "Util.hpp"
 #include "Win32Util.hpp"
 #include "execute.hpp"
-#include "fmtmacros.hpp"
 
 #include <util/file.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/time.hpp>
 #include <util/wincompat.hpp>
 

diff --git a/src/MiniTrace.cpp b/src/MiniTrace.cpp
index ec3914cf761ba8ce81182ded4c07d3660f246f7c..8e1091bda7301f45c9fdcc7be114a55595b888a8 100644 (file)
--- a/src/MiniTrace.cpp
+++ b/src/MiniTrace.cpp
@@ -19,7 +19,6 @@
 #include "MiniTrace.hpp"
 
 #include "ArgsInfo.hpp"
-#include "fmtmacros.hpp"
 
 #include <core/exceptions.hpp>
 #include <util/TemporaryFile.hpp>
@@ -27,6 +26,7 @@
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/wincompat.hpp>
 
 #ifdef HAVE_UNISTD_H

diff --git a/src/ProgressBar.cpp b/src/ProgressBar.cpp
index e7ca1b4e16aefea05587af7c3c82de64a4d6d5d8..da0ee2530d457caf45da36bebc98bdfbaa7d88a0 100644 (file)
--- a/src/ProgressBar.cpp
+++ b/src/ProgressBar.cpp
@@ -18,9 +18,8 @@
 
 #include "ProgressBar.hpp"
 
-#include "fmtmacros.hpp"
-
 #include <util/assertions.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/wincompat.hpp>
 
 #include "third_party/fmt/core.h"

diff --git a/src/Util.cpp b/src/Util.cpp
index 9099d0a5fa5ac39817a1e5e5b0c36cfb949bde91..79b91af9ad8af6b7a7844d68cca9500518b80742 100644 (file)
--- a/src/Util.cpp
+++ b/src/Util.cpp
@@ -25,11 +25,11 @@
 
 #include <Config.hpp>
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/DirEntry.hpp>
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/path.hpp>
 #include <util/string.hpp>
 #include <util/wincompat.hpp>

diff --git a/src/argprocessing.cpp b/src/argprocessing.cpp
index 0144e28d6d18bfa3ea6fe0497b2bd315b00aceb8..bdfd25dacadd4529a1d0c2633f138437fd232bf8 100644 (file)
--- a/src/argprocessing.cpp
+++ b/src/argprocessing.cpp
@@ -21,12 +21,12 @@
 #include "Context.hpp"
 #include "Logging.hpp"
 #include "compopt.hpp"
-#include "fmtmacros.hpp"
 #include "language.hpp"
 
 #include <Depfile.hpp>
 #include <Util.hpp>
 #include <util/assertions.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/path.hpp>
 #include <util/string.hpp>
 #include <util/wincompat.hpp>

diff --git a/src/ccache.cpp b/src/ccache.cpp
index 7d037e5cc706f2cdaa0488b0c3be04618c714f36..ee1497d93f7c37a165b1b7ef407c9c9e8eb63db6 100644 (file)
--- a/src/ccache.cpp
+++ b/src/ccache.cpp
@@ -33,7 +33,6 @@
 #include "argprocessing.hpp"
 #include "compopt.hpp"
 #include "execute.hpp"
-#include "fmtmacros.hpp"
 #include "hashutil.hpp"
 #include "language.hpp"
 
@@ -57,6 +56,7 @@
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/path.hpp>
 #include <util/process.hpp>
 #include <util/string.hpp>

diff --git a/src/compopt.cpp b/src/compopt.cpp
index 668adccb2753e0d2d449d7b4a56feeaa73ed8022..86a6cbb1e1162ed592e7e68cda5952f3c1a5143f 100644 (file)
--- a/src/compopt.cpp
+++ b/src/compopt.cpp
@@ -18,7 +18,7 @@
 
 #include "compopt.hpp"
 
-#include "fmtmacros.hpp"
+#include <util/fmtmacros.hpp>
 
 #include "third_party/fmt/core.h"
 

diff --git a/src/core/AtomicFile.cpp b/src/core/AtomicFile.cpp
index c827993b2f9e5384a4e34f7fa01c1bcfd3a18b91..a709a75ac3584eab462484f384518cd8df77b276 100644 (file)
--- a/src/core/AtomicFile.cpp
+++ b/src/core/AtomicFile.cpp
@@ -18,12 +18,12 @@
 
 #include <core/AtomicFile.hpp>
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/TemporaryFile.hpp>
 #include <util/assertions.hpp>
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.hpp>
 
 namespace fs = util::filesystem;
 

diff --git a/src/core/CacheEntry.cpp b/src/core/CacheEntry.cpp
index b0b5c165bc89528e5584c8bd23a4e9824cd7266e..df2b762f0f19c0a0b9b33c935e8f6f044285bd91 100644 (file)
--- a/src/core/CacheEntry.cpp
+++ b/src/core/CacheEntry.cpp
@@ -25,10 +25,10 @@
 #include <core/Result.hpp>
 #include <core/exceptions.hpp>
 #include <core/types.hpp>
-#include <fmtmacros.hpp>
 #include <util/TimePoint.hpp>
 #include <util/expected.hpp>
 #include <util/file.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/zstd.hpp>
 
 #include <cstring>

diff --git a/src/core/CacheEntryDataReader.hpp b/src/core/CacheEntryDataReader.hpp
index cd6793f4a59cf3d177a38831be99cbd663f61209..ad73fbb26986d192edede1f1b2830b2d62fd1b66 100644 (file)
--- a/src/core/CacheEntryDataReader.hpp
+++ b/src/core/CacheEntryDataReader.hpp
@@ -19,8 +19,8 @@
 #pragma once
 
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/conversion.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/string.hpp>
 
 #include <third_party/nonstd/span.hpp>

diff --git a/src/core/CacheEntryDataWriter.hpp b/src/core/CacheEntryDataWriter.hpp
index 8bbff8ca351c8c1b850f6ab37b2bd711f1a7d0c4..19e91272c649868853241341840869e244fcd1da 100644 (file)
--- a/src/core/CacheEntryDataWriter.hpp
+++ b/src/core/CacheEntryDataWriter.hpp
@@ -19,8 +19,8 @@
 #pragma once
 
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/conversion.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/string.hpp>
 
 #include <third_party/nonstd/span.hpp>

diff --git a/src/core/Manifest.cpp b/src/core/Manifest.cpp
index e9cfadd8097bc6952b0a45f8dcd87dd29345bfec..f497aa40889e1572b3e4605aa9fd056451311a29 100644 (file)
--- a/src/core/Manifest.cpp
+++ b/src/core/Manifest.cpp
@@ -24,9 +24,9 @@
 #include <core/CacheEntryDataReader.hpp>
 #include <core/CacheEntryDataWriter.hpp>
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <hashutil.hpp>
 #include <util/XXH3_64.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/string.hpp>
 
 // Manifest data format

diff --git a/src/core/Result.cpp b/src/core/Result.cpp
index 4de7c729fdc705533fef148571c1ed6479db13bb..c490aceba31a74c6bcc23abaa288bf4aa5adf505 100644 (file)
--- a/src/core/Result.cpp
+++ b/src/core/Result.cpp
@@ -29,11 +29,11 @@
 #include <core/CacheEntryDataWriter.hpp>
 #include <core/Statistic.hpp>
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/Bytes.hpp>
 #include <util/DirEntry.hpp>
 #include <util/expected.hpp>
 #include <util/file.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/path.hpp>
 #include <util/string.hpp>
 #include <util/wincompat.hpp>

diff --git a/src/core/ResultExtractor.cpp b/src/core/ResultExtractor.cpp
index 38347959e1ffa1f70cfa1d583e8c6c44a80d6f66..8024a4a4dd629d2249e9038ee163a9177da84f70 100644 (file)
--- a/src/core/ResultExtractor.cpp
+++ b/src/core/ResultExtractor.cpp
@@ -19,14 +19,13 @@
 #include "ResultExtractor.hpp"
 
 #include "Util.hpp"
-#include "fmtmacros.hpp"
 
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/Bytes.hpp>
 #include <util/DirEntry.hpp>
 #include <util/expected.hpp>
 #include <util/file.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/wincompat.hpp>
 
 #include <fcntl.h>

diff --git a/src/core/ResultInspector.cpp b/src/core/ResultInspector.cpp
index b27a3f1d3375b5b374fc0eaf39d7460f3dad4a4e..20a4939d5999ad63c581430990458431d7fa308f 100644 (file)
--- a/src/core/ResultInspector.cpp
+++ b/src/core/ResultInspector.cpp
@@ -20,7 +20,8 @@
 
 #include "Context.hpp"
 #include "Logging.hpp"
-#include "fmtmacros.hpp"
+
+#include <util/fmtmacros.hpp>
 
 namespace core {
 

diff --git a/src/core/ResultRetriever.cpp b/src/core/ResultRetriever.cpp
index 0f48c8ecb49bec5826259ac6673f15ea3d43c4f4..a72ff401dd91e13ff9cac731e54a525eabe01910 100644 (file)
--- a/src/core/ResultRetriever.cpp
+++ b/src/core/ResultRetriever.cpp
@@ -27,11 +27,11 @@
 #include <core/MsvcShowIncludesOutput.hpp>
 #include <core/common.hpp>
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/DirEntry.hpp>
 #include <util/Fd.hpp>
 #include <util/expected.hpp>
 #include <util/file.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/path.hpp>
 #include <util/string.hpp>
 #include <util/wincompat.hpp>

diff --git a/src/core/Statistics.cpp b/src/core/Statistics.cpp
index ff6d65fed1fa7c996cd86c147bc61507b87dfd18..f72ce490641087d35de83723773585537730182b 100644 (file)
--- a/src/core/Statistics.cpp
+++ b/src/core/Statistics.cpp
@@ -21,8 +21,8 @@
 #include <Config.hpp>
 #include <Logging.hpp>
 #include <Util.hpp>
-#include <fmtmacros.hpp>
 #include <util/TextTable.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/string.hpp>
 #include <util/time.hpp>
 

diff --git a/src/core/StatsLog.cpp b/src/core/StatsLog.cpp
index 3202d2c6d3ec4ef7452a4909c159a50c46caf2b9..71b6455627862e944b3b3c52372ac0a482eef81d 100644 (file)
--- a/src/core/StatsLog.cpp
+++ b/src/core/StatsLog.cpp
@@ -21,7 +21,7 @@
 #include <File.hpp>
 #include <Logging.hpp>
 #include <core/Statistics.hpp>
-#include <fmtmacros.hpp>
+#include <util/fmtmacros.hpp>
 
 #include <fstream>
 

diff --git a/src/core/common.cpp b/src/core/common.cpp
index 54f49e08894921dd021ec1cf7e1a1efd10c01187..9efe5462aa879cb01ab91839351307c3a7b0d398 100644 (file)
--- a/src/core/common.cpp
+++ b/src/core/common.cpp
@@ -20,12 +20,12 @@
 
 #include <Context.hpp>
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/Finalizer.hpp>
 #include <util/Tokenizer.hpp>
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/path.hpp>
 
 using IncludeDelimiter = util::Tokenizer::IncludeDelimiter;

diff --git a/src/core/mainoptions.cpp b/src/core/mainoptions.cpp
index d8134e6d1f221d8b7e01a0e871de7fa8858e1b6b..1e9c85b8a6638912a608fe0012337a9ba999ade1 100644 (file)
--- a/src/core/mainoptions.cpp
+++ b/src/core/mainoptions.cpp
@@ -35,7 +35,6 @@
 #include <core/Statistics.hpp>
 #include <core/StatsLog.hpp>
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <storage/Storage.hpp>
 #include <storage/local/LocalStorage.hpp>
 #include <util/Fd.hpp>
@@ -48,6 +47,7 @@
 #include <util/environment.hpp>
 #include <util/expected.hpp>
 #include <util/file.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/string.hpp>
 
 #include <fcntl.h>

diff --git a/src/core/types.cpp b/src/core/types.cpp
index 2793a188a178b5faf1802d3b5774a710a8b70b08..5c5845b6be86c5496ba2a1bfe583967fac6dc969 100644 (file)
--- a/src/core/types.cpp
+++ b/src/core/types.cpp
@@ -20,8 +20,8 @@
 
 #include <Config.hpp>
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/assertions.hpp>
+#include <util/fmtmacros.hpp>
 
 namespace core {
 

diff --git a/src/execute.cpp b/src/execute.cpp
index 2c2ae6e7b45499db6b87b35c1bcb60109c52a6d1..68450fb09cdf2f2cb3115f5196a98b9a9b81e29f 100644 (file)
--- a/src/execute.cpp
+++ b/src/execute.cpp
@@ -28,7 +28,6 @@
 
 #include <ccache.hpp>
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/DirEntry.hpp>
 #include <util/Fd.hpp>
 #include <util/Finalizer.hpp>
@@ -36,6 +35,7 @@
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/path.hpp>
 #include <util/string.hpp>
 #include <util/wincompat.hpp>

diff --git a/src/hashutil.cpp b/src/hashutil.cpp
index fc43e87640581738fdff61eebc14b042feeaeb54..ede7732095e003f3c4a9d9d4095422a6c114fb6b 100644 (file)
--- a/src/hashutil.cpp
+++ b/src/hashutil.cpp
@@ -27,9 +27,9 @@
 #include "macroskip.hpp"
 
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/DirEntry.hpp>
 #include <util/file.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/string.hpp>
 #include <util/time.hpp>
 #include <util/wincompat.hpp>

diff --git a/src/storage/Storage.cpp b/src/storage/Storage.cpp
index 889ca98e255b4b843a3456cfded8b3115403cdd5..ddbfadf7da63080b2df82f1145ca9e0428052cdb 100644 (file)
--- a/src/storage/Storage.cpp
+++ b/src/storage/Storage.cpp
@@ -25,10 +25,10 @@
 #include <core/CacheEntry.hpp>
 #include <core/Statistic.hpp>
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <storage/remote/FileStorage.hpp>
 #include <storage/remote/HttpStorage.hpp>
 #include <util/assertions.hpp>
+#include <util/fmtmacros.hpp>
 #ifdef HAVE_REDIS_STORAGE_BACKEND
 #  include <storage/remote/RedisStorage.hpp>
 #endif

diff --git a/src/storage/local/LocalStorage.cpp b/src/storage/local/LocalStorage.cpp
index b87cf6fffcf9698fb5f2c9c773424f7ac1a9d933..d130843a0bdbf79b1109566c5f023c55d1621bc2 100644 (file)
--- a/src/storage/local/LocalStorage.cpp
+++ b/src/storage/local/LocalStorage.cpp
@@ -31,7 +31,6 @@
 #include <core/Statistics.hpp>
 #include <core/common.hpp>
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/Duration.hpp>
 #include <util/TemporaryFile.hpp>
 #include <util/TextTable.hpp>
@@ -40,6 +39,7 @@
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/process.hpp>
 #include <util/string.hpp>
 #include <util/wincompat.hpp>

diff --git a/src/storage/local/StatsFile.cpp b/src/storage/local/StatsFile.cpp
index 4c46cf45adce016c5023bded03ce134ba0cd35fb..3f543e80bb6dcd8784930d8e2ad4e13c66b62f66 100644 (file)
--- a/src/storage/local/StatsFile.cpp
+++ b/src/storage/local/StatsFile.cpp
@@ -21,9 +21,9 @@
 #include <Logging.hpp>
 #include <core/AtomicFile.hpp>
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/LockFile.hpp>
 #include <util/file.hpp>
+#include <util/fmtmacros.hpp>
 
 namespace storage::local {
 

diff --git a/src/storage/local/util.cpp b/src/storage/local/util.cpp
index 9aacb94d6ab2873659e9c2ab38057649e982e865..9d8e9d6645e6a643eb24ace0c55c90adb1a7ddde 100644 (file)
--- a/src/storage/local/util.cpp
+++ b/src/storage/local/util.cpp
@@ -20,9 +20,9 @@
 
 #include <Util.hpp>
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/expected.hpp>
 #include <util/file.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/string.hpp>
 
 using util::DirEntry;

diff --git a/src/storage/remote/FileStorage.cpp b/src/storage/remote/FileStorage.cpp
index 221dcdc68d15911f0d13e3c526d2ca4758639963..ebf3c7f5fd7ba13caa2d776078f31bf07bcb914a 100644 (file)
--- a/src/storage/remote/FileStorage.cpp
+++ b/src/storage/remote/FileStorage.cpp
@@ -22,7 +22,6 @@
 #include <Util.hpp>
 #include <core/AtomicFile.hpp>
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/Bytes.hpp>
 #include <util/DirEntry.hpp>
 #include <util/UmaskScope.hpp>
@@ -30,6 +29,7 @@
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/string.hpp>
 
 #include <sys/stat.h> // for mode_t

diff --git a/src/storage/remote/HttpStorage.cpp b/src/storage/remote/HttpStorage.cpp
index 89d649c357207f5a046e5504729194d3d8ef9efb..dd0310f1e76aaa1c9947c87c738020f08d8d2c9b 100644 (file)
--- a/src/storage/remote/HttpStorage.cpp
+++ b/src/storage/remote/HttpStorage.cpp
@@ -22,9 +22,9 @@
 #include <Logging.hpp>
 #include <ccache.hpp>
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/assertions.hpp>
 #include <util/expected.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/string.hpp>
 #include <util/types.hpp>
 

diff --git a/src/storage/remote/RedisStorage.cpp b/src/storage/remote/RedisStorage.cpp
index 1121f8a97c58466310fa162eafdcd9a82f10cd2b..e124c3cd1dbd26ef19516bbdbec3ffe7528daf09 100644 (file)
--- a/src/storage/remote/RedisStorage.cpp
+++ b/src/storage/remote/RedisStorage.cpp
@@ -21,9 +21,9 @@
 #include <Hash.hpp>
 #include <Logging.hpp>
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/assertions.hpp>
 #include <util/expected.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/string.hpp>
 #include <util/wincompat.hpp> // for timeval
 

diff --git a/src/test_lockfile.cpp b/src/test_lockfile.cpp
index 62fc535978031cc7425ad7a9e4c80d39371400f0..ed6823ab98f50e872343c92e159cb5fa6eeb5944 100644 (file)
--- a/src/test_lockfile.cpp
+++ b/src/test_lockfile.cpp
@@ -18,9 +18,9 @@
 
 #include <Config.hpp>
 #include <Logging.hpp>
-#include <fmtmacros.hpp>
 #include <util/LockFile.hpp>
 #include <util/LongLivedLockFileManager.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/string.hpp>
 
 #include <memory>

diff --git a/src/util/DirEntry.cpp b/src/util/DirEntry.cpp
index 8dad7e939e50447b14a54bc8d2ea5ecf52d4cba4..ced852c1c3fa6d8550e647d87ba93752bb0f914f 100644 (file)
--- a/src/util/DirEntry.cpp
+++ b/src/util/DirEntry.cpp
@@ -20,9 +20,9 @@
 
 #include <Logging.hpp>
 #include <Win32Util.hpp>
-#include <fmtmacros.hpp>
 #include <util/Finalizer.hpp>
 #include <util/file.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/wincompat.hpp>
 
 #ifdef _WIN32

diff --git a/src/util/LockFile.cpp b/src/util/LockFile.cpp
index 188f337d125084fa33a7e1aba7af94d7fda4a770..c3f670e90b0f68e9b7aa54aac76ac133f821567a 100644 (file)
--- a/src/util/LockFile.cpp
+++ b/src/util/LockFile.cpp
@@ -21,12 +21,12 @@
 #include "Logging.hpp"
 #include "Util.hpp"
 #include "Win32Util.hpp"
-#include "fmtmacros.hpp"
 
 #include <util/DirEntry.hpp>
 #include <util/assertions.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/process.hpp>
 #include <util/wincompat.hpp>
 

diff --git a/src/util/TemporaryFile.cpp b/src/util/TemporaryFile.cpp
index 04115e8db1f552ad13f3882e260496584fff6973..2c946a8341712b36cb049971b395988927cd68ac 100644 (file)
--- a/src/util/TemporaryFile.cpp
+++ b/src/util/TemporaryFile.cpp
@@ -18,9 +18,9 @@
 
 #include "TemporaryFile.hpp"
 
-#include <fmtmacros.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/process.hpp>
 
 #include <cstdlib>

diff --git a/src/util/assertions.cpp b/src/util/assertions.cpp
index f5486a0357283985d237f719adec81cb4354c101..a84cb59b579faa06baa06283c07ea159c1077e2f 100644 (file)
--- a/src/util/assertions.cpp
+++ b/src/util/assertions.cpp
@@ -17,9 +17,9 @@
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 #include "Util.hpp"
-#include "fmtmacros.hpp"
 
 #include <util/assertions.hpp>
+#include <util/fmtmacros.hpp>
 
 #include "third_party/fmt/core.h"
 

diff --git a/src/util/environment.cpp b/src/util/environment.cpp
index 57e0470ae3ba5de29d659b7134260bc3d81741e5..3baca88f4f0e23646a5ef225bc808c36be0e4a58 100644 (file)
--- a/src/util/environment.cpp
+++ b/src/util/environment.cpp
@@ -18,7 +18,7 @@
 
 #include "environment.hpp"
 
-#include <fmtmacros.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/wincompat.hpp>
 
 namespace util {

diff --git a/src/util/expected.hpp b/src/util/expected.hpp
index f1e8469e9b014e73480d830034ed28310b650e68..5e4385ef211649c69fd086673d0797f1e9729c94 100644 (file)
--- a/src/util/expected.hpp
+++ b/src/util/expected.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <fmtmacros.hpp>
+#include <util/fmtmacros.hpp>
 
 #include <string_view>
 #include <utility>

diff --git a/src/util/file.cpp b/src/util/file.cpp
index 76d2b18c2b2488787250827771091945e8fffb7c..fdc211214f3b1c3b52df0352db61a36a579bd633 100644 (file)
--- a/src/util/file.cpp
+++ b/src/util/file.cpp
@@ -20,7 +20,6 @@
 
 #include <Logging.hpp>
 #include <Win32Util.hpp>
-#include <fmtmacros.hpp>
 #include <util/Bytes.hpp>
 #include <util/DirEntry.hpp>
 #include <util/Fd.hpp>
@@ -29,6 +28,7 @@
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.hpp>
 
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>

diff --git a/src/fmtmacros.hpp b/src/util/fmtmacros.hpp
similarity index 100%
rename from src/fmtmacros.hpp
rename to src/util/fmtmacros.hpp

diff --git a/src/util/path.cpp b/src/util/path.cpp
index c9891d6e7d9fe739413ce12f6251d1114271dcf9..ba2ad669c55796d3e34dec071fb238c48a063efe 100644 (file)
--- a/src/util/path.cpp
+++ b/src/util/path.cpp
@@ -19,9 +19,9 @@
 #include "path.hpp"
 
 #include <Util.hpp>
-#include <fmtmacros.hpp>
 #include <util/DirEntry.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/string.hpp>
 
 #ifdef _WIN32

diff --git a/src/util/string.cpp b/src/util/string.cpp
index 21139ab96cb9959a3db62b16ae630c811bdcb15d..8db2f04642babc2d0fbca9d014c625986392f7a4 100644 (file)
--- a/src/util/string.cpp
+++ b/src/util/string.cpp
@@ -18,8 +18,8 @@
 
 #include "string.hpp"
 
-#include <fmtmacros.hpp>
 #include <util/assertions.hpp>
+#include <util/fmtmacros.hpp>
 
 #include <algorithm>
 #include <cctype>

diff --git a/unittest/TestUtil.cpp b/unittest/TestUtil.cpp
index 0cd9add6e5f6115fd8413d6ac74c6b14f3a24a64..8f0c0a0b2629045542e4a938109d52003949f51a 100644 (file)
--- a/unittest/TestUtil.cpp
+++ b/unittest/TestUtil.cpp
@@ -21,8 +21,8 @@
 #include "../src/Util.hpp"
 
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/path.hpp>
 #include <util/wincompat.hpp>
 

diff --git a/unittest/main.cpp b/unittest/main.cpp
index 4a97f2d941f51b9a9f22e1751b559831908a71e1..034fd5ec2a3a173fdb97386a387b4f3670d2980a 100644 (file)
--- a/unittest/main.cpp
+++ b/unittest/main.cpp
@@ -16,10 +16,9 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "../src/fmtmacros.hpp"
-
 #include <util/environment.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/path.hpp>
 
 #include "third_party/fmt/core.h"

diff --git a/unittest/test_Config.cpp b/unittest/test_Config.cpp
index ae2dc9094774052ed40674c556456fee771fcffc..683e8c4476ee2c84ed11a83dcfa1fce824b1112d 100644 (file)
--- a/unittest/test_Config.cpp
+++ b/unittest/test_Config.cpp
@@ -18,12 +18,12 @@
 
 #include "../src/Config.hpp"
 #include "../src/Util.hpp"
-#include "../src/fmtmacros.hpp"
 #include "TestUtil.hpp"
 
 #include <core/exceptions.hpp>
 #include <util/environment.hpp>
 #include <util/file.hpp>
+#include <util/fmtmacros.hpp>
 
 #include "third_party/doctest.h"
 #include "third_party/fmt/core.h"

diff --git a/unittest/test_Depfile.cpp b/unittest/test_Depfile.cpp
index 1915399e46541072112753f2fcab7290812391b9..8540610c9c5fa7ea336c0346ed4ed61a37c26c25 100644 (file)
--- a/unittest/test_Depfile.cpp
+++ b/unittest/test_Depfile.cpp
@@ -18,10 +18,10 @@
 
 #include "../src/Context.hpp"
 #include "../src/Depfile.hpp"
-#include "../src/fmtmacros.hpp"
 #include "TestUtil.hpp"
 
 #include <Util.hpp>
+#include <util/fmtmacros.hpp>
 
 #include "third_party/doctest.h"
 

diff --git a/unittest/test_Util.cpp b/unittest/test_Util.cpp
index da77138046fdd32b0a3e233b810956d269ab7be0..d258e2e5ebb7fac02b01c48262b672fc8f1b0b50 100644 (file)
--- a/unittest/test_Util.cpp
+++ b/unittest/test_Util.cpp
@@ -18,13 +18,13 @@
 
 #include "../src/Config.hpp"
 #include "../src/Util.hpp"
-#include "../src/fmtmacros.hpp"
 #include "TestUtil.hpp"
 
 #include <core/exceptions.hpp>
 #include <util/environment.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/path.hpp>
 #include <util/wincompat.hpp>
 

diff --git a/unittest/test_argprocessing.cpp b/unittest/test_argprocessing.cpp
index 7da1844449933d26d55c43bd8bf92ec90783f867..f9941be2f99ed41789eba9df1822bdfa88572691 100644 (file)
--- a/unittest/test_argprocessing.cpp
+++ b/unittest/test_argprocessing.cpp
@@ -19,13 +19,13 @@
 #include "../src/Args.hpp"
 #include "../src/Config.hpp"
 #include "../src/Context.hpp"
-#include "../src/fmtmacros.hpp"
 #include "TestUtil.hpp"
 #include "argprocessing.hpp"
 
 #include <Util.hpp>
 #include <core/Statistic.hpp>
 #include <util/file.hpp>
+#include <util/fmtmacros.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 e0172a5688d1a19a4b2d5ae1f3eee60616f22e71..d2fd04be5b879e2309604a90cdbed60b08527a5a 100644 (file)
--- a/unittest/test_ccache.cpp
+++ b/unittest/test_ccache.cpp
@@ -18,10 +18,10 @@
 
 #include "../src/Context.hpp"
 #include "../src/ccache.hpp"
-#include "../src/fmtmacros.hpp"
 #include "TestUtil.hpp"
 
 #include <util/file.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/path.hpp>
 #include <util/wincompat.hpp>
 

diff --git a/unittest/test_storage_local_StatsFile.cpp b/unittest/test_storage_local_StatsFile.cpp
index 3135b09e766ae2db8d48e59d7199f393386705f7..83cf9c638a2987ce442d1256d6599c2b615f8fb0 100644 (file)
--- a/unittest/test_storage_local_StatsFile.cpp
+++ b/unittest/test_storage_local_StatsFile.cpp
@@ -20,9 +20,9 @@
 
 #include <Util.hpp>
 #include <core/Statistic.hpp>
-#include <fmtmacros.hpp>
 #include <storage/local/StatsFile.hpp>
 #include <util/file.hpp>
+#include <util/fmtmacros.hpp>
 
 #include <third_party/doctest.h>
 

diff --git a/unittest/test_storage_local_util.cpp b/unittest/test_storage_local_util.cpp
index b44468709782bed068877e72698c1f1d63bad5ed..e5c40b6b550a192d8e0429525fb6b40bd2ccee76 100644 (file)
--- a/unittest/test_storage_local_util.cpp
+++ b/unittest/test_storage_local_util.cpp
@@ -18,10 +18,10 @@
 
 #include "TestUtil.hpp"
 
-#include <fmtmacros.hpp>
 #include <storage/local/util.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.hpp>
 
 #include <third_party/doctest.h>
 

diff --git a/unittest/test_util_file.cpp b/unittest/test_util_file.cpp
index 30936b6f368656fe55ba62c7ae5fce04f2821b2d..67982d80955e456df36c9762a92ae75b555b096b 100644 (file)
--- a/unittest/test_util_file.cpp
+++ b/unittest/test_util_file.cpp
@@ -18,12 +18,12 @@
 
 #include "TestUtil.hpp"
 
-#include <fmtmacros.hpp>
 #include <util/Bytes.hpp>
 #include <util/DirEntry.hpp>
 #include <util/Fd.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.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 f781ff4e2d3e6cec886d0db15c4ff77a18ac80a8..12ee2aa25f552beb30d26a2d6a25245cae159303 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 <fmtmacros.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/path.hpp>
 
 #include <third_party/doctest.h>