react-native 0.70.4 → 0.71.0-rc.0

package/ReactCommon/react/renderer/runtimescheduler/tests/RuntimeSchedulerTest.cpp

@@ -52,17 +52,17 @@ class RuntimeSchedulerTest : public testing::Test {
         jsi::PropNameID::forUtf8(*runtime_, ""),
         3,
         [this, callback = std::move(callback)](
-            jsi::Runtime &,
-            jsi::Value const &,
+            jsi::Runtime & /*unused*/,
+            jsi::Value const & /*unused*/,
             jsi::Value const *arguments,
-            size_t) -> jsi::Value {
+            size_t /*unused*/) -> jsi::Value {
           ++hostFunctionCallCount_;
           auto didUserCallbackTimeout = arguments[0].getBool();
           return callback(didUserCallbackTimeout);
         });
   }
 
-  uint hostFunctionCallCount_;
+  uint hostFunctionCallCount_{};
 
   std::unique_ptr<facebook::hermes::HermesRuntime> runtime_;
   std::unique_ptr<StubClock> stubClock_;
@@ -116,7 +116,7 @@ TEST_F(RuntimeSchedulerTest, scheduleImmediatePriorityTask) {
   auto callback =
       createHostFunctionFromLambda([&didRunTask](bool didUserCallbackTimeout) {
         didRunTask = true;
-        EXPECT_FALSE(didUserCallbackTimeout);
+        EXPECT_TRUE(didUserCallbackTimeout);
         return jsi::Value::undefined();
       });
 
@@ -137,9 +137,7 @@ TEST_F(RuntimeSchedulerTest, taskExpiration) {
   auto callback =
       createHostFunctionFromLambda([&didRunTask](bool didUserCallbackTimeout) {
         didRunTask = true;
-        // Task has timed out but the parameter is deprecated and `false` is
-        // hardcoded.
-        EXPECT_FALSE(didUserCallbackTimeout);
+        EXPECT_TRUE(didUserCallbackTimeout);
         return jsi::Value::undefined();
       });
 
@@ -160,8 +158,8 @@ TEST_F(RuntimeSchedulerTest, taskExpiration) {
 
 TEST_F(RuntimeSchedulerTest, scheduleTwoTasksWithSamePriority) {
   uint firstTaskCallOrder = 0;
-  auto callbackOne =
-      createHostFunctionFromLambda([this, &firstTaskCallOrder](bool) {
+  auto callbackOne = createHostFunctionFromLambda(
+      [this, &firstTaskCallOrder](bool /*unused*/) {
         firstTaskCallOrder = hostFunctionCallCount_;
         return jsi::Value::undefined();
       });
@@ -170,8 +168,8 @@ TEST_F(RuntimeSchedulerTest, scheduleTwoTasksWithSamePriority) {
       SchedulerPriority::NormalPriority, std::move(callbackOne));
 
   uint secondTaskCallOrder;
-  auto callbackTwo =
-      createHostFunctionFromLambda([this, &secondTaskCallOrder](bool) {
+  auto callbackTwo = createHostFunctionFromLambda(
+      [this, &secondTaskCallOrder](bool /*unused*/) {
         secondTaskCallOrder = hostFunctionCallCount_;
         return jsi::Value::undefined();
       });
@@ -193,8 +191,8 @@ TEST_F(RuntimeSchedulerTest, scheduleTwoTasksWithSamePriority) {
 
 TEST_F(RuntimeSchedulerTest, scheduleTwoTasksWithDifferentPriorities) {
   uint lowPriorityTaskCallOrder = 0;
-  auto callbackOne =
-      createHostFunctionFromLambda([this, &lowPriorityTaskCallOrder](bool) {
+  auto callbackOne = createHostFunctionFromLambda(
+      [this, &lowPriorityTaskCallOrder](bool /*unused*/) {
         lowPriorityTaskCallOrder = hostFunctionCallCount_;
         return jsi::Value::undefined();
       });
@@ -204,7 +202,7 @@ TEST_F(RuntimeSchedulerTest, scheduleTwoTasksWithDifferentPriorities) {
 
   uint userBlockingPriorityTaskCallOrder;
   auto callbackTwo = createHostFunctionFromLambda(
-      [this, &userBlockingPriorityTaskCallOrder](bool) {
+      [this, &userBlockingPriorityTaskCallOrder](bool /*unused*/) {
         userBlockingPriorityTaskCallOrder = hostFunctionCallCount_;
         return jsi::Value::undefined();
       });
@@ -226,7 +224,7 @@ TEST_F(RuntimeSchedulerTest, scheduleTwoTasksWithDifferentPriorities) {
 
 TEST_F(RuntimeSchedulerTest, cancelTask) {
   bool didRunTask = false;
-  auto callback = createHostFunctionFromLambda([&didRunTask](bool) {
+  auto callback = createHostFunctionFromLambda([&didRunTask](bool /*unused*/) {
     didRunTask = true;
     return jsi::Value::undefined();
   });
@@ -249,16 +247,16 @@ TEST_F(RuntimeSchedulerTest, continuationTask) {
   bool didRunTask = false;
   bool didContinuationTask = false;
 
-  auto callback = createHostFunctionFromLambda([&](bool) {
+  auto callback = createHostFunctionFromLambda([&](bool /*unused*/) {
     didRunTask = true;
     return jsi::Function::createFromHostFunction(
         *runtime_,
         jsi::PropNameID::forUtf8(*runtime_, ""),
         1,
-        [&](jsi::Runtime &runtime,
-            jsi::Value const &,
-            jsi::Value const *arguments,
-            size_t) noexcept -> jsi::Value {
+        [&](jsi::Runtime & /*runtime*/,
+            jsi::Value const & /*unused*/,
+            jsi::Value const * /*arguments*/,
+            size_t /*unused*/) noexcept -> jsi::Value {
           didContinuationTask = true;
           return jsi::Value::undefined();
         });
@@ -279,7 +277,7 @@ TEST_F(RuntimeSchedulerTest, continuationTask) {
 
 TEST_F(RuntimeSchedulerTest, getCurrentPriorityLevel) {
   auto callback =
-      createHostFunctionFromLambda([this](bool didUserCallbackTimeout) {
+      createHostFunctionFromLambda([this](bool /*didUserCallbackTimeout*/) {
         EXPECT_EQ(
             runtimeScheduler_->getCurrentPriorityLevel(),
             SchedulerPriority::ImmediatePriority);
@@ -299,12 +297,13 @@ TEST_F(RuntimeSchedulerTest, getCurrentPriorityLevel) {
       runtimeScheduler_->getCurrentPriorityLevel(),
       SchedulerPriority::NormalPriority);
 
-  callback = createHostFunctionFromLambda([this](bool didUserCallbackTimeout) {
-    EXPECT_EQ(
-        runtimeScheduler_->getCurrentPriorityLevel(),
-        SchedulerPriority::IdlePriority);
-    return jsi::Value::undefined();
-  });
+  callback =
+      createHostFunctionFromLambda([this](bool /*didUserCallbackTimeout*/) {
+        EXPECT_EQ(
+            runtimeScheduler_->getCurrentPriorityLevel(),
+            SchedulerPriority::IdlePriority);
+        return jsi::Value::undefined();
+      });
 
   runtimeScheduler_->scheduleTask(
       SchedulerPriority::IdlePriority, std::move(callback));
@@ -319,7 +318,7 @@ TEST_F(RuntimeSchedulerTest, getCurrentPriorityLevel) {
 TEST_F(RuntimeSchedulerTest, scheduleWorkWithYielding) {
   bool wasCalled = false;
   runtimeScheduler_->scheduleWork(
-      [&](jsi::Runtime const &) { wasCalled = true; });
+      [&](jsi::Runtime const & /*unused*/) { wasCalled = true; });
 
   EXPECT_FALSE(wasCalled);
 
@@ -338,7 +337,7 @@ TEST_F(RuntimeSchedulerTest, normalTaskYieldsToPlatformEvent) {
   bool didRunJavaScriptTask = false;
   bool didRunPlatformWork = false;
 
-  auto callback = createHostFunctionFromLambda([&](bool) {
+  auto callback = createHostFunctionFromLambda([&](bool /*unused*/) {
     didRunJavaScriptTask = true;
     EXPECT_TRUE(didRunPlatformWork);
     return jsi::Value::undefined();
@@ -347,7 +346,7 @@ TEST_F(RuntimeSchedulerTest, normalTaskYieldsToPlatformEvent) {
   runtimeScheduler_->scheduleTask(
       SchedulerPriority::NormalPriority, std::move(callback));
 
-  runtimeScheduler_->scheduleWork([&](jsi::Runtime const &) {
+  runtimeScheduler_->scheduleWork([&](jsi::Runtime const & /*unused*/) {
     didRunPlatformWork = true;
     EXPECT_FALSE(didRunJavaScriptTask);
     EXPECT_FALSE(runtimeScheduler_->getShouldYield());
@@ -365,7 +364,7 @@ TEST_F(RuntimeSchedulerTest, expiredTaskDoesntYieldToPlatformEvent) {
   bool didRunJavaScriptTask = false;
   bool didRunPlatformWork = false;
 
-  auto callback = createHostFunctionFromLambda([&](bool) {
+  auto callback = createHostFunctionFromLambda([&](bool /*unused*/) {
     didRunJavaScriptTask = true;
     EXPECT_FALSE(didRunPlatformWork);
     return jsi::Value::undefined();
@@ -374,7 +373,7 @@ TEST_F(RuntimeSchedulerTest, expiredTaskDoesntYieldToPlatformEvent) {
   runtimeScheduler_->scheduleTask(
       SchedulerPriority::NormalPriority, std::move(callback));
 
-  runtimeScheduler_->scheduleWork([&](jsi::Runtime const &) {
+  runtimeScheduler_->scheduleWork([&](jsi::Runtime const & /*unused*/) {
     didRunPlatformWork = true;
     EXPECT_TRUE(didRunJavaScriptTask);
   });
@@ -393,7 +392,7 @@ TEST_F(RuntimeSchedulerTest, immediateTaskDoesntYieldToPlatformEvent) {
   bool didRunJavaScriptTask = false;
   bool didRunPlatformWork = false;
 
-  auto callback = createHostFunctionFromLambda([&](bool) {
+  auto callback = createHostFunctionFromLambda([&](bool /*unused*/) {
     didRunJavaScriptTask = true;
     EXPECT_FALSE(didRunPlatformWork);
     return jsi::Value::undefined();
@@ -402,7 +401,7 @@ TEST_F(RuntimeSchedulerTest, immediateTaskDoesntYieldToPlatformEvent) {
   runtimeScheduler_->scheduleTask(
       SchedulerPriority::ImmediatePriority, std::move(callback));
 
-  runtimeScheduler_->scheduleWork([&](jsi::Runtime const &) {
+  runtimeScheduler_->scheduleWork([&](jsi::Runtime const & /*unused*/) {
     didRunPlatformWork = true;
     EXPECT_TRUE(didRunJavaScriptTask);
   });
@@ -426,7 +425,7 @@ TEST_F(RuntimeSchedulerTest, scheduleTaskFromTask) {
         auto secondCallback = createHostFunctionFromLambda(
             [&didRunSecondTask](bool didUserCallbackTimeout) {
               didRunSecondTask = true;
-              EXPECT_FALSE(didUserCallbackTimeout);
+              EXPECT_TRUE(didUserCallbackTimeout);
               return jsi::Value::undefined();
             });
 
@@ -451,11 +450,12 @@ TEST_F(RuntimeSchedulerTest, scheduleTaskFromTask) {
 
 TEST_F(RuntimeSchedulerTest, handlingError) {
   bool didRunTask = false;
-  auto firstCallback = createHostFunctionFromLambda([this, &didRunTask](bool) {
-    didRunTask = true;
-    throw jsi::JSError(*runtime_, "Test error");
-    return jsi::Value::undefined();
-  });
+  auto firstCallback =
+      createHostFunctionFromLambda([this, &didRunTask](bool /*unused*/) {
+        didRunTask = true;
+        throw jsi::JSError(*runtime_, "Test error");
+        return jsi::Value::undefined();
+      });
 
   runtimeScheduler_->scheduleTask(
       SchedulerPriority::NormalPriority, std::move(firstCallback));
@@ -474,7 +474,7 @@ TEST_F(RuntimeSchedulerTest, basicSameThreadExecution) {
   bool didRunSynchronousTask = false;
   std::thread t1([this, &didRunSynchronousTask]() {
     runtimeScheduler_->executeNowOnTheSameThread(
-        [this, &didRunSynchronousTask](jsi::Runtime &rt) {
+        [this, &didRunSynchronousTask](jsi::Runtime & /*rt*/) {
           EXPECT_TRUE(runtimeScheduler_->getIsSynchronous());
           didRunSynchronousTask = true;
         });
@@ -506,7 +506,7 @@ TEST_F(RuntimeSchedulerTest, sameThreadTaskCreatesImmediatePriorityTask) {
           auto callback = createHostFunctionFromLambda(
               [&didRunSubsequentTask](bool didUserCallbackTimeout) {
                 didRunSubsequentTask = true;
-                EXPECT_FALSE(didUserCallbackTimeout);
+                EXPECT_TRUE(didUserCallbackTimeout);
                 return jsi::Value::undefined();
               });
 
@@ -584,11 +584,11 @@ TEST_F(RuntimeSchedulerTest, twoThreadsRequestAccessToTheRuntime) {
   bool didRunWork = false;
 
   runtimeScheduler_->scheduleWork(
-      [&didRunWork](jsi::Runtime &) { didRunWork = true; });
+      [&didRunWork](jsi::Runtime & /*unused*/) { didRunWork = true; });
 
   std::thread t1([this, &didRunSynchronousTask]() {
     runtimeScheduler_->executeNowOnTheSameThread(
-        [&didRunSynchronousTask](jsi::Runtime &runtime) {
+        [&didRunSynchronousTask](jsi::Runtime & /*runtime*/) {
           didRunSynchronousTask = true;
         });
   });

package/ReactCommon/react/renderer/scheduler/AsynchronousEventBeat.cpp

@@ -23,7 +23,7 @@ AsynchronousEventBeat::AsynchronousEventBeat(
 
 void AsynchronousEventBeat::activityDidChange(
     RunLoopObserver::Delegate const *delegate,
-    RunLoopObserver::Activity) const noexcept {
+    RunLoopObserver::Activity /*activity*/) const noexcept {
   react_native_assert(delegate == this);
   induce();
 }

package/ReactCommon/react/renderer/scheduler/BUCK

@@ -30,12 +30,12 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/scheduler",
     ),
+    compiler_flags_pedantic = True,
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
@@ -47,10 +47,6 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:memory",
-        "//xplat/folly:molly",
-        "//xplat/jsi:JSIDynamic",
         "//xplat/jsi:jsi",
         react_native_xplat_target("react/config:config"),
         react_native_xplat_target("react/debug:debug"),

package/ReactCommon/react/renderer/scheduler/CMakeLists.txt

@@ -6,7 +6,14 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DLOG_TAG=\"Fabric\")
 
 file(GLOB react_render_scheduler_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(react_render_scheduler SHARED ${react_render_scheduler_SRC})

package/ReactCommon/react/renderer/scheduler/Scheduler.cpp

@@ -27,8 +27,7 @@
 #include <iostream>
 #endif
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 Scheduler::Scheduler(
     SchedulerToolbox const &schedulerToolbox,
@@ -49,19 +48,10 @@ Scheduler::Scheduler(
   auto eventOwnerBox = std::make_shared<EventBeat::OwnerBox>();
   eventOwnerBox->owner = eventDispatcher_;
 
-#ifdef ANDROID
-  auto enableCallImmediates = reactNativeConfig_->getBool(
-      "react_native_new_architecture:enable_call_immediates_android");
-#else
-  auto enableCallImmediates = reactNativeConfig_->getBool(
-      "react_native_new_architecture:enable_call_immediates_ios");
-#endif
-
   auto weakRuntimeScheduler =
       contextContainer_->find<std::weak_ptr<RuntimeScheduler>>(
           "RuntimeScheduler");
-  auto runtimeScheduler =
-      (enableCallImmediates && weakRuntimeScheduler.has_value())
+  auto runtimeScheduler = weakRuntimeScheduler.has_value()
       ? weakRuntimeScheduler.value().lock()
       : nullptr;
 
@@ -77,7 +67,7 @@ Scheduler::Scheduler(
               runtime, eventTarget, type, priority, payloadFactory);
         },
         runtime);
-    if (runtimeScheduler) {
+    if (runtimeScheduler != nullptr) {
       runtimeScheduler->callExpiredTasks(runtime);
     }
   };
@@ -104,11 +94,13 @@ Scheduler::Scheduler(
   uiManager->setDelegate(this);
   uiManager->setComponentDescriptorRegistry(componentDescriptorRegistry_);
 
-  runtimeExecutor_(
-      [uiManager, runtimeExecutor = runtimeExecutor_](jsi::Runtime &runtime) {
-        UIManagerBinding::createAndInstallIfNeeded(
-            runtime, runtimeExecutor, uiManager);
-      });
+  auto bindingsExecutor =
+      schedulerToolbox.bridgelessBindingsExecutor.has_value()
+      ? schedulerToolbox.bridgelessBindingsExecutor.value()
+      : runtimeExecutor_;
+  bindingsExecutor([uiManager](jsi::Runtime &runtime) {
+    UIManagerBinding::createAndInstallIfNeeded(runtime, uiManager);
+  });
 
   auto componentDescriptorRegistryKey =
       "ComponentDescriptorRegistry_DO_NOT_USE_PRETTY_PLEASE";
@@ -304,37 +296,26 @@ void Scheduler::uiManagerDidFinishTransaction(
     MountingCoordinator::Shared const &mountingCoordinator) {
   SystraceSection s("Scheduler::uiManagerDidFinishTransaction");
 
-  if (delegate_) {
+  if (delegate_ != nullptr) {
     delegate_->schedulerDidFinishTransaction(mountingCoordinator);
   }
 }
 void Scheduler::uiManagerDidCreateShadowNode(const ShadowNode &shadowNode) {
   SystraceSection s("Scheduler::uiManagerDidCreateShadowNode");
 
-  if (delegate_) {
+  if (delegate_ != nullptr) {
     delegate_->schedulerDidRequestPreliminaryViewAllocation(
         shadowNode.getSurfaceId(), shadowNode);
   }
 }
 
-void Scheduler::uiManagerDidCloneShadowNode(
-    const ShadowNode &oldShadowNode,
-    const ShadowNode &newShadowNode) {
-  SystraceSection s("Scheduler::uiManagerDidCloneShadowNode");
-
-  if (delegate_) {
-    delegate_->schedulerDidCloneShadowNode(
-        newShadowNode.getSurfaceId(), oldShadowNode, newShadowNode);
-  }
-}
-
 void Scheduler::uiManagerDidDispatchCommand(
     const ShadowNode::Shared &shadowNode,
     std::string const &commandName,
     folly::dynamic const &args) {
   SystraceSection s("Scheduler::uiManagerDispatchCommand");
 
-  if (delegate_) {
+  if (delegate_ != nullptr) {
     auto shadowView = ShadowView(*shadowNode);
     delegate_->schedulerDidDispatchCommand(shadowView, commandName, args);
   }
@@ -345,7 +326,7 @@ void Scheduler::uiManagerDidSendAccessibilityEvent(
     std::string const &eventType) {
   SystraceSection s("Scheduler::uiManagerDidSendAccessibilityEvent");
 
-  if (delegate_) {
+  if (delegate_ != nullptr) {
     auto shadowView = ShadowView(*shadowNode);
     delegate_->schedulerDidSendAccessibilityEvent(shadowView, eventType);
   }
@@ -358,7 +339,7 @@ void Scheduler::uiManagerDidSetIsJSResponder(
     ShadowNode::Shared const &shadowNode,
     bool isJSResponder,
     bool blockNativeResponder) {
-  if (delegate_) {
+  if (delegate_ != nullptr) {
     delegate_->schedulerDidSetIsJSResponder(
         ShadowView(*shadowNode), isJSResponder, blockNativeResponder);
   }
@@ -386,5 +367,4 @@ void Scheduler::removeEventListener(
   }
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/ReactCommon/react/renderer/scheduler/Scheduler.h

@@ -90,9 +90,6 @@ class Scheduler final : public UIManagerDelegate {
   void uiManagerDidFinishTransaction(
       MountingCoordinator::Shared const &mountingCoordinator) override;
   void uiManagerDidCreateShadowNode(const ShadowNode &shadowNode) override;
-  void uiManagerDidCloneShadowNode(
-      const ShadowNode &oldShadowNode,
-      const ShadowNode &newShadowNode) override;
   void uiManagerDidDispatchCommand(
       const ShadowNode::Shared &shadowNode,
       std::string const &commandName,
@@ -101,7 +98,7 @@ class Scheduler final : public UIManagerDelegate {
       const ShadowNode::Shared &shadowNode,
       std::string const &eventType) override;
   void uiManagerDidSetIsJSResponder(
-      ShadowNode::Shared const &shadowView,
+      ShadowNode::Shared const &shadowNode,
       bool isJSResponder,
       bool blockNativeResponder) override;
 

package/ReactCommon/react/renderer/scheduler/SchedulerDelegate.h

@@ -36,14 +36,6 @@ class SchedulerDelegate {
       SurfaceId surfaceId,
       const ShadowNode &shadowView) = 0;
 
-  /*
-   * Called right after a ShadowNode is cloned.
-   */
-  virtual void schedulerDidCloneShadowNode(
-      SurfaceId surfaceId,
-      const ShadowNode &oldShadowNode,
-      const ShadowNode &newShadowNode) = 0;
-
   virtual void schedulerDidDispatchCommand(
       const ShadowView &shadowView,
       std::string const &commandName,

package/ReactCommon/react/renderer/scheduler/SchedulerToolbox.h

@@ -40,6 +40,13 @@ struct SchedulerToolbox final {
 
   /*
    * Represents running JavaScript VM and associated execution queue.
+   * Can execute lambdas before main bundle has loaded.
+   */
+  std::optional<RuntimeExecutor> bridgelessBindingsExecutor;
+
+  /*
+   * Represents running JavaScript VM and associated execution queue.
+   * Executes lambdas after main bundle has loaded.
    */
   RuntimeExecutor runtimeExecutor;
 

package/ReactCommon/react/renderer/scheduler/SurfaceHandler.cpp

@@ -12,8 +12,7 @@
 #include <react/renderer/scheduler/Scheduler.h>
 #include <react/renderer/uimanager/UIManager.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 using Status = SurfaceHandler::Status;
 
@@ -283,10 +282,12 @@ void SurfaceHandler::applyDisplayMode(DisplayMode displayMode) const noexcept {
       link_.shadowTree->setCommitMode(ShadowTree::CommitMode::Suspended);
       // Committing the current revision back. It will be mounted only when
       // `DisplayMode` is changed back to `Normal`.
-      link_.shadowTree->commit([&](RootShadowNode const &oldRootShadowNode) {
-        return std::static_pointer_cast<RootShadowNode>(
-            revision.rootShadowNode->ShadowNode::clone(ShadowNodeFragment{}));
-      });
+      link_.shadowTree->commit(
+          [&](RootShadowNode const & /*oldRootShadowNode*/) {
+            return std::static_pointer_cast<RootShadowNode>(
+                revision.rootShadowNode->ShadowNode::clone(
+                    ShadowNodeFragment{}));
+          });
       break;
   }
 }
@@ -302,7 +303,8 @@ void SurfaceHandler::setUIManager(UIManager const *uiManager) const noexcept {
   }
 
   link_.uiManager = uiManager;
-  link_.status = uiManager ? Status::Registered : Status::Unregistered;
+  link_.status =
+      uiManager != nullptr ? Status::Registered : Status::Unregistered;
 }
 
 SurfaceHandler::~SurfaceHandler() noexcept {
@@ -313,5 +315,4 @@ SurfaceHandler::~SurfaceHandler() noexcept {
   //      deallocation.");
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/ReactCommon/react/renderer/scheduler/SurfaceHandler.h

@@ -67,7 +67,7 @@ class SurfaceHandler {
   /*
    * Movable-only.
    */
-  SurfaceHandler(SurfaceHandler &&SurfaceHandler) noexcept;
+  SurfaceHandler(SurfaceHandler &&other) noexcept;
   SurfaceHandler(SurfaceHandler const &SurfaceHandler) noexcept = delete;
   SurfaceHandler &operator=(SurfaceHandler &&other) noexcept;
   SurfaceHandler &operator=(SurfaceHandler const &other) noexcept = delete;

package/ReactCommon/react/renderer/scheduler/SurfaceManager.cpp

@@ -9,8 +9,7 @@
 
 #include <react/renderer/scheduler/Scheduler.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 SurfaceManager::SurfaceManager(Scheduler const &scheduler) noexcept
     : scheduler_(scheduler) {}
@@ -100,5 +99,4 @@ void SurfaceManager::visit(
   callback(iterator->second);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/ReactCommon/react/renderer/scheduler/SynchronousEventBeat.cpp

@@ -11,8 +11,7 @@
 
 #include <utility>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 SynchronousEventBeat::SynchronousEventBeat(
     RunLoopObserver::Unique uiRunLoopObserver,
@@ -28,7 +27,7 @@ SynchronousEventBeat::SynchronousEventBeat(
 
 void SynchronousEventBeat::activityDidChange(
     RunLoopObserver::Delegate const *delegate,
-    RunLoopObserver::Activity activity) const noexcept {
+    RunLoopObserver::Activity /*activity*/) const noexcept {
   react_native_assert(delegate == this);
   lockExecutorAndBeat();
 }
@@ -57,5 +56,4 @@ void SynchronousEventBeat::lockExecutorAndBeat() const {
   }
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/ReactCommon/react/renderer/telemetry/BUCK

@@ -32,12 +32,12 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/telemetry",
     ),
+    compiler_flags_pedantic = True,
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
@@ -50,9 +50,6 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:memory",
-        "//xplat/folly:molly",
         react_native_xplat_target("butter:butter"),
         react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/utils:utils"),
@@ -74,7 +71,6 @@ fb_xplat_cxx_test(
     platforms = (ANDROID, APPLE, CXX),
     deps = [
         ":telemetry",
-        "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",
         react_native_xplat_target("react/test_utils:test_utils"),
     ],

package/ReactCommon/react/renderer/telemetry/CMakeLists.txt

@@ -6,7 +6,14 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DLOG_TAG=\"Fabric\")
 
 file(GLOB react_render_telemetry_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(react_render_telemetry SHARED ${react_render_telemetry_SRC})

package/ReactCommon/react/renderer/telemetry/SurfaceTelemetry.cpp

@@ -9,8 +9,7 @@
 
 #include <algorithm>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 void SurfaceTelemetry::incorporate(
     TransactionTelemetry const &telemetry,
@@ -81,5 +80,4 @@ SurfaceTelemetry::getRecentTransactionTelemetries() const {
   return result;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/ReactCommon/react/renderer/telemetry/TransactionTelemetry.cpp

@@ -11,8 +11,7 @@
 
 #include <utility>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 thread_local TransactionTelemetry *threadLocalTransactionTelemetry = nullptr;
 
@@ -161,5 +160,4 @@ int TransactionTelemetry::getRevisionNumber() const {
   return revisionNumber_;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react