grpc 1.70.1 → 1.71.0

data/src/core/lib/event_engine/ref_counted_dns_resolver_interface.h

@@ -22,8 +22,7 @@
 #include "absl/strings/string_view.h"
 #include "src/core/util/orphanable.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 class RefCountedDNSResolverInterface
     : public grpc_core::InternallyRefCounted<RefCountedDNSResolverInterface> {
@@ -46,7 +45,6 @@ class RefCountedDNSResolverInterface
       absl::string_view name) = 0;
 };
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_REF_COUNTED_DNS_RESOLVER_INTERFACE_H

data/src/core/lib/event_engine/resolved_address.cc

@@ -23,8 +23,7 @@
 
 // IWYU pragma: no_include <sys/socket.h>
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 EventEngine::ResolvedAddress::ResolvedAddress(const sockaddr* address,
                                               socklen_t size)
@@ -58,5 +57,4 @@ grpc_resolved_address CreateGRPCResolvedAddress(
   return grpc_addr;
 }
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental

data/src/core/lib/event_engine/resolved_address_internal.h

@@ -18,8 +18,7 @@
 
 #include "src/core/lib/iomgr/resolved_address.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 EventEngine::ResolvedAddress CreateResolvedAddress(
     const grpc_resolved_address& addr);
@@ -27,7 +26,6 @@ EventEngine::ResolvedAddress CreateResolvedAddress(
 grpc_resolved_address CreateGRPCResolvedAddress(
     const EventEngine::ResolvedAddress& ra);
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_RESOLVED_ADDRESS_INTERNAL_H

data/src/core/lib/event_engine/shim.cc

@@ -19,8 +19,7 @@
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/iomgr/port.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 bool UseEventEngineClient() {
 // TODO(hork, eryu): Adjust the ifdefs accordingly when event engines become
@@ -48,5 +47,4 @@ bool UseEventEngineListener() {
 #endif
 }
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental

data/src/core/lib/event_engine/shim.h

@@ -18,14 +18,12 @@
 
 #include <grpc/support/port_platform.h>
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 bool UseEventEngineClient();
 
 bool UseEventEngineListener();
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_SHIM_H

data/src/core/lib/event_engine/slice.cc

@@ -26,8 +26,7 @@
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/slice/slice_refcount.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 namespace slice_detail {
 
@@ -97,5 +96,4 @@ Slice Slice::FromRefcountAndBytes(grpc_slice_refcount* r, const uint8_t* begin,
   return Slice(out);
 }
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental

data/src/core/lib/event_engine/slice_buffer.cc

@@ -20,8 +20,7 @@
 
 #include "src/core/lib/slice/slice.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 void SliceBuffer::Append(Slice slice) {
   grpc_slice_buffer_add(&slice_buffer_, slice.TakeCSlice());
@@ -43,5 +42,4 @@ Slice SliceBuffer::RefSlice(size_t index) {
   return Slice(grpc_core::CSliceRef(slice_buffer_.slices[index]));
 }
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental

data/src/core/lib/event_engine/tcp_socket_utils.cc

@@ -63,8 +63,7 @@
 #include "src/core/util/status_helper.h"
 #include "src/core/util/uri.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 namespace {
 constexpr uint8_t kV4MappedPrefix[] = {0, 0, 0, 0, 0,    0,
@@ -307,7 +306,7 @@ void ResolvedAddressSetPort(EventEngine::ResolvedAddress& resolved_addr,
   }
 }
 
-absl::optional<int> MaybeGetWildcardPortFromAddress(
+std::optional<int> MaybeGetWildcardPortFromAddress(
     const EventEngine::ResolvedAddress& addr) {
   const EventEngine::ResolvedAddress* resolved_addr = &addr;
   EventEngine::ResolvedAddress addr4_normalized;
@@ -319,7 +318,7 @@ absl::optional<int> MaybeGetWildcardPortFromAddress(
     const sockaddr_in* addr4 =
         reinterpret_cast<const sockaddr_in*>(resolved_addr->address());
     if (addr4->sin_addr.s_addr != 0) {
-      return absl::nullopt;
+      return std::nullopt;
     }
     return static_cast<int>(ntohs(addr4->sin_port));
   } else if (resolved_addr->address()->sa_family == AF_INET6) {
@@ -329,12 +328,12 @@ absl::optional<int> MaybeGetWildcardPortFromAddress(
     int i;
     for (i = 0; i < 16; i++) {
       if (addr6->sin6_addr.s6_addr[i] != 0) {
-        return absl::nullopt;
+        return std::nullopt;
       }
     }
     return static_cast<int>(ntohs(addr6->sin6_port));
   } else {
-    return absl::nullopt;
+    return std::nullopt;
   }
 }
 
@@ -446,5 +445,4 @@ absl::StatusOr<EventEngine::ResolvedAddress> URIToResolvedAddress(
       reinterpret_cast<const sockaddr*>(addr.addr), addr.len);
 }
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental

data/src/core/lib/event_engine/tcp_socket_utils.h

@@ -17,13 +17,12 @@
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include <optional>
 #include <string>
 
 #include "absl/status/statusor.h"
-#include "absl/types/optional.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 // Returns true if resolved_addr is an IPv4-mapped IPv6 address within the
 //  ::ffff:0.0.0.0/96 range, or false otherwise.
@@ -56,8 +55,8 @@ void ResolvedAddressSetPort(EventEngine::ResolvedAddress& resolved_addr,
                             int port);
 
 // Returns the port number associated with the address if the given address is
-// a wildcard ipv4 or ipv6 address. Otherwise returns absl::nullopt
-absl::optional<int> MaybeGetWildcardPortFromAddress(
+// a wildcard ipv4 or ipv6 address. Otherwise returns std::nullopt
+std::optional<int> MaybeGetWildcardPortFromAddress(
     const EventEngine::ResolvedAddress& addr);
 
 // Returns true if resolved_addr is an VSOCK address. Otherwise returns false.
@@ -86,7 +85,6 @@ absl::StatusOr<std::string> ResolvedAddressToURI(
 absl::StatusOr<EventEngine::ResolvedAddress> URIToResolvedAddress(
     std::string address_str);
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_TCP_SOCKET_UTILS_H

data/src/core/lib/event_engine/thread_local.cc

@@ -15,8 +15,7 @@
 
 #include <grpc/support/port_platform.h>
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 namespace {
 thread_local bool g_thread_local{false};
@@ -25,5 +24,4 @@ thread_local bool g_thread_local{false};
 void ThreadLocal::SetIsEventEngineThread(bool is) { g_thread_local = is; }
 bool ThreadLocal::IsEventEngineThread() { return g_thread_local; }
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental

data/src/core/lib/event_engine/thread_local.h

@@ -15,8 +15,7 @@
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREAD_LOCAL_H
 #include <grpc/support/port_platform.h>
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 /// A lightweight facility to allow gpr's fork handlers and
 /// EventEngine::Forkables to coordinate.
@@ -26,7 +25,6 @@ class ThreadLocal {
   static bool IsEventEngineThread();
 };
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREAD_LOCAL_H

data/src/core/lib/event_engine/thread_pool/thread_count.cc

@@ -25,8 +25,7 @@
 #include "absl/time/time.h"
 #include "src/core/util/time.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 // -------- LivingThreadCount --------
 
@@ -72,5 +71,4 @@ size_t LivingThreadCount::WaitForCountChange(size_t desired_threads,
   return count;
 }
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental

data/src/core/lib/event_engine/thread_pool/thread_count.h

@@ -29,8 +29,7 @@
 #include "src/core/util/time.h"
 #include "src/core/util/useful.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 // Tracks counts across some fixed number of shards.
 // It is intended for fast increment/decrement operations, but a slower overall
@@ -87,23 +86,11 @@ class BusyThreadCount {
   size_t NextIndex() { return next_idx_.fetch_add(1) % shards_.size(); }
 
  private:
-// We want to ensure that this data structure lands on different cachelines per
-// cpu. With C++17 we can do so explicitly with an `alignas` specifier. Prior
-// versions we can at best approximate it by padding the structure. It'll
-// probably work out ok, but it's not guaranteed across allocators.
-// TODO(ctiller): When we move to C++17 delete the duplicate definition.
-#if __cplusplus >= 201703L
+  // We want to ensure that this data structure lands on different cachelines
+  // per cpu.
   struct ShardedData {
     std::atomic<size_t> busy_count{0};
   } GPR_ALIGN_STRUCT(GPR_CACHELINE_SIZE);
-#else
-  struct ShardedDataHeader {
-    std::atomic<size_t> busy_count{0};
-  };
-  struct ShardedData : public ShardedDataHeader {
-    uint8_t padding[GPR_CACHELINE_SIZE - sizeof(ShardedDataHeader)];
-  };
-#endif
 
   std::vector<ShardedData> shards_;
   std::atomic<size_t> next_idx_{0};
@@ -173,7 +160,6 @@ class LivingThreadCount {
   size_t living_count_ ABSL_GUARDED_BY(mu_) = 0;
 };
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREAD_POOL_THREAD_COUNT_H

data/src/core/lib/event_engine/thread_pool/thread_pool.h

@@ -22,8 +22,7 @@
 #include "absl/functional/any_invocable.h"
 #include "src/core/lib/event_engine/forkable.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 // Interface for all EventEngine ThreadPool implementations
 class ThreadPool : public Forkable {
@@ -41,7 +40,6 @@ class ThreadPool : public Forkable {
 // Creates a default thread pool.
 std::shared_ptr<ThreadPool> MakeThreadPool(size_t reserve_threads);
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREAD_POOL_THREAD_POOL_H

data/src/core/lib/event_engine/thread_pool/thread_pool_factory.cc

@@ -21,8 +21,7 @@
 #include "src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h"
 #include "src/core/util/no_destruct.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 namespace {
 grpc_core::NoDestruct<ObjectGroupForkHandler> g_thread_pool_fork_manager;
@@ -44,5 +43,4 @@ std::shared_ptr<ThreadPool> MakeThreadPool(size_t reserve_threads) {
   return thread_pool;
 }
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental

data/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc

@@ -25,6 +25,7 @@
 #include <chrono>
 #include <cstddef>
 #include <memory>
+#include <optional>
 #include <utility>
 
 #include "absl/functional/any_invocable.h"
@@ -32,7 +33,6 @@
 #include "absl/log/log.h"
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
-#include "absl/types/optional.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/common_closures.h"
 #include "src/core/lib/event_engine/thread_local.h"
@@ -101,8 +101,7 @@
 // backtrace will be printed for every running thread, and the process will
 // abort.
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 namespace {
 // TODO(ctiller): grpc_core::Timestamp, Duration have very specific contracts
@@ -620,5 +619,4 @@ bool WorkStealingThreadPool::WorkSignal::WaitWithTimeout(
   return cv_.WaitWithTimeout(&mu_, absl::Milliseconds(time.millis()));
 }
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental

data/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h

@@ -39,8 +39,7 @@
 #include "src/core/util/sync.h"
 #include "src/core/util/time.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 class WorkStealingThreadPool final : public ThreadPool {
  public:
@@ -220,7 +219,6 @@ class WorkStealingThreadPool final : public ThreadPool {
   const std::shared_ptr<WorkStealingThreadPoolImpl> pool_;
 };
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREAD_POOL_WORK_STEALING_THREAD_POOL_H

data/src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc

@@ -25,8 +25,7 @@
 #include "src/core/util/sync.h"
 #include "src/core/util/thd.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 void ThreadyEventEngine::Asynchronously(absl::AnyInvocable<void()> fn) {
   grpc_core::Thread t("thready_event_engine", std::move(fn), nullptr,
@@ -180,5 +179,4 @@ void ThreadyEventEngine::ThreadyDNSResolver::LookupTXT(
       name);
 }
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental

data/src/core/lib/event_engine/thready_event_engine/thready_event_engine.h

@@ -28,8 +28,7 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 // An EventEngine that spawns a thread at every available opportunity:
 // - Run() spawns a thread
@@ -98,7 +97,6 @@ class ThreadyEventEngine final : public EventEngine {
   std::shared_ptr<EventEngine> impl_;
 };
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREADY_EVENT_ENGINE_THREADY_EVENT_ENGINE_H

data/src/core/lib/event_engine/time_util.cc

@@ -18,12 +18,10 @@
 
 #include <chrono>
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 size_t Milliseconds(EventEngine::Duration d) {
   return std::chrono::duration_cast<std::chrono::milliseconds>(d).count();
 }
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental

data/src/core/lib/event_engine/time_util.h

@@ -18,13 +18,11 @@
 #include <grpc/support/port_platform.h>
 #include <stddef.h>
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 // Convert a duration to milliseconds
 size_t Milliseconds(EventEngine::Duration d);
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_TIME_UTIL_H

data/src/core/lib/event_engine/utils.cc

@@ -23,8 +23,7 @@
 #include "src/core/util/notification.h"
 #include "src/core/util/time.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 std::string HandleToStringInternal(uintptr_t a, uintptr_t b) {
   return absl::StrCat("{", absl::Hex(a, absl::kZeroPad16), ",",
@@ -54,5 +53,4 @@ LookupHostnameBlocking(EventEngine::DNSResolver* dns_resolver,
   return results;
 }
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental

data/src/core/lib/event_engine/utils.h

@@ -25,8 +25,7 @@
 #include "absl/strings/string_view.h"
 #include "src/core/util/time.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 std::string HandleToStringInternal(uintptr_t a, uintptr_t b);
 
@@ -43,7 +42,6 @@ absl::StatusOr<std::vector<EventEngine::ResolvedAddress>>
 LookupHostnameBlocking(EventEngine::DNSResolver* dns_resolver,
                        absl::string_view name, absl::string_view default_port);
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_UTILS_H

data/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc

@@ -46,8 +46,7 @@ struct iovec {
   size_t iov_len;
 };
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 namespace {
 
 constexpr int kRecvFromSourceAddrSize = 200;
@@ -844,7 +843,6 @@ void GrpcPolledFdFactoryWindows::ConfigureAresChannelLocked(
   ares_set_socket_functions(channel, &kCustomSockFuncs, this);
 }
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER)

data/src/core/lib/event_engine/windows/grpc_polled_fd_windows.h

@@ -36,8 +36,7 @@
 
 struct iovec;
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 class GrpcPolledFdWindows;
 
@@ -65,8 +64,7 @@ class GrpcPolledFdFactoryWindows : public GrpcPolledFdFactory {
   std::map<SOCKET, std::unique_ptr<GrpcPolledFdWindows>> sockets_;
 };
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER)
 

data/src/core/lib/event_engine/windows/iocp.cc

@@ -29,8 +29,7 @@
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/util/crash.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 IOCP::IOCP(ThreadPool* thread_pool) noexcept
     : thread_pool_(thread_pool),
@@ -137,7 +136,6 @@ DWORD IOCP::WSASocketFlagsInit() {
   return wsa_socket_flags;
 }
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GPR_WINDOWS

data/src/core/lib/event_engine/windows/iocp.h

@@ -25,8 +25,7 @@
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
 #include "src/core/lib/event_engine/windows/win_socket.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 class IOCP final : public Poller {
  public:
@@ -60,8 +59,7 @@ class IOCP final : public Poller {
   std::atomic<int> outstanding_kicks_{0};
 };
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif
 

data/src/core/lib/event_engine/windows/native_windows_dns_resolver.cc

@@ -28,8 +28,7 @@
 #include "src/core/util/host_port.h"
 #include "src/core/util/status_helper.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 namespace {
 absl::StatusOr<std::vector<EventEngine::ResolvedAddress>>
@@ -107,7 +106,6 @@ void NativeWindowsDNSResolver::LookupTXT(
   });
 }
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GPR_WINDOWS

data/src/core/lib/event_engine/windows/native_windows_dns_resolver.h

@@ -20,8 +20,7 @@
 
 #include <grpc/event_engine/event_engine.h>
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 // An asynchronous DNS resolver which uses the native platform's getaddrinfo
 // API. Only supports A/AAAA records.
@@ -43,8 +42,7 @@ class NativeWindowsDNSResolver : public EventEngine::DNSResolver {
   std::shared_ptr<EventEngine> event_engine_;
 };
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif
 

data/src/core/lib/event_engine/windows/win_socket.cc

@@ -34,8 +34,7 @@
 #define GRPC_FIONBIO FIONBIO
 #endif
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 // ---- WinSocket ----
 
@@ -234,7 +233,6 @@ absl::Status PrepareSocket(SOCKET sock) {
   return absl::OkStatus();
 }
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GPR_WINDOWS