Skip to content

Commit 7f7655d

Browse files
generatedunixname89002005287564facebook-github-bot
authored andcommitted
Fix CQS signal modernize-concat-nested-namespaces in xplat/js/react-native-github/packages/react-native/ReactCommon/cxxreact (facebook#52146)
Summary: Pull Request resolved: facebook#52146 Reviewed By: javache Differential Revision: D77014011 fbshipit-source-id: 35afa03482c9a4d1fe11325421615a7214337e2a
1 parent 76e04fa commit 7f7655d

7 files changed

Lines changed: 14 additions & 36 deletions

File tree

packages/react-native/ReactCommon/cxxreact/CxxModule.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ class Instance;
2020

2121
} // namespace facebook::react
2222

23-
namespace facebook {
24-
namespace xplat {
25-
namespace module {
23+
namespace facebook::xplat::module {
2624

2725
/**
2826
* Base class for Catalyst native modules whose implementations are
@@ -249,6 +247,4 @@ class CxxModule {
249247
std::weak_ptr<react::Instance> instance_;
250248
};
251249

252-
} // namespace module
253-
} // namespace xplat
254-
} // namespace facebook
250+
} // namespace facebook::xplat::module

packages/react-native/ReactCommon/cxxreact/JsArgumentHelpers.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020
// jsArgAs... methods at the end simple to use should be most common, but any
2121
// non-detail method can be used when needed.
2222

23-
namespace facebook {
24-
namespace xplat {
23+
namespace facebook::xplat {
2524

2625
class JsArgumentException : public std::logic_error {
2726
public:
@@ -118,7 +117,6 @@ inline std::string jsArgAsString(const folly::dynamic& args, size_t n) {
118117
return jsArgN(args, n, &folly::dynamic::asString);
119118
}
120119

121-
} // namespace xplat
122-
} // namespace facebook
120+
} // namespace facebook::xplat
123121

124122
#include <cxxreact/JsArgumentHelpers-inl.h>

packages/react-native/ReactCommon/cxxreact/ReactMarker.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
#include "ReactMarker.h"
99
#include <cxxreact/JSExecutor.h>
1010

11-
namespace facebook::react {
12-
namespace ReactMarker {
11+
namespace facebook::react::ReactMarker {
1312

1413
#if __clang__
1514
#pragma clang diagnostic push
@@ -138,5 +137,4 @@ double StartupLogger::getAppStartupEndTime() {
138137
return appStartupEndTime;
139138
}
140139

141-
} // namespace ReactMarker
142-
} // namespace facebook::react
140+
} // namespace facebook::react::ReactMarker

packages/react-native/ReactCommon/cxxreact/ReactMarker.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
#include <functional>
1515
#endif
1616

17-
namespace facebook::react {
18-
namespace ReactMarker {
17+
namespace facebook::react::ReactMarker {
1918

2019
enum ReactMarkerId {
2120
APP_STARTUP_START,
@@ -106,5 +105,4 @@ extern RN_EXPORT void logMarkerDone(
106105
const ReactMarkerId markerId,
107106
double markerTime);
108107

109-
} // namespace ReactMarker
110-
} // namespace facebook::react
108+
} // namespace facebook::react::ReactMarker

packages/react-native/ReactCommon/cxxreact/SampleCxxModule.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515

1616
using namespace folly;
1717

18-
namespace facebook {
19-
namespace xplat {
20-
namespace samples {
18+
namespace facebook::xplat::samples {
2119

2220
std::string Sample::hello() {
2321
LOG(WARNING) << "glog: hello, world";
@@ -171,9 +169,7 @@ void SampleCxxModule::load([[maybe_unused]] folly::dynamic args, Callback cb) {
171169
cb({d});
172170
}
173171

174-
} // namespace samples
175-
} // namespace xplat
176-
} // namespace facebook
172+
} // namespace facebook::xplat::samples
177173

178174
// By convention, the function name should be the same as the class name.
179175
facebook::xplat::module::CxxModule* SampleCxxModule() {

packages/react-native/ReactCommon/cxxreact/SampleCxxModule.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212

1313
#include <cxxreact/CxxModule.h>
1414

15-
namespace facebook {
16-
namespace xplat {
17-
namespace samples {
15+
namespace facebook::xplat::samples {
1816

1917
// In a less contrived example, Sample would be part of a traditional
2018
// C++ library.
@@ -52,8 +50,6 @@ class SampleCxxModule : public module::CxxModule {
5250
std::unique_ptr<Sample> sample_;
5351
};
5452

55-
} // namespace samples
56-
} // namespace xplat
57-
} // namespace facebook
53+
} // namespace facebook::xplat::samples
5854

5955
extern "C" facebook::xplat::module::CxxModule* SampleCxxModule();

packages/react-native/ReactCommon/cxxreact/SharedProxyCxxModule.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111

1212
#include <cxxreact/CxxModule.h>
1313

14-
namespace facebook {
15-
namespace xplat {
16-
namespace module {
14+
namespace facebook::xplat::module {
1715

1816
// Allows a Cxx-module to be shared or reused across multiple React instances
1917
// Caveat: the setInstance call is not forwarded, so usages of getInstance
@@ -39,6 +37,4 @@ class SharedProxyCxxModule : public CxxModule {
3937
std::shared_ptr<CxxModule> shared_;
4038
};
4139

42-
} // namespace module
43-
} // namespace xplat
44-
} // namespace facebook
40+
} // namespace facebook::xplat::module

0 commit comments

Comments
 (0)