From: Joel Rosdahl <joel@rosdahl.net>
Date: Wed, 14 Jul 2021 08:10:10 +0000 (+0200)
Subject: Remove redundant _utils suffix for util headers
X-Git-Tag: v4.4~116
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=303c82fea7b45f497ef10e9af851d8411e4386cc;p=thirdparty%2Fccache.git

Remove redundant _utils suffix for util headers
---

diff --git a/src/Args.cpp b/src/Args.cpp
index 8f5bc5fc4..85405f2ef 100644
--- a/src/Args.cpp
+++ b/src/Args.cpp
@@ -20,7 +20,7 @@
 
 #include "Util.hpp"
 
-#include <util/string_utils.hpp>
+#include <util/string.hpp>
 
 using nonstd::nullopt;
 using nonstd::optional;
diff --git a/src/CacheFile.cpp b/src/CacheFile.cpp
index cee49b394..5d28d2937 100644
--- a/src/CacheFile.cpp
+++ b/src/CacheFile.cpp
@@ -21,7 +21,7 @@
 #include "Manifest.hpp"
 #include "Result.hpp"
 
-#include <util/string_utils.hpp>
+#include <util/string.hpp>
 
 const Stat&
 CacheFile::lstat() const
diff --git a/src/Config.cpp b/src/Config.cpp
index 931d24760..d9780e8c1 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -28,9 +28,9 @@
 #include "fmtmacros.hpp"
 
 #include <core/wincompat.hpp>
-#include <util/expected_utils.hpp>
-#include <util/path_utils.hpp>
-#include <util/string_utils.hpp>
+#include <util/expected.hpp>
+#include <util/path.hpp>
+#include <util/string.hpp>
 
 #include "third_party/fmt/core.h"
 
diff --git a/src/Context.cpp b/src/Context.cpp
index ff5ce1241..66bd75cbd 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -25,7 +25,7 @@
 #include "hashutil.hpp"
 
 #include <core/wincompat.hpp>
-#include <util/path_utils.hpp>
+#include <util/path.hpp>
 
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
diff --git a/src/Depfile.cpp b/src/Depfile.cpp
index 7afe04494..e1f7aabf2 100644
--- a/src/Depfile.cpp
+++ b/src/Depfile.cpp
@@ -23,7 +23,7 @@
 #include "Logging.hpp"
 #include "assertions.hpp"
 
-#include <util/path_utils.hpp>
+#include <util/path.hpp>
 
 static inline bool
 is_blank(const std::string& s)
diff --git a/src/Result.cpp b/src/Result.cpp
index a5c66fc58..4d541ffef 100644
--- a/src/Result.cpp
+++ b/src/Result.cpp
@@ -33,7 +33,7 @@
 #include "fmtmacros.hpp"
 
 #include <core/wincompat.hpp>
-#include <util/path_utils.hpp>
+#include <util/path.hpp>
 
 #include <fcntl.h>
 #include <sys/stat.h>
diff --git a/src/Util.cpp b/src/Util.cpp
index cce67c8b0..d5173bdbb 100644
--- a/src/Util.cpp
+++ b/src/Util.cpp
@@ -28,8 +28,8 @@
 #include "fmtmacros.hpp"
 
 #include <core/wincompat.hpp>
-#include <util/path_utils.hpp>
-#include <util/string_utils.hpp>
+#include <util/path.hpp>
+#include <util/string.hpp>
 
 extern "C" {
 #include "third_party/base32hex.h"
diff --git a/src/argprocessing.cpp b/src/argprocessing.cpp
index 2d5c6915d..886926bf1 100644
--- a/src/argprocessing.cpp
+++ b/src/argprocessing.cpp
@@ -27,7 +27,7 @@
 #include "language.hpp"
 
 #include <core/wincompat.hpp>
-#include <util/string_utils.hpp>
+#include <util/string.hpp>
 
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
diff --git a/src/ccache.cpp b/src/ccache.cpp
index 7b942ce8f..c1052af51 100644
--- a/src/ccache.cpp
+++ b/src/ccache.cpp
@@ -57,9 +57,9 @@
 
 #include <core/types.hpp>
 #include <core/wincompat.hpp>
-#include <util/expected_utils.hpp>
-#include <util/path_utils.hpp>
-#include <util/string_utils.hpp>
+#include <util/expected.hpp>
+#include <util/path.hpp>
+#include <util/string.hpp>
 
 #include "third_party/fmt/core.h"
 #include "third_party/nonstd/optional.hpp"
diff --git a/src/cleanup.cpp b/src/cleanup.cpp
index 286a08d46..817c6653d 100644
--- a/src/cleanup.cpp
+++ b/src/cleanup.cpp
@@ -26,7 +26,7 @@
 #include "Statistics.hpp"
 #include "Util.hpp"
 
-#include <util/string_utils.hpp>
+#include <util/string.hpp>
 
 #ifdef INODE_CACHE_SUPPORTED
 #  include "InodeCache.hpp"
diff --git a/src/compress.cpp b/src/compress.cpp
index 1aa27ad06..274a101fe 100644
--- a/src/compress.cpp
+++ b/src/compress.cpp
@@ -33,7 +33,7 @@
 #include "fmtmacros.hpp"
 
 #include <core/wincompat.hpp>
-#include <util/string_utils.hpp>
+#include <util/string.hpp>
 
 #include "third_party/fmt/core.h"
 
diff --git a/src/execute.cpp b/src/execute.cpp
index 6dac76440..f6fa14dd1 100644
--- a/src/execute.cpp
+++ b/src/execute.cpp
@@ -31,7 +31,7 @@
 #include "fmtmacros.hpp"
 
 #include <core/wincompat.hpp>
-#include <util/path_utils.hpp>
+#include <util/path.hpp>
 
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
diff --git a/src/hashutil.cpp b/src/hashutil.cpp
index c21677c4d..074eaa571 100644
--- a/src/hashutil.cpp
+++ b/src/hashutil.cpp
@@ -32,7 +32,7 @@
 #include "macroskip.hpp"
 
 #include <core/wincompat.hpp>
-#include <util/string_utils.hpp>
+#include <util/string.hpp>
 
 #ifdef INODE_CACHE_SUPPORTED
 #  include "InodeCache.hpp"
diff --git a/src/storage/Storage.cpp b/src/storage/Storage.cpp
index e0224f731..48d598c4f 100644
--- a/src/storage/Storage.cpp
+++ b/src/storage/Storage.cpp
@@ -30,7 +30,7 @@
 #  include <storage/secondary/RedisStorage.hpp>
 #endif
 #include <util/Tokenizer.hpp>
-#include <util/string_utils.hpp>
+#include <util/string.hpp>
 
 #include <third_party/url.hpp>
 
diff --git a/src/storage/primary/PrimaryStorage.cpp b/src/storage/primary/PrimaryStorage.cpp
index 027f2bff8..9a6e3a7f1 100644
--- a/src/storage/primary/PrimaryStorage.cpp
+++ b/src/storage/primary/PrimaryStorage.cpp
@@ -30,7 +30,7 @@
 #include <core/wincompat.hpp>
 #include <exceptions.hpp>
 #include <fmtmacros.hpp>
-#include <util/file_utils.hpp>
+#include <util/file.hpp>
 
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
diff --git a/src/storage/secondary/FileStorage.cpp b/src/storage/secondary/FileStorage.cpp
index 9eb168fa4..cdf21f114 100644
--- a/src/storage/secondary/FileStorage.cpp
+++ b/src/storage/secondary/FileStorage.cpp
@@ -25,8 +25,8 @@
 #include <Util.hpp>
 #include <assertions.hpp>
 #include <fmtmacros.hpp>
-#include <util/file_utils.hpp>
-#include <util/string_utils.hpp>
+#include <util/file.hpp>
+#include <util/string.hpp>
 
 #include <third_party/nonstd/string_view.hpp>
 
diff --git a/src/storage/secondary/HttpStorage.cpp b/src/storage/secondary/HttpStorage.cpp
index c5c4a6220..540dc5446 100644
--- a/src/storage/secondary/HttpStorage.cpp
+++ b/src/storage/secondary/HttpStorage.cpp
@@ -23,8 +23,8 @@
 #include <ccache.hpp>
 #include <exceptions.hpp>
 #include <fmtmacros.hpp>
-#include <util/expected_utils.hpp>
-#include <util/string_utils.hpp>
+#include <util/expected.hpp>
+#include <util/string.hpp>
 
 #include <third_party/httplib.h>
 #include <third_party/nonstd/string_view.hpp>
diff --git a/src/storage/secondary/RedisStorage.cpp b/src/storage/secondary/RedisStorage.cpp
index c181817f2..4c8eedc95 100644
--- a/src/storage/secondary/RedisStorage.cpp
+++ b/src/storage/secondary/RedisStorage.cpp
@@ -21,8 +21,8 @@
 #include <Digest.hpp>
 #include <Logging.hpp>
 #include <fmtmacros.hpp>
-#include <util/expected_utils.hpp>
-#include <util/string_utils.hpp>
+#include <util/expected.hpp>
+#include <util/string.hpp>
 
 #include <hiredis/hiredis.h>
 
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index 669f92b07..6912ad654 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -1,9 +1,9 @@
 set(
   sources
   ${CMAKE_CURRENT_SOURCE_DIR}/Tokenizer.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/file_utils.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/path_utils.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/string_utils.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/file.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/path.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/string.cpp
 )
 
 target_sources(ccache_lib PRIVATE ${sources})
diff --git a/src/util/expected_utils.hpp b/src/util/expected.hpp
similarity index 100%
rename from src/util/expected_utils.hpp
rename to src/util/expected.hpp
diff --git a/src/util/file_utils.cpp b/src/util/file.cpp
similarity index 98%
rename from src/util/file_utils.cpp
rename to src/util/file.cpp
index a7a6ca9c3..27cc5cda7 100644
--- a/src/util/file_utils.cpp
+++ b/src/util/file.cpp
@@ -16,7 +16,7 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "file_utils.hpp"
+#include "file.hpp"
 
 #include <Logging.hpp>
 #include <Util.hpp>
diff --git a/src/util/file_utils.hpp b/src/util/file.hpp
similarity index 100%
rename from src/util/file_utils.hpp
rename to src/util/file.hpp
diff --git a/src/util/path_utils.cpp b/src/util/path.cpp
similarity index 98%
rename from src/util/path_utils.cpp
rename to src/util/path.cpp
index 2d6b80f08..e689bd20f 100644
--- a/src/util/path_utils.cpp
+++ b/src/util/path.cpp
@@ -16,7 +16,7 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "path_utils.hpp"
+#include "path.hpp"
 
 #include <Util.hpp>
 #include <fmtmacros.hpp>
diff --git a/src/util/path_utils.hpp b/src/util/path.hpp
similarity index 100%
rename from src/util/path_utils.hpp
rename to src/util/path.hpp
diff --git a/src/util/string_utils.cpp b/src/util/string.cpp
similarity index 99%
rename from src/util/string_utils.cpp
rename to src/util/string.cpp
index 237c61a01..cb68f03c7 100644
--- a/src/util/string_utils.cpp
+++ b/src/util/string.cpp
@@ -16,7 +16,7 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "string_utils.hpp"
+#include "string.hpp"
 
 #include <FormatNonstdStringView.hpp>
 #include <fmtmacros.hpp>
diff --git a/src/util/string_utils.hpp b/src/util/string.hpp
similarity index 100%
rename from src/util/string_utils.hpp
rename to src/util/string.hpp
diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt
index a9ef05e51..7c57b4166 100644
--- a/unittest/CMakeLists.txt
+++ b/unittest/CMakeLists.txt
@@ -22,9 +22,9 @@ set(
   test_compopt.cpp
   test_hashutil.cpp
   test_util_Tokenizer.cpp
-  test_util_expected_utils.cpp
-  test_util_path_utils.cpp
-  test_util_string_utils.cpp
+  test_util_expected.cpp
+  test_util_path.cpp
+  test_util_string.cpp
 )
 
 if(INODE_CACHE_SUPPORTED)
diff --git a/unittest/test_util_expected_utils.cpp b/unittest/test_util_expected.cpp
similarity index 98%
rename from unittest/test_util_expected_utils.cpp
rename to unittest/test_util_expected.cpp
index 316ea4bf2..74f852703 100644
--- a/unittest/test_util_expected_utils.cpp
+++ b/unittest/test_util_expected.cpp
@@ -16,7 +16,7 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include <util/expected_utils.hpp>
+#include <util/expected.hpp>
 
 #include <third_party/doctest.h>
 #include <third_party/nonstd/expected.hpp>
diff --git a/unittest/test_util_path_utils.cpp b/unittest/test_util_path.cpp
similarity index 98%
rename from unittest/test_util_path_utils.cpp
rename to unittest/test_util_path.cpp
index b49f80935..ea3f33590 100644
--- a/unittest/test_util_path_utils.cpp
+++ b/unittest/test_util_path.cpp
@@ -18,7 +18,7 @@
 
 #include <Util.hpp>
 #include <fmtmacros.hpp>
-#include <util/path_utils.hpp>
+#include <util/path.hpp>
 
 #include <third_party/doctest.h>
 
diff --git a/unittest/test_util_string_utils.cpp b/unittest/test_util_string.cpp
similarity index 99%
rename from unittest/test_util_string_utils.cpp
rename to unittest/test_util_string.cpp
index 058e3a416..e53238ef6 100644
--- a/unittest/test_util_string_utils.cpp
+++ b/unittest/test_util_string.cpp
@@ -16,7 +16,7 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include <util/string_utils.hpp>
+#include <util/string.hpp>
 
 #include <third_party/doctest.h>