From 30df1bab79892d70079f630df42b6b9f05ea2de8 Mon Sep 17 00:00:00 2001
From: Joel Rosdahl <joel@rosdahl.net>
Date: Wed, 18 May 2022 20:54:49 +0200
Subject: [PATCH] build: Enable Clang-Tidy modernize-concat-nested-namespaces
 check

---
 src/.clang-tidy                                   | 1 -
 src/storage/primary/PrimaryStorage.cpp            | 6 ++----
 src/storage/primary/PrimaryStorage_cleanup.cpp    | 6 ++----
 src/storage/primary/PrimaryStorage_compress.cpp   | 6 ++----
 src/storage/primary/PrimaryStorage_statistics.cpp | 8 +++-----
 src/storage/primary/StatsFile.cpp                 | 6 ++----
 src/storage/primary/StatsFile.hpp                 | 6 ++----
 src/storage/primary/util.cpp                      | 6 ++----
 src/storage/secondary/FileStorage.cpp             | 6 ++----
 src/storage/secondary/HttpStorage.cpp             | 6 ++----
 src/storage/secondary/HttpStorage.hpp             | 8 +++-----
 src/storage/secondary/RedisStorage.cpp            | 6 ++----
 src/storage/secondary/RedisStorage.hpp            | 8 +++-----
 src/storage/secondary/SecondaryStorage.cpp        | 8 +++-----
 src/storage/secondary/SecondaryStorage.hpp        | 6 ++----
 15 files changed, 32 insertions(+), 61 deletions(-)

diff --git a/src/.clang-tidy b/src/.clang-tidy
index c14120d1a..35c8668be 100644
--- a/src/.clang-tidy
+++ b/src/.clang-tidy
@@ -20,7 +20,6 @@ Checks:          '-*,
                   -performance-unnecessary-value-param,
                   modernize-*,
                   -modernize-avoid-c-arrays,
-                  -modernize-concat-nested-namespaces,
                   -modernize-pass-by-value,
                   -modernize-return-braced-init-list,
                   -modernize-use-auto,
diff --git a/src/storage/primary/PrimaryStorage.cpp b/src/storage/primary/PrimaryStorage.cpp
index 0a6a2997d..c89ebb723 100644
--- a/src/storage/primary/PrimaryStorage.cpp
+++ b/src/storage/primary/PrimaryStorage.cpp
@@ -35,8 +35,7 @@
 
 using core::Statistic;
 
-namespace storage {
-namespace primary {
+namespace storage::primary {
 
 // How often (in seconds) to scan $CCACHE_DIR/tmp for left-over temporary
 // files.
@@ -404,5 +403,4 @@ PrimaryStorage::get_path_in_cache(const uint8_t level,
   return path;
 }
 
-} // namespace primary
-} // namespace storage
+} // namespace storage::primary
diff --git a/src/storage/primary/PrimaryStorage_cleanup.cpp b/src/storage/primary/PrimaryStorage_cleanup.cpp
index e07e44aee..18671ac6f 100644
--- a/src/storage/primary/PrimaryStorage_cleanup.cpp
+++ b/src/storage/primary/PrimaryStorage_cleanup.cpp
@@ -40,8 +40,7 @@
 
 using core::Statistic;
 
-namespace storage {
-namespace primary {
+namespace storage::primary {
 
 static void
 delete_file(const std::string& path,
@@ -278,5 +277,4 @@ PrimaryStorage::wipe_all(const ProgressReceiver& progress_receiver)
   for_each_level_1_subdir(m_config.cache_dir(), wipe_dir, progress_receiver);
 }
 
-} // namespace primary
-} // namespace storage
+} // namespace storage::primary
diff --git a/src/storage/primary/PrimaryStorage_compress.cpp b/src/storage/primary/PrimaryStorage_compress.cpp
index d4a78319b..0d0adf016 100644
--- a/src/storage/primary/PrimaryStorage_compress.cpp
+++ b/src/storage/primary/PrimaryStorage_compress.cpp
@@ -47,8 +47,7 @@
 #include <string>
 #include <thread>
 
-namespace storage {
-namespace primary {
+namespace storage::primary {
 
 namespace {
 
@@ -334,5 +333,4 @@ PrimaryStorage::recompress(const std::optional<int8_t> level,
   PRINT(stdout, "Size change:          {:>9s}\n", size_difference_str);
 }
 
-} // namespace primary
-} // namespace storage
+} // namespace storage::primary
diff --git a/src/storage/primary/PrimaryStorage_statistics.cpp b/src/storage/primary/PrimaryStorage_statistics.cpp
index 99cc4fc46..dc9ff146c 100644
--- a/src/storage/primary/PrimaryStorage_statistics.cpp
+++ b/src/storage/primary/PrimaryStorage_statistics.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 Joel Rosdahl and other contributors
+// Copyright (C) 2021-2022 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -25,8 +25,7 @@
 
 #include <algorithm>
 
-namespace storage {
-namespace primary {
+namespace storage::primary {
 
 static void
 for_each_level_1_and_2_stats_file(
@@ -82,5 +81,4 @@ PrimaryStorage::get_all_statistics() const
   return std::make_pair(counters, last_updated);
 }
 
-} // namespace primary
-} // namespace storage
+} // namespace storage::primary
diff --git a/src/storage/primary/StatsFile.cpp b/src/storage/primary/StatsFile.cpp
index b2a248e80..418e02f10 100644
--- a/src/storage/primary/StatsFile.cpp
+++ b/src/storage/primary/StatsFile.cpp
@@ -25,8 +25,7 @@
 #include <core/exceptions.hpp>
 #include <fmtmacros.hpp>
 
-namespace storage {
-namespace primary {
+namespace storage::primary {
 
 StatsFile::StatsFile(const std::string& path) : m_path(path)
 {
@@ -90,5 +89,4 @@ StatsFile::update(
   return counters;
 }
 
-} // namespace primary
-} // namespace storage
+} // namespace storage::primary
diff --git a/src/storage/primary/StatsFile.hpp b/src/storage/primary/StatsFile.hpp
index 0a8eaaa62..097166724 100644
--- a/src/storage/primary/StatsFile.hpp
+++ b/src/storage/primary/StatsFile.hpp
@@ -24,8 +24,7 @@
 #include <optional>
 #include <string>
 
-namespace storage {
-namespace primary {
+namespace storage::primary {
 
 class StatsFile
 {
@@ -46,5 +45,4 @@ private:
   const std::string m_path;
 };
 
-} // namespace primary
-} // namespace storage
+} // namespace storage::primary
diff --git a/src/storage/primary/util.cpp b/src/storage/primary/util.cpp
index 7d89cb92d..32679ebf8 100644
--- a/src/storage/primary/util.cpp
+++ b/src/storage/primary/util.cpp
@@ -22,8 +22,7 @@
 #include <fmtmacros.hpp>
 #include <util/string.hpp>
 
-namespace storage {
-namespace primary {
+namespace storage::primary {
 
 void
 for_each_level_1_subdir(const std::string& cache_dir,
@@ -73,5 +72,4 @@ get_level_1_files(const std::string& dir,
   return files;
 }
 
-} // namespace primary
-} // namespace storage
+} // namespace storage::primary
diff --git a/src/storage/secondary/FileStorage.cpp b/src/storage/secondary/FileStorage.cpp
index 9ae10c61f..6b3f55ee6 100644
--- a/src/storage/secondary/FileStorage.cpp
+++ b/src/storage/secondary/FileStorage.cpp
@@ -34,8 +34,7 @@
 
 #include <string_view>
 
-namespace storage {
-namespace secondary {
+namespace storage::secondary {
 
 namespace {
 
@@ -189,5 +188,4 @@ FileStorage::create_backend(const Backend::Params& params) const
   return std::make_unique<FileStorageBackend>(params);
 }
 
-} // namespace secondary
-} // namespace storage
+} // namespace storage::secondary
diff --git a/src/storage/secondary/HttpStorage.cpp b/src/storage/secondary/HttpStorage.cpp
index a59948b9e..671a80139 100644
--- a/src/storage/secondary/HttpStorage.cpp
+++ b/src/storage/secondary/HttpStorage.cpp
@@ -31,8 +31,7 @@
 
 #include <string_view>
 
-namespace storage {
-namespace secondary {
+namespace storage::secondary {
 
 namespace {
 
@@ -294,5 +293,4 @@ HttpStorage::redact_secrets(Backend::Params& params) const
   }
 }
 
-} // namespace secondary
-} // namespace storage
+} // namespace storage::secondary
diff --git a/src/storage/secondary/HttpStorage.hpp b/src/storage/secondary/HttpStorage.hpp
index 60c1354e1..32f6345a3 100644
--- a/src/storage/secondary/HttpStorage.hpp
+++ b/src/storage/secondary/HttpStorage.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 Joel Rosdahl and other contributors
+// Copyright (C) 2021-2022 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -20,8 +20,7 @@
 
 #include <storage/secondary/SecondaryStorage.hpp>
 
-namespace storage {
-namespace secondary {
+namespace storage::secondary {
 
 class HttpStorage : public SecondaryStorage
 {
@@ -32,5 +31,4 @@ public:
   void redact_secrets(Backend::Params& params) const override;
 };
 
-} // namespace secondary
-} // namespace storage
+} // namespace storage::secondary
diff --git a/src/storage/secondary/RedisStorage.cpp b/src/storage/secondary/RedisStorage.cpp
index b76622d46..dcc98b579 100644
--- a/src/storage/secondary/RedisStorage.cpp
+++ b/src/storage/secondary/RedisStorage.cpp
@@ -45,8 +45,7 @@
 #include <cstdarg>
 #include <memory>
 
-namespace storage {
-namespace secondary {
+namespace storage::secondary {
 
 namespace {
 
@@ -338,5 +337,4 @@ RedisStorage::redact_secrets(Backend::Params& params) const
   }
 }
 
-} // namespace secondary
-} // namespace storage
+} // namespace storage::secondary
diff --git a/src/storage/secondary/RedisStorage.hpp b/src/storage/secondary/RedisStorage.hpp
index 98794fa2d..01759df78 100644
--- a/src/storage/secondary/RedisStorage.hpp
+++ b/src/storage/secondary/RedisStorage.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 Joel Rosdahl and other contributors
+// Copyright (C) 2021-2022 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -20,8 +20,7 @@
 
 #include <storage/secondary/SecondaryStorage.hpp>
 
-namespace storage {
-namespace secondary {
+namespace storage::secondary {
 
 class RedisStorage : public SecondaryStorage
 {
@@ -32,5 +31,4 @@ public:
   void redact_secrets(Backend::Params& params) const override;
 };
 
-} // namespace secondary
-} // namespace storage
+} // namespace storage::secondary
diff --git a/src/storage/secondary/SecondaryStorage.cpp b/src/storage/secondary/SecondaryStorage.cpp
index c73f19db4..e80042217 100644
--- a/src/storage/secondary/SecondaryStorage.cpp
+++ b/src/storage/secondary/SecondaryStorage.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 Joel Rosdahl and other contributors
+// Copyright (C) 2021-2022 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -21,8 +21,7 @@
 #include <util/expected.hpp>
 #include <util/string.hpp>
 
-namespace storage {
-namespace secondary {
+namespace storage::secondary {
 
 bool
 SecondaryStorage::Backend::is_framework_attribute(const std::string& name)
@@ -37,5 +36,4 @@ SecondaryStorage::Backend::parse_timeout_attribute(const std::string& value)
     util::parse_unsigned(value, 1, 60 * 1000, "timeout")));
 }
 
-} // namespace secondary
-} // namespace storage
+} // namespace storage::secondary
diff --git a/src/storage/secondary/SecondaryStorage.hpp b/src/storage/secondary/SecondaryStorage.hpp
index 7adea4777..64eaf7aed 100644
--- a/src/storage/secondary/SecondaryStorage.hpp
+++ b/src/storage/secondary/SecondaryStorage.hpp
@@ -31,8 +31,7 @@
 
 class Digest;
 
-namespace storage {
-namespace secondary {
+namespace storage::secondary {
 
 constexpr auto k_redacted_password = "********";
 const auto k_default_connect_timeout = std::chrono::milliseconds{100};
@@ -143,5 +142,4 @@ SecondaryStorage::Backend::Failed::failure() const
   return m_failure;
 }
 
-} // namespace secondary
-} // namespace storage
+} // namespace storage::secondary
-- 
2.47.2