facebook · christophpurrer · Apr 20, 2023
diff --git a/packages/react-native/Libraries/Blob/RCTBlobCollector.h b/packages/react-native/Libraries/Blob/RCTBlobCollector.h
@@ -9,8 +9,7 @@
 
 @class RCTBlobManager;
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 class JSI_EXPORT RCTBlobCollector : public jsi::HostObject {
  public:
@@ -24,5 +23,4 @@ class JSI_EXPORT RCTBlobCollector : public jsi::HostObject {
   RCTBlobManager *blobManager_;
 };
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/packages/react-native/Libraries/Blob/RCTBlobCollector.mm b/packages/react-native/Libraries/Blob/RCTBlobCollector.mm
@@ -10,8 +10,7 @@
 #import <React/RCTBlobManager.h>
 #import <React/RCTBridge+Private.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 RCTBlobCollector::RCTBlobCollector(RCTBlobManager *blobManager, const std::string &blobId)
     : blobId_(blobId), blobManager_(blobManager)
@@ -52,5 +51,4 @@
               queue:RCTJSThread];
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/packages/react-native/Libraries/Image/RCTImageURLLoaderWithAttribution.h b/packages/react-native/Libraries/Image/RCTImageURLLoaderWithAttribution.h
@@ -11,8 +11,7 @@
 
 // TODO (T61325135): Remove C++ checks
 #ifdef __cplusplus
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 struct ImageURLLoaderAttribution {
   int32_t nativeViewTag = 0;
@@ -21,8 +20,7 @@ struct ImageURLLoaderAttribution {
   NSString *analyticTag;
 };
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
 #endif
 
 @interface RCTImageURLLoaderRequest : NSObject

diff --git a/packages/react-native/Libraries/TypeSafety/RCTConvertHelpers.h b/packages/react-native/Libraries/TypeSafety/RCTConvertHelpers.h
@@ -13,12 +13,10 @@
 
 #import <FBLazyVector/FBLazyVector.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 template <typename T>
 using LazyVector = FB::LazyVector<T, id>;
-}
-}
+} // namespace facebook::react
 
 template <typename ContainerT>
 NSArray *RCTConvertVecToArray(const ContainerT &vec, id (^convertor)(typename ContainerT::value_type element))

diff --git a/packages/react-native/Libraries/TypeSafety/RCTTypedModuleConstants.h b/packages/react-native/Libraries/TypeSafety/RCTTypedModuleConstants.h
@@ -30,8 +30,7 @@
 
 @end
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 // Objective-C doesn't allow arbitrary types in its lightweight generics, only object and block types. We can work
 // around that by having the struct type we care about be a block-argument. The block never exists at runtime.
@@ -45,5 +44,4 @@ ModuleConstants<T> typedConstants(typename T::Builder::Input &&value)
   return [_RCTTypedModuleConstants newWithUnsafeDictionary:builder.buildUnsafeRawValue()];
 }
 
-}
-}
+} // namespace facebook::react
diff --git a/packages/react-native/React/Base/RCTManagedPointer.h b/packages/react-native/React/Base/RCTManagedPointer.h
@@ -24,8 +24,7 @@
 
 @end
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 template <typename T, typename P>
 RCTManagedPointer *managedPointer(P initializer)
@@ -34,7 +33,6 @@ RCTManagedPointer *managedPointer(P initializer)
   return [[RCTManagedPointer alloc] initWithPointer:std::move(ptr)];
 }
 
-}
-}
+} // namespace facebook::react
 
 #endif
diff --git a/packages/react-native/React/CxxBridge/JSCExecutorFactory.h b/packages/react-native/React/CxxBridge/JSCExecutorFactory.h
@@ -9,8 +9,7 @@
 
 #include <jsireact/JSIExecutor.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 class JSCExecutorFactory : public JSExecutorFactory {
  public:
@@ -25,5 +24,4 @@ class JSCExecutorFactory : public JSExecutorFactory {
   JSIExecutor::RuntimeInstaller runtimeInstaller_;
 };
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/packages/react-native/React/CxxBridge/JSCExecutorFactory.mm b/packages/react-native/React/CxxBridge/JSCExecutorFactory.mm
@@ -11,8 +11,7 @@
 
 #import <memory>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 std::unique_ptr<JSExecutor> JSCExecutorFactory::createJSExecutor(
     std::shared_ptr<ExecutorDelegate> delegate,
@@ -22,5 +21,4 @@
       facebook::jsc::makeJSCRuntime(), delegate, JSIExecutor::defaultTimeoutInvoker, runtimeInstaller_);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/packages/react-native/React/CxxBridge/NSDataBigString.h b/packages/react-native/React/CxxBridge/NSDataBigString.h
@@ -9,8 +9,7 @@
 
 #include <cxxreact/JSBigString.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 class NSDataBigString : public JSBigString {
  public:
@@ -38,5 +37,4 @@ class NSDataBigString : public JSBigString {
   size_t m_length;
 };
 
-}
-}
+} // namespace facebook::react
diff --git a/packages/react-native/React/CxxBridge/NSDataBigString.mm b/packages/react-native/React/CxxBridge/NSDataBigString.mm
@@ -7,8 +7,7 @@
 
 #import "NSDataBigString.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 static NSData *ensureNullTerminated(NSData *source)
 {
@@ -39,5 +38,4 @@
   m_data = ensureNullTerminated(data);
 }
 
-}
-}
+} // namespace facebook::react
diff --git a/packages/react-native/React/CxxBridge/RCTCxxBridgeDelegate.h b/packages/react-native/React/CxxBridge/RCTCxxBridgeDelegate.h
@@ -9,13 +9,11 @@
 
 #import <React/RCTBridgeDelegate.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 class JSExecutorFactory;
 
-}
-}
+} // namespace facebook::react
 
 // This is a separate class so non-C++ implementations don't need to
 // take a C++ dependency.

diff --git a/packages/react-native/React/CxxBridge/RCTJSIExecutorRuntimeInstaller.h b/packages/react-native/React/CxxBridge/RCTJSIExecutorRuntimeInstaller.h
@@ -9,8 +9,7 @@
 
 #include <jsireact/JSIExecutor.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 /**
  * Creates a lambda used to bind a JSIRuntime in the context of
@@ -19,5 +18,4 @@ namespace react {
 JSIExecutor::RuntimeInstaller RCTJSIExecutorRuntimeInstaller(
     JSIExecutor::RuntimeInstaller runtimeInstallerToWrap);
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/packages/react-native/React/CxxBridge/RCTJSIExecutorRuntimeInstaller.mm b/packages/react-native/React/CxxBridge/RCTJSIExecutorRuntimeInstaller.mm
@@ -10,8 +10,7 @@
 #import <React/RCTLog.h>
 #include <chrono>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 JSIExecutor::RuntimeInstaller RCTJSIExecutorRuntimeInstaller(JSIExecutor::RuntimeInstaller runtimeInstallerToWrap)
 {
@@ -29,5 +28,4 @@
   };
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/packages/react-native/React/CxxBridge/RCTMessageThread.h b/packages/react-native/React/CxxBridge/RCTMessageThread.h
@@ -13,8 +13,7 @@
 #import <React/RCTJavaScriptExecutor.h>
 #import <cxxreact/MessageQueueThread.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 class RCTMessageThread : public MessageQueueThread,
                          public std::enable_shared_from_this<RCTMessageThread> {
@@ -36,5 +35,4 @@ class RCTMessageThread : public MessageQueueThread,
   std::atomic_bool m_shutdown;
 };
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/packages/react-native/React/CxxBridge/RCTMessageThread.mm b/packages/react-native/React/CxxBridge/RCTMessageThread.mm
@@ -20,8 +20,7 @@
 // particular, the sync functions are only used for bridge setup and
 // teardown, and quitSynchronous is guaranteed to be called.
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 RCTMessageThread::RCTMessageThread(NSRunLoop *runLoop, RCTJavaScriptCompleteBlock errorBlock)
     : m_cfRunLoop([runLoop getCFRunLoop]), m_errorBlock(errorBlock), m_shutdown(false)
@@ -110,5 +109,4 @@
   CFRetain(m_cfRunLoop);
 }
 
-}
-}
+} // namespace facebook::react
diff --git a/packages/react-native/React/CxxBridge/RCTObjcExecutor.h b/packages/react-native/React/CxxBridge/RCTObjcExecutor.h
@@ -12,8 +12,7 @@
 #import <React/RCTJavaScriptExecutor.h>
 #import <cxxreact/JSExecutor.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 class RCTObjcExecutorFactory : public JSExecutorFactory {
  public:
@@ -29,5 +28,4 @@ class RCTObjcExecutorFactory : public JSExecutorFactory {
   RCTJavaScriptCompleteBlock m_errorBlock;
 };
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/packages/react-native/React/CxxBridge/RCTObjcExecutor.mm b/packages/react-native/React/CxxBridge/RCTObjcExecutor.mm
@@ -20,8 +20,7 @@
 #import <cxxreact/RAMBundleRegistry.h>
 #import <folly/json.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 namespace {
 
@@ -144,5 +143,4 @@ virtual void setGlobalVariable(std::string propName, std::unique_ptr<const JSBig
   return std::unique_ptr<JSExecutor>(new RCTObjcExecutor(m_jse, m_errorBlock, jsQueue, delegate));
 }
 
-}
-}
+} // namespace facebook::react
diff --git a/packages/react-native/React/CxxLogUtils/RCTDefaultCxxLogFunction.h b/packages/react-native/React/CxxLogUtils/RCTDefaultCxxLogFunction.h
@@ -9,10 +9,8 @@
 
 #import <logger/react_native_log.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 void RCTDefaultCxxLogFunction(ReactNativeLogLevel level, const char *message);
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/packages/react-native/React/CxxLogUtils/RCTDefaultCxxLogFunction.mm b/packages/react-native/React/CxxLogUtils/RCTDefaultCxxLogFunction.mm
@@ -9,8 +9,7 @@
 #import <React/RCTLog.h>
 #import <glog/logging.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 void RCTDefaultCxxLogFunction(ReactNativeLogLevel level, const char *message)
 {
@@ -35,5 +34,4 @@ void RCTDefaultCxxLogFunction(ReactNativeLogLevel level, const char *message)
   }
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/packages/react-native/React/CxxModule/DispatchMessageQueueThread.h b/packages/react-native/React/CxxModule/DispatchMessageQueueThread.h
@@ -10,8 +10,7 @@
 #include <React/RCTLog.h>
 #include <cxxreact/MessageQueueThread.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 // RCTNativeModule arranges for native methods to be invoked on a queue which
 // is not the JS thread.  C++ modules don't use RCTNativeModule, so this little
@@ -43,5 +42,4 @@ class DispatchMessageQueueThread : public MessageQueueThread {
   RCTModuleData *moduleData_;
 };
 
-}
-}
+} // namespace facebook::react
diff --git a/packages/react-native/React/CxxModule/RCTCxxModule.h b/packages/react-native/React/CxxModule/RCTCxxModule.h
@@ -11,13 +11,9 @@
 
 #import <React/RCTBridgeModule.h>
 
-namespace facebook {
-namespace xplat {
-namespace module {
+namespace facebook::xplat::module {
 class CxxModule;
-}
-}
-}
+} // namespace facebook::react::module
 
 /**
  * Subclass RCTCxxModule to use cross-platform CxxModule on iOS.

diff --git a/packages/react-native/React/CxxModule/RCTCxxUtils.h b/packages/react-native/React/CxxModule/RCTCxxUtils.h
@@ -13,8 +13,7 @@
 @class RCTBridge;
 @class RCTModuleData;
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 class Instance;
 class NativeModule;
@@ -25,5 +24,4 @@ createNativeModules(NSArray<RCTModuleData *> *modules, RCTBridge *bridge, const
 NSError *tryAndReturnError(const std::function<void()> &func);
 NSString *deriveSourceURL(NSURL *url);
 
-}
-}
+} // namespace facebook::react
diff --git a/packages/react-native/React/CxxModule/RCTCxxUtils.mm b/packages/react-native/React/CxxModule/RCTCxxUtils.mm
@@ -17,8 +17,7 @@
 #import "RCTCxxModule.h"
 #import "RCTNativeModule.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 using facebook::jsi::JSError;
 
@@ -101,5 +100,4 @@
   return sourceUrl ?: @"";
 }
 
-}
-}
+} // namespace facebook::react