Use nested namespace name

Summary: changelog: [internal] Enable two new clang tidy checks: - modernize-concat-nested-namespaces - google-build-using-namespace jest_e2e[run_all_tests] Reviewed By: rshest Differential Revision: D40020646 fbshipit-source-id: f3be80b5f829dd0ba376bdd70ed13332e114d48a
facebook · Oct 13, 2022 · 51af7cd · 51af7cd
1 parent 9715993
commit 51af7cd
Show file tree

Hide file tree

Showing 141 changed files with 301 additions and 575 deletions.
diff --git a/ReactCommon/react/renderer/.clang-tidy b/ReactCommon/react/renderer/.clang-tidy
@@ -4,6 +4,7 @@ Checks: '>
 clang-diagnostic-*,
 modernize-avoid-bind,
 modernize-avoid-c-arrays,
+modernize-concat-nested-namespaces,
 modernize-deprecated-headers,
 modernize-deprecated-ios-base-aliases,
 modernize-loop-convert,
@@ -182,5 +183,6 @@ clang-analyzer-unix.cstring.NullArg,
 clang-analyzer-valist.CopyToSelf,
 clang-analyzer-valist.Uninitialized,
 clang-analyzer-valist.Unterminated,
+google-build-using-namespace,
 '
 ...
diff --git a/ReactCommon/react/renderer/animations/LayoutAnimationDriver.cpp b/ReactCommon/react/renderer/animations/LayoutAnimationDriver.cpp
@@ -12,8 +12,7 @@
 #include <react/renderer/animations/utils.h>
 #include <algorithm>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 void LayoutAnimationDriver::animationMutationsForFrame(
     SurfaceId surfaceId,
@@ -107,5 +106,4 @@ void LayoutAnimationDriver::animationMutationsForFrame(
       &shouldFirstComeBeforeSecondMutation);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp b/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp
@@ -30,8 +30,7 @@
 
 #include <glog/logging.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 #ifdef LAYOUT_ANIMATION_VERBOSE_LOGGING
 static std::string GetMutationInstructionString(
@@ -1683,5 +1682,4 @@ void LayoutAnimationKeyFrameManager::simulateImagePropsMemoryAccess(
   }
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/animations/tests/LayoutAnimationTest.cpp b/ReactCommon/react/renderer/animations/tests/LayoutAnimationTest.cpp
@@ -32,8 +32,7 @@
 
 MockClock::time_point MockClock::time_ = {};
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 static void testShadowNodeTreeLifeCycleLayoutAnimations(
     uint_fast32_t seed,
@@ -309,8 +308,7 @@ static void testShadowNodeTreeLifeCycleLayoutAnimations(
   SUCCEED();
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
 
 using namespace facebook::react;
 

diff --git a/ReactCommon/react/renderer/animations/utils.cpp b/ReactCommon/react/renderer/animations/utils.cpp
@@ -8,8 +8,7 @@
 #include "utils.h"
 #include <cmath>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 std::pair<Float, Float> calculateAnimationProgress(
     uint64_t now,
@@ -67,5 +66,4 @@ std::pair<Float, Float> calculateAnimationProgress(
   }
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/attributedstring/AttributedString.cpp b/ReactCommon/react/renderer/attributedstring/AttributedString.cpp
@@ -9,8 +9,7 @@
 
 #include <react/renderer/debug/DebugStringConvertibleItem.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 using Fragment = AttributedString::Fragment;
 using Fragments = AttributedString::Fragments;
@@ -166,5 +165,4 @@ SharedDebugStringConvertibleList AttributedString::getDebugChildren() const {
 }
 #endif
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/attributedstring/AttributedStringBox.cpp b/ReactCommon/react/renderer/attributedstring/AttributedStringBox.cpp
@@ -11,8 +11,7 @@
 
 #include <utility>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 AttributedStringBox::AttributedStringBox()
     : mode_(Mode::Value),
@@ -86,5 +85,4 @@ bool operator!=(
   return !(lhs == rhs);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.cpp b/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.cpp
@@ -12,8 +12,7 @@
 #include <react/renderer/graphics/conversions.h>
 #include <react/utils/FloatComparison.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 bool ParagraphAttributes::operator==(const ParagraphAttributes &rhs) const {
   return std::tie(
@@ -55,5 +54,4 @@ SharedDebugStringConvertibleList ParagraphAttributes::getDebugProps() const {
 }
 #endif
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp b/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp
@@ -15,8 +15,7 @@
 
 #include <react/renderer/debug/debugStringConvertibleUtils.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 void TextAttributes::apply(TextAttributes textAttributes) {
   // Color
@@ -208,5 +207,4 @@ SharedDebugStringConvertibleList TextAttributes::getDebugProps() const {
 }
 #endif
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/attributedstring/tests/AttributedStringBoxTest.cpp b/ReactCommon/react/renderer/attributedstring/tests/AttributedStringBoxTest.cpp
@@ -10,8 +10,7 @@
 #include <gtest/gtest.h>
 #include <react/renderer/attributedstring/AttributedStringBox.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 TEST(AttributedStringBoxTest, testDefaultConstructor) {
   auto attributedStringBox = AttributedStringBox{};
@@ -101,5 +100,4 @@ TEST(AttributedStringBoxTest, testMoveAssignment) {
   }
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/attributedstring/tests/ParagraphAttributesTest.cpp b/ReactCommon/react/renderer/attributedstring/tests/ParagraphAttributesTest.cpp
@@ -10,8 +10,7 @@
 #include <react/renderer/attributedstring/conversions.h>
 #include <react/renderer/attributedstring/primitives.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 #ifdef ANDROID
 
@@ -32,5 +31,4 @@ TEST(ParagraphAttributesTest, testToDynamic) {
 
 #endif
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.cpp b/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.cpp
@@ -7,8 +7,7 @@
 
 #include "ComponentDescriptorProviderRegistry.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 void ComponentDescriptorProviderRegistry::add(
     const ComponentDescriptorProvider &provider) const {
@@ -81,5 +80,4 @@ ComponentDescriptorProviderRegistry::createComponentDescriptorRegistry(
   return registry;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.cpp b/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.cpp
@@ -16,8 +16,7 @@
 
 #include <utility>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ComponentDescriptorRegistry::ComponentDescriptorRegistry(
     ComponentDescriptorParameters parameters,
@@ -160,5 +159,4 @@ ComponentDescriptorRegistry::getFallbackComponentDescriptor() const {
   return _fallbackComponentDescriptor;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/componentregistry/componentNameByReactViewName.cpp b/ReactCommon/react/renderer/componentregistry/componentNameByReactViewName.cpp
@@ -7,8 +7,7 @@
 
 #include "componentNameByReactViewName.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 std::string componentNameByReactViewName(std::string viewName) {
   // We need this function only for the transition period;
@@ -69,5 +68,4 @@ std::string componentNameByReactViewName(std::string viewName) {
   return viewName;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/componentregistry/native/NativeComponentRegistryBinding.cpp b/ReactCommon/react/renderer/componentregistry/native/NativeComponentRegistryBinding.cpp
@@ -12,8 +12,7 @@
 
 using namespace facebook;
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 /**
  * Public API to install the NativeComponentRegistryBinding.
@@ -49,7 +48,7 @@ bool NativeComponentRegistryBinding::hasComponent(const std::string &name) {
 
 jsi::Value NativeComponentRegistryBinding::jsProxy(
     jsi::Runtime &runtime,
-    const jsi::Value &thisVal,
+    const jsi::Value & /*thisVal*/,
     const jsi::Value *args,
     size_t count) {
   if (count != 1) {
@@ -64,5 +63,4 @@ jsi::Value NativeComponentRegistryBinding::jsProxy(
   return {result};
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/image/ImageEventEmitter.cpp b/ReactCommon/react/renderer/components/image/ImageEventEmitter.cpp
@@ -7,8 +7,7 @@
 
 #include "ImageEventEmitter.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 void ImageEventEmitter::onLoadStart() const {
   dispatchEvent("loadStart");
@@ -38,5 +37,4 @@ void ImageEventEmitter::onPartialLoad() const {
   dispatchEvent("partialLoad");
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/image/ImageProps.cpp b/ReactCommon/react/renderer/components/image/ImageProps.cpp
@@ -10,8 +10,7 @@
 #include <react/renderer/core/CoreFeatures.h>
 #include <react/renderer/core/propsConversions.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ImageProps::ImageProps(
     const PropsParserContext &context,
@@ -99,5 +98,4 @@ void ImageProps::setProp(
   }
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/image/ImageShadowNode.cpp b/ReactCommon/react/renderer/components/image/ImageShadowNode.cpp
@@ -12,8 +12,7 @@
 #include <react/renderer/core/LayoutContext.h>
 #include "ImageState.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 const char ImageComponentName[] = "Image";
 
@@ -94,5 +93,4 @@ void ImageShadowNode::layout(LayoutContext layoutContext) {
   ConcreteViewShadowNode::layout(layoutContext);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/image/ImageState.cpp b/ReactCommon/react/renderer/components/image/ImageState.cpp
@@ -7,8 +7,7 @@
 
 #include "ImageState.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ImageSource ImageState::getImageSource() const {
   return imageSource_;
@@ -22,5 +21,4 @@ Float ImageState::getBlurRadius() const {
   return blurRadius_;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/modal/ModalHostViewShadowNode.cpp b/ReactCommon/react/renderer/components/modal/ModalHostViewShadowNode.cpp
@@ -10,10 +10,8 @@
 #include <react/renderer/components/modal/ModalHostViewShadowNode.h>
 #include <react/renderer/core/LayoutContext.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 extern const char ModalHostViewComponentName[] = "ModalHostView";
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/modal/ModalHostViewState.cpp b/ReactCommon/react/renderer/components/modal/ModalHostViewState.cpp
@@ -7,8 +7,7 @@
 
 #include "ModalHostViewState.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 #ifdef ANDROID
 folly::dynamic ModalHostViewState::getDynamic() const {
@@ -17,5 +16,4 @@ folly::dynamic ModalHostViewState::getDynamic() const {
 }
 #endif
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/...r/android/react/renderer/components/progressbar/AndroidProgressBarMeasurementsManager.cpp b/...r/android/react/renderer/components/progressbar/AndroidProgressBarMeasurementsManager.cpp
@@ -13,8 +13,7 @@
 
 using namespace facebook::jni;
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 Size AndroidProgressBarMeasurementsManager::measure(
     SurfaceId surfaceId,
@@ -71,5 +70,4 @@ Size AndroidProgressBarMeasurementsManager::measure(
   return measurement;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/...rogressbar/android/react/renderer/components/progressbar/AndroidProgressBarShadowNode.cpp b/...rogressbar/android/react/renderer/components/progressbar/AndroidProgressBarShadowNode.cpp
@@ -10,8 +10,7 @@
 #include <react/renderer/components/progressbar/AndroidProgressBarShadowNode.h>
 #include <react/renderer/core/LayoutContext.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 extern const char AndroidProgressBarComponentName[] = "AndroidProgressBar";
 
@@ -31,5 +30,4 @@ Size AndroidProgressBarShadowNode::measureContent(
       getSurfaceId(), getConcreteProps(), layoutConstraints);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react