refactor: Move assertions to util

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2bf8e36ebc58373528625a334e481058795523a3..5c6dc11781b9dd975e2e81fdcc002729f883f03a 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,7 +9,6 @@ set(
   ProgressBar.cpp
   Util.cpp
   argprocessing.cpp
-  assertions.cpp
   ccache.cpp
   compopt.cpp
   execute.cpp

diff --git a/src/Config.cpp b/src/Config.cpp
index 4106775349f362c5b6f6b21060f8d1f5706854b5..ca27da956fbe0c24cfaeef22c1587eab1afd8394 100644 (file)
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -20,7 +20,6 @@
 
 #include "MiniTrace.hpp"
 #include "Util.hpp"
-#include "assertions.hpp"
 
 #include <core/AtomicFile.hpp>
 #include <core/common.hpp>
@@ -30,6 +29,7 @@
 #include <util/DirEntry.hpp>
 #include <util/Tokenizer.hpp>
 #include <util/UmaskScope.hpp>
+#include <util/assertions.hpp>
 #include <util/environment.hpp>
 #include <util/expected.hpp>
 #include <util/file.hpp>

diff --git a/src/Depfile.cpp b/src/Depfile.cpp
index 064e2124ff331bdacaafb0b64432ffb50162b9da..d120425d840386ddae02565de4ad4ba76bf2c064 100644 (file)
--- a/src/Depfile.cpp
+++ b/src/Depfile.cpp
@@ -21,11 +21,11 @@
 #include "Context.hpp"
 #include "Hash.hpp"
 #include "Logging.hpp"
-#include "assertions.hpp"
 
 #include <Util.hpp>
 #include <core/exceptions.hpp>
 #include <util/Tokenizer.hpp>
+#include <util/assertions.hpp>
 #include <util/file.hpp>
 #include <util/path.hpp>
 #include <util/string.hpp>

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

diff --git a/src/SignalHandler.cpp b/src/SignalHandler.cpp
index acfa2e3f65f0e87e38349509c8e2ca783d9a2549..50d3760a09405c2d1b3e412cbc2b76e587f16c17 100644 (file)
--- a/src/SignalHandler.cpp
+++ b/src/SignalHandler.cpp
@@ -19,7 +19,8 @@
 #include "SignalHandler.hpp"
 
 #include "Context.hpp"
-#include "assertions.hpp"
+
+#include <util/assertions.hpp>
 
 #include <signal.h> // NOLINT: sigaddset et al are defined in signal.h
 #include <sys/types.h>

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

diff --git a/src/core/AtomicFile.cpp b/src/core/AtomicFile.cpp
index b95c6685d4978c91d86678d22fd5b51b28ef3c5d..c827993b2f9e5384a4e34f7fa01c1bcfd3a18b91 100644 (file)
--- a/src/core/AtomicFile.cpp
+++ b/src/core/AtomicFile.cpp
@@ -16,11 +16,11 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include <assertions.hpp>
 #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>

diff --git a/src/core/StatisticsCounters.cpp b/src/core/StatisticsCounters.cpp
index f0361719c44767f14d800cf093be7acb4e802b8f..3c08a27144af71481317e9e887fafd2510ced3e6 100644 (file)
--- a/src/core/StatisticsCounters.cpp
+++ b/src/core/StatisticsCounters.cpp
@@ -18,7 +18,7 @@
 
 #include "StatisticsCounters.hpp"
 
-#include <assertions.hpp>
+#include <util/assertions.hpp>
 
 #include <algorithm>
 

diff --git a/src/core/mainoptions.cpp b/src/core/mainoptions.cpp
index 1460246e0e063cc93461fa94f9e2ed8cd3a3cea4..d8134e6d1f221d8b7e01a0e871de7fa8858e1b6b 100644 (file)
--- a/src/core/mainoptions.cpp
+++ b/src/core/mainoptions.cpp
@@ -25,7 +25,6 @@
 #include <Logging.hpp>
 #include <ProgressBar.hpp>
 #include <Util.hpp>
-#include <assertions.hpp>
 #include <ccache.hpp>
 #include <core/CacheEntry.hpp>
 #include <core/FileRecompressor.hpp>
@@ -45,6 +44,7 @@
 #include <util/ThreadPool.hpp>
 #include <util/UmaskScope.hpp>
 #include <util/XXH3_128.hpp>
+#include <util/assertions.hpp>
 #include <util/environment.hpp>
 #include <util/expected.hpp>
 #include <util/file.hpp>

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

diff --git a/src/storage/Storage.cpp b/src/storage/Storage.cpp
index 65ce3a70ffbd0e6050b72c1343f57d87299de6af..889ca98e255b4b843a3456cfded8b3115403cdd5 100644 (file)
--- a/src/storage/Storage.cpp
+++ b/src/storage/Storage.cpp
@@ -22,13 +22,13 @@
 #include <Logging.hpp>
 #include <MiniTrace.hpp>
 #include <Util.hpp>
-#include <assertions.hpp>
 #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>
 #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 3a4701abe648061bbc0385f56bd8725ce04f4239..b87cf6fffcf9698fb5f2c9c773424f7ac1a9d933 100644 (file)
--- a/src/storage/local/LocalStorage.cpp
+++ b/src/storage/local/LocalStorage.cpp
@@ -24,7 +24,6 @@
 #include <Logging.hpp>
 #include <MiniTrace.hpp>
 #include <Util.hpp>
-#include <assertions.hpp>
 #include <core/AtomicFile.hpp>
 #include <core/CacheEntry.hpp>
 #include <core/FileRecompressor.hpp>
@@ -37,6 +36,7 @@
 #include <util/TemporaryFile.hpp>
 #include <util/TextTable.hpp>
 #include <util/ThreadPool.hpp>
+#include <util/assertions.hpp>
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>

diff --git a/src/storage/remote/FileStorage.cpp b/src/storage/remote/FileStorage.cpp
index 3866fed6a708bd25e1864d6788df0272a50866d9..221dcdc68d15911f0d13e3c526d2ca4758639963 100644 (file)
--- a/src/storage/remote/FileStorage.cpp
+++ b/src/storage/remote/FileStorage.cpp
@@ -20,13 +20,13 @@
 
 #include <Logging.hpp>
 #include <Util.hpp>
-#include <assertions.hpp>
 #include <core/AtomicFile.hpp>
 #include <core/exceptions.hpp>
 #include <fmtmacros.hpp>
 #include <util/Bytes.hpp>
 #include <util/DirEntry.hpp>
 #include <util/UmaskScope.hpp>
+#include <util/assertions.hpp>
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>

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

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

diff --git a/src/util/Bytes.cpp b/src/util/Bytes.cpp
index 1cde9739e69850c648bd0d9d8bc436a92a242171..1b4007e52d2f247eec97bfe690464339dc6dceaf 100644 (file)
--- a/src/util/Bytes.cpp
+++ b/src/util/Bytes.cpp
@@ -18,7 +18,7 @@
 
 #include "Bytes.hpp"
 
-#include <assertions.hpp>
+#include <util/assertions.hpp>
 
 namespace util {
 

diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index deb2cad65e75b34c117b4cb6b53972edafd24511..c22a0eec57677f1c7f2f734a77f6bd2cab6b0224 100644 (file)
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -10,6 +10,7 @@ set(
   TimePoint.cpp
   Tokenizer.cpp
   UmaskScope.cpp
+  assertions.cpp
   environment.cpp
   file.cpp
   filesystem.cpp

diff --git a/src/util/Fd.hpp b/src/util/Fd.hpp
index 14d5aa27feae241150c3aec5ee375e2439d7cbe7..87d04a65c16915a18c96b70a786ff5e56d8c00f4 100644 (file)
--- a/src/util/Fd.hpp
+++ b/src/util/Fd.hpp
@@ -19,7 +19,7 @@
 #pragma once
 
 #include <NonCopyable.hpp>
-#include <assertions.hpp>
+#include <util/assertions.hpp>
 #include <util/wincompat.hpp>
 
 #ifdef HAVE_UNISTD_H

diff --git a/src/util/LockFile.cpp b/src/util/LockFile.cpp
index eb1fd9eae824ec192d8a2464201cc7b1864cbd43..188f337d125084fa33a7e1aba7af94d7fda4a770 100644 (file)
--- a/src/util/LockFile.cpp
+++ b/src/util/LockFile.cpp
@@ -23,8 +23,8 @@
 #include "Win32Util.hpp"
 #include "fmtmacros.hpp"
 
-#include <assertions.hpp>
 #include <util/DirEntry.hpp>
+#include <util/assertions.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
 #include <util/process.hpp>

diff --git a/src/util/TextTable.cpp b/src/util/TextTable.cpp
index c7fd17f22dc5f4a343a21d3f83c50ee39e7f462f..e2e24f70ccc223b4a4aaff1c5148e8c45084ccc7 100644 (file)
--- a/src/util/TextTable.cpp
+++ b/src/util/TextTable.cpp
@@ -18,7 +18,7 @@
 
 #include "TextTable.hpp"
 
-#include <assertions.hpp>
+#include <util/assertions.hpp>
 
 #include <third_party/fmt/core.h>
 

diff --git a/src/util/Tokenizer.hpp b/src/util/Tokenizer.hpp
index 624a8057fcf05f3c923fc03407361d2c99090e06..3cf1748d3abb719ffe9e5f70e94f2e27f320b9be 100644 (file)
--- a/src/util/Tokenizer.hpp
+++ b/src/util/Tokenizer.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <assertions.hpp>
+#include <util/assertions.hpp>
 
 #include <third_party/fmt/core.h>
 

diff --git a/src/assertions.cpp b/src/util/assertions.cpp
similarity index 90%
rename from src/assertions.cpp
rename to src/util/assertions.cpp
index 2229d4f04c4b3d8fe55421f4d47e51137b974069..f5486a0357283985d237f719adec81cb4354c101 100644 (file)
--- a/src/assertions.cpp
+++ b/src/util/assertions.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2020 Joel Rosdahl and other contributors
+// Copyright (C) 2020-2023 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -16,13 +16,15 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "assertions.hpp"
-
 #include "Util.hpp"
 #include "fmtmacros.hpp"
 
+#include <util/assertions.hpp>
+
 #include "third_party/fmt/core.h"
 
+namespace util {
+
 void
 handle_failed_assertion(const char* file,
                         size_t line,
@@ -37,3 +39,4 @@ handle_failed_assertion(const char* file,
         condition);
   abort();
 }
+} // namespace util

diff --git a/src/assertions.hpp b/src/util/assertions.hpp
similarity index 92%
rename from src/assertions.hpp
rename to src/util/assertions.hpp
index d88cb10f5675b6a3a15d6fafe7b4a584bc10f0d6..cf898831592a2571b60ddde1a22f67fe6fe981c3 100644 (file)
--- a/src/assertions.hpp
+++ b/src/util/assertions.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2021 Joel Rosdahl and other contributors
+// Copyright (C) 2020-2023 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -31,7 +31,7 @@
 #define ASSERT(condition)                                                      \
   do {                                                                         \
     if (!(condition)) {                                                        \
-      handle_failed_assertion(                                                 \
+      util::handle_failed_assertion(                                           \
         __FILE__, __LINE__, CCACHE_FUNCTION, #condition);                      \
     }                                                                          \
   } while (false)
@@ -44,7 +44,11 @@
 #  define DEBUG_ASSERT(condition) ASSERT(condition)
 #endif
 
+namespace util {
+
 [[noreturn]] void handle_failed_assertion(const char* file,
                                           size_t line,
                                           const char* function,
                                           const char* condition);
+
+}

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