[CI] Re-enabled modernize-unary-static-assert (grpc#38333)

Re-enabled `modernize-unary-static-assert` which was disabled temporarily by grpc#37919 Closes grpc#38333 PiperOrigin-RevId: 713080136
yashykt · Jan 8, 2025 · 048ea42 · 048ea42
1 parent d4fa2e6
commit 048ea42
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 18 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -129,6 +129,7 @@ Checks: '-*,
   modernize-replace-auto-ptr,
   modernize-replace-random-shuffle,
   modernize-shrink-to-fit,
+  modernize-unary-static-assert,
   modernize-use-bool-literals,
   modernize-use-noexcept,
   modernize-use-nullptr,

diff --git a/src/core/util/matchers.h b/src/core/util/matchers.h
@@ -91,20 +91,15 @@ class HeaderMatcher {
   // the corresponding StringMatcher::Type enum values, so that it's safe to
   // convert by casting when delegating to StringMatcher.
   static_assert(static_cast<StringMatcher::Type>(Type::kExact) ==
-                    StringMatcher::Type::kExact,
-                "");
+                StringMatcher::Type::kExact);
   static_assert(static_cast<StringMatcher::Type>(Type::kPrefix) ==
-                    StringMatcher::Type::kPrefix,
-                "");
+                StringMatcher::Type::kPrefix);
   static_assert(static_cast<StringMatcher::Type>(Type::kSuffix) ==
-                    StringMatcher::Type::kSuffix,
-                "");
+                StringMatcher::Type::kSuffix);
   static_assert(static_cast<StringMatcher::Type>(Type::kSafeRegex) ==
-                    StringMatcher::Type::kSafeRegex,
-                "");
+                StringMatcher::Type::kSafeRegex);
   static_assert(static_cast<StringMatcher::Type>(Type::kContains) ==
-                    StringMatcher::Type::kContains,
-                "");
+                StringMatcher::Type::kContains);
 
   // Creates HeaderMatcher instance. Returns error status on failure.
   static absl::StatusOr<HeaderMatcher> Create(absl::string_view name, Type type,

diff --git a/src/core/xds/xds_client/xds_client.h b/src/core/xds/xds_client/xds_client.h
@@ -278,18 +278,14 @@ class XdsClient : public DualRefCounted<XdsClient> {
       NACKED,
     };
     static_assert(static_cast<ClientResourceStatus>(envoy_admin_v3_REQUESTED) ==
-                      ClientResourceStatus::REQUESTED,
-                  "");
+                  ClientResourceStatus::REQUESTED);
     static_assert(
         static_cast<ClientResourceStatus>(envoy_admin_v3_DOES_NOT_EXIST) ==
-            ClientResourceStatus::DOES_NOT_EXIST,
-        "");
+        ClientResourceStatus::DOES_NOT_EXIST);
     static_assert(static_cast<ClientResourceStatus>(envoy_admin_v3_ACKED) ==
-                      ClientResourceStatus::ACKED,
-                  "");
+                  ClientResourceStatus::ACKED);
     static_assert(static_cast<ClientResourceStatus>(envoy_admin_v3_NACKED) ==
-                      ClientResourceStatus::NACKED,
-                  "");
+                  ClientResourceStatus::NACKED);
 
     void AddWatcher(RefCountedPtr<ResourceWatcherInterface> watcher) {
       watchers_.insert(std::move(watcher));