Fabric: toString methods were moved into DebugStringConvertible with an implementation in .cpp file

Summary:
They need to be in DebugStringConvertible because it depends on they (and because `debugStringConvertibleUtils` depends on `DebugStringConvertible`).
We also moved they implementation to cpp file to avoid leaking Folly's features to consumer namespace.

Reviewed By: mdvacca

Differential Revision: D14715080

fbshipit-source-id: 7277e17b39a14a2d7ba7e5a9b44a70178feb1045
This commit is contained in:
Valentin Shergin
2019-04-04 12:32:41 -07:00
committed by Facebook Github Bot
parent 97e064b696
commit cabc9d1ab3
3 changed files with 39 additions and 18 deletions

View File

@@ -7,6 +7,9 @@
#include "DebugStringConvertible.h"
#include <folly/Conv.h>
#include <folly/Format.h>
namespace facebook {
namespace react {
@@ -107,6 +110,28 @@ SharedDebugStringConvertibleList DebugStringConvertible::getDebugProps() const {
return SharedDebugStringConvertibleList();
}
/*
* `toString`-family implementation.
*/
std::string toString(std::string const &value) {
return value;
}
std::string toString(int const &value) {
return folly::to<std::string>(value);
}
std::string toString(bool const &value) {
return folly::to<std::string>(value);
}
std::string toString(float const &value) {
return folly::to<std::string>(value);
}
std::string toString(double const &value) {
return folly::to<std::string>(value);
}
std::string toString(void const *value) {
return folly::sformat("0x{0:016x}", reinterpret_cast<size_t>(value));
}
#endif
} // namespace react

View File

@@ -80,5 +80,19 @@ class DebugStringConvertible {};
#endif
#if RN_DEBUG_STRING_CONVERTIBLE
/*
* Set of particular-format-opinionated functions that convert base types to `std::string`; practically incapsulate `folly:to<>` and `folly::format`.
*/
std::string toString(std::string const &value);
std::string toString(int const &value);
std::string toString(bool const &value);
std::string toString(float const &value);
std::string toString(double const &value);
std::string toString(void const *value);
#endif
} // namespace react
} // namespace facebook

View File

@@ -12,8 +12,6 @@
#include <string>
#include <vector>
#include <folly/Conv.h>
#include <folly/Optional.h>
#include <react/debug/DebugStringConvertible.h>
#include <react/debug/DebugStringConvertibleItem.h>
@@ -22,22 +20,6 @@ namespace react {
#if RN_DEBUG_STRING_CONVERTIBLE
inline std::string toString(const std::string &value) {
return value;
}
inline std::string toString(const int &value) {
return folly::to<std::string>(value);
}
inline std::string toString(const bool &value) {
return folly::to<std::string>(value);
}
inline std::string toString(const float &value) {
return folly::to<std::string>(value);
}
inline std::string toString(const double &value) {
return folly::to<std::string>(value);
}
template <typename T>
inline SharedDebugStringConvertible
debugStringConvertibleItem(std::string name, T value, T defaultValue = {}) {