From 3a3b61ce71a40acdf7e6326687e9cddd34d1f9e6 Mon Sep 17 00:00:00 2001
From: Samuel Susla <samuelsusla@fb.com>
Date: Thu, 1 Apr 2021 04:49:14 -0700
Subject: [PATCH] Use nested namespaces in UIManager module

Summary:
Changelog: [internal]

Use nested namespaces in UIManager module.

Reviewed By: JoshuaGross

Differential Revision: D27462611

fbshipit-source-id: 626510bf72a18303de55e5db3e13db4f415d799e
---
 .../renderer/uimanager/LayoutAnimationStatusDelegate.h      | 6 ++----
 ReactCommon/react/renderer/uimanager/UIManager.cpp          | 6 ++----
 ReactCommon/react/renderer/uimanager/UIManager.h            | 6 ++----
 .../react/renderer/uimanager/UIManagerAnimationDelegate.h   | 6 ++----
 ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp   | 6 ++----
 ReactCommon/react/renderer/uimanager/UIManagerBinding.h     | 6 ++----
 ReactCommon/react/renderer/uimanager/UIManagerCommitHook.h  | 6 ++----
 ReactCommon/react/renderer/uimanager/UIManagerDelegate.h    | 6 ++----
 ReactCommon/react/renderer/uimanager/primitives.h           | 6 ++----
 9 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/ReactCommon/react/renderer/uimanager/LayoutAnimationStatusDelegate.h b/ReactCommon/react/renderer/uimanager/LayoutAnimationStatusDelegate.h
index b87b96f68f..cad196eb98 100644
--- a/ReactCommon/react/renderer/uimanager/LayoutAnimationStatusDelegate.h
+++ b/ReactCommon/react/renderer/uimanager/LayoutAnimationStatusDelegate.h
@@ -7,8 +7,7 @@
 
 #pragma once
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 class LayoutAnimationStatusDelegate {
  public:
@@ -26,5 +25,4 @@ class LayoutAnimationStatusDelegate {
   virtual void onAllAnimationsComplete() = 0;
 };
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/uimanager/UIManager.cpp b/ReactCommon/react/renderer/uimanager/UIManager.cpp
index 5a8044b6ee..dec25e99fd 100644
--- a/ReactCommon/react/renderer/uimanager/UIManager.cpp
+++ b/ReactCommon/react/renderer/uimanager/UIManager.cpp
@@ -16,8 +16,7 @@
 
 #include <glog/logging.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 static std::unique_ptr<LeakChecker> constructLeakChecker(
     RuntimeExecutor const &runtimeExecutor,
@@ -433,5 +432,4 @@ void UIManager::animationTick() {
   }
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/uimanager/UIManager.h b/ReactCommon/react/renderer/uimanager/UIManager.h
index cef5c528e0..bfb73da9cb 100644
--- a/ReactCommon/react/renderer/uimanager/UIManager.h
+++ b/ReactCommon/react/renderer/uimanager/UIManager.h
@@ -24,8 +24,7 @@
 #include <react/renderer/uimanager/UIManagerDelegate.h>
 #include <react/renderer/uimanager/primitives.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 class UIManagerBinding;
 class UIManagerCommitHook;
@@ -194,5 +193,4 @@ class UIManager final : public ShadowTreeDelegate {
   std::unique_ptr<LeakChecker> leakChecker_;
 };
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/uimanager/UIManagerAnimationDelegate.h b/ReactCommon/react/renderer/uimanager/UIManagerAnimationDelegate.h
index 9e55d1f386..0aa7ca225c 100644
--- a/ReactCommon/react/renderer/uimanager/UIManagerAnimationDelegate.h
+++ b/ReactCommon/react/renderer/uimanager/UIManagerAnimationDelegate.h
@@ -12,8 +12,7 @@
 #include <react/renderer/componentregistry/ComponentDescriptorFactory.h>
 #include <react/renderer/core/RawValue.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 class UIManagerAnimationDelegate {
  public:
@@ -48,5 +47,4 @@ class UIManagerAnimationDelegate {
   virtual void stopSurface(SurfaceId surfaceId) = 0;
 };
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp b/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp
index 85b350d819..65d5eb60ac 100644
--- a/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp
+++ b/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp
@@ -13,8 +13,7 @@
 #include <react/renderer/core/LayoutableShadowNode.h>
 #include <react/renderer/debug/SystraceSection.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 static jsi::Value getModule(
     jsi::Runtime &runtime,
@@ -753,5 +752,4 @@ jsi::Value UIManagerBinding::get(
   return jsi::Value::undefined();
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/uimanager/UIManagerBinding.h b/ReactCommon/react/renderer/uimanager/UIManagerBinding.h
index aeb98d3289..8c68cdeda5 100644
--- a/ReactCommon/react/renderer/uimanager/UIManagerBinding.h
+++ b/ReactCommon/react/renderer/uimanager/UIManagerBinding.h
@@ -13,8 +13,7 @@
 #include <react/renderer/uimanager/UIManager.h>
 #include <react/renderer/uimanager/primitives.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 /*
  * Exposes UIManager to JavaScript realm.
@@ -91,5 +90,4 @@ class UIManagerBinding : public jsi::HostObject {
   std::unique_ptr<EventHandler const> eventHandler_;
 };
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/uimanager/UIManagerCommitHook.h b/ReactCommon/react/renderer/uimanager/UIManagerCommitHook.h
index 296e9733aa..50fa5ebb66 100644
--- a/ReactCommon/react/renderer/uimanager/UIManagerCommitHook.h
+++ b/ReactCommon/react/renderer/uimanager/UIManagerCommitHook.h
@@ -9,8 +9,7 @@
 
 #include <react/renderer/components/root/RootShadowNode.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 class ShadowTree;
 class UIManager;
@@ -41,5 +40,4 @@ class UIManagerCommitHook {
   virtual ~UIManagerCommitHook() noexcept = default;
 };
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/uimanager/UIManagerDelegate.h b/ReactCommon/react/renderer/uimanager/UIManagerDelegate.h
index a99350fc3c..57b0dccfa3 100644
--- a/ReactCommon/react/renderer/uimanager/UIManagerDelegate.h
+++ b/ReactCommon/react/renderer/uimanager/UIManagerDelegate.h
@@ -11,8 +11,7 @@
 #include <react/renderer/core/ShadowNode.h>
 #include <react/renderer/mounting/MountingCoordinator.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 /*
  * Abstract class for UIManager's delegate.
@@ -62,5 +61,4 @@ class UIManagerDelegate {
   virtual ~UIManagerDelegate() noexcept = default;
 };
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/uimanager/primitives.h b/ReactCommon/react/renderer/uimanager/primitives.h
index 75c96cd761..cb66f371c5 100644
--- a/ReactCommon/react/renderer/uimanager/primitives.h
+++ b/ReactCommon/react/renderer/uimanager/primitives.h
@@ -14,8 +14,7 @@
 #include <react/renderer/core/EventHandler.h>
 #include <react/renderer/core/ShadowNode.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 using BackgroundExecutor =
     std::function<void(std::function<void()> &&callback)>;
@@ -137,5 +136,4 @@ inline static folly::dynamic commandArgsFromValue(
   return jsi::dynamicFromValue(runtime, value);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react