Remove redundant _utils suffix for util headers

diff --git a/src/Args.cpp b/src/Args.cpp
index 8f5bc5fc4c38dcc1eb1cfe97384f2ee3ff98a23a..85405f2efbba5480cfa35566dac4f87ada2c17c3 100644 (file)
--- 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 cee49b3949904bc488ad97b5fcbce73c84b5cbef..5d28d293756dd8118d1587e09e7a4698875c4cfa 100644 (file)
--- 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 931d247600c04b0af5a203c3eff8c52437ea6b24..d9780e8c17d5635111714685402d7a7bbc524255 100644 (file)
--- 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 ff5ce124114024c90426d201fcd5f73cfc92ff4e..66bd75cbd193124213dc0c632a490f890f384b57 100644 (file)
--- 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 7afe044944d65e92187b890d67510d00b619980a..e1f7aabf22990340938d8721a62e567ffaec6426 100644 (file)
--- 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 a5c66fc5812985ff8d9f6ce682c793b562be5be6..4d541ffef873c9a9f31ed67f166ed9ee67f932be 100644 (file)
--- 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 cce67c8b0fcdff441ff50c1cd765a7e4befe33f6..d5173bdbb392e0fe537d1886b8a0fa57d66d49a0 100644 (file)
--- 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 2d5c6915dd8df17dd73c424cc3a706600d1cfbc4..886926bf1d92bec10e5d96d7b4776c2181551fa1 100644 (file)
--- 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 7b942ce8f6ea1f67571859a00ef6286a1c49e064..c1052af51444ae4cae6e48d660e5aa4f98af5648 100644 (file)
--- 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 286a08d4648bbc2a14ae54163e8115ac1f453324..817c6653dbf64c5f2c53ba88e2143778ea0c9bbf 100644 (file)
--- 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 1aa27ad067280f0c14bf9939b516f131c4f71d55..274a101feca1a2b161ccf6bf83b9e01920fddbca 100644 (file)
--- 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 6dac7644081f6f8e38712edab8c5144c4d22e3b0..f6fa14dd163645784010e504b9596a5638200aeb 100644 (file)
--- 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 c21677c4dab7ed7d8220155d948f0d826be53ce1..074eaa571445839cdf208f8ae48f6b044d133c84 100644 (file)
--- 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 e0224f731c60cf255dacb0a2b67ff0ac6d19044c..48d598c4f1a64dc2d756f41ac7e385038fd3dcbd 100644 (file)
--- 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 027f2bff8e5cddfc32a70a4734fa0f45b3961eee..9a6e3a7f1a552082e84c6f37f7abd3767073c565 100644 (file)
--- 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 9eb168fa4a6c8d4d50b1fdb9f916a0d9ad0f0200..cdf21f114f69c60c93255ff132e01153ca9f3de8 100644 (file)
--- 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 c5c4a6220749bff2bd9e330ce5d09d023b29070c..540dc5446c1f9b8686deb5cc90a4c00be20790df 100644 (file)
--- 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 c181817f2ae49c5bdadba5ddd23d135969515843..4c8eedc95a486c38357cc478b683697fbb8cf24b 100644 (file)
--- 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 669f92b07cc93728ddcce3458583b3f06ee1fe51..6912ad654b78e72c6041f95e4dd908cb3c0f5a67 100644 (file)
--- 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 a7a6ca9c3bc19dfc7922858f2fae7a3e52bf4506..27cc5cda77494028a75a5b4bf5902106217acb3e 100644 (file)
--- 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 2d6b80f08f878c6184ff663142a0f14186f3c2e3..e689bd20f52d22643294a2598c928fe785c4df7b 100644 (file)
--- 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 237c61a011fde47bbdcb2950e82509cace0616e6..cb68f03c7c7e9515d350e7e0410034ff1c830e10 100644 (file)
--- 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 a9ef05e51565c4bf9a04189baab4fc77a2e409e1..7c57b4166fbab5b258a7c5f484f48c32f2bfbee9 100644 (file)
--- 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 316ea4bf275d2ccb1df7bf9b51b92bcee23e9a24..74f8527034acd825263877aa5beeab2f8f913dbd 100644 (file)
--- 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 b49f80935d0fbdef7c23375f4e01e016f642ea02..ea3f3359030c223ad34f114836fe992c586e333c 100644 (file)
--- 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 058e3a4163e9ea57ed874dc4e1a68eae291d25d6..e53238ef612f3118d32dc50beeb157b1d3fd01b0 100644 (file)
--- 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>