From 351b1a20d781d785f414e40cd76cb02aa3769264 Mon Sep 17 00:00:00 2001 From: Samuel Susla Date: Fri, 22 Sep 2023 05:53:13 -0700 Subject: [PATCH] remove folly::hash from graphics module (#39507) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/39507 changelog: [internal] Reviewed By: cipolleschi Differential Revision: D49349976 fbshipit-source-id: 5762b56b853640c21a13167b4ae2b8f966273fce --- .../ReactCommon/react/renderer/graphics/CMakeLists.txt | 2 +- .../ReactCommon/react/renderer/graphics/Point.h | 4 ++-- .../react/renderer/graphics/React-graphics.podspec | 1 + .../react-native/ReactCommon/react/renderer/graphics/Rect.h | 4 ++-- .../ReactCommon/react/renderer/graphics/RectangleCorners.h | 5 ++--- .../ReactCommon/react/renderer/graphics/RectangleEdges.h | 6 +++--- .../react-native/ReactCommon/react/renderer/graphics/Size.h | 4 ++-- .../ReactCommon/react/renderer/graphics/Transform.h | 5 ++--- 8 files changed, 15 insertions(+), 16 deletions(-) diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/graphics/CMakeLists.txt index dbfa549afd8..05914513e8a 100644 --- a/packages/react-native/ReactCommon/react/renderer/graphics/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/graphics/CMakeLists.txt @@ -24,4 +24,4 @@ target_include_directories(react_render_graphics ${CMAKE_CURRENT_SOURCE_DIR}/platform/android/ ) -target_link_libraries(react_render_graphics glog fb fbjni folly_runtime react_debug) +target_link_libraries(react_render_graphics glog fb fbjni folly_runtime react_debug react_utils) diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/Point.h b/packages/react-native/ReactCommon/react/renderer/graphics/Point.h index 85ffdefe55f..34ffe2ad54d 100644 --- a/packages/react-native/ReactCommon/react/renderer/graphics/Point.h +++ b/packages/react-native/ReactCommon/react/renderer/graphics/Point.h @@ -9,8 +9,8 @@ #include -#include #include +#include namespace facebook::react { @@ -63,7 +63,7 @@ namespace std { template <> struct hash { size_t operator()(const facebook::react::Point& point) const noexcept { - return folly::hash::hash_combine(0, point.x, point.y); + return facebook::react::hash_combine(point.x, point.y); } }; diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/React-graphics.podspec b/packages/react-native/ReactCommon/react/renderer/graphics/React-graphics.podspec index 4f10e5c6a7f..30821025e8a 100644 --- a/packages/react-native/ReactCommon/react/renderer/graphics/React-graphics.podspec +++ b/packages/react-native/ReactCommon/react/renderer/graphics/React-graphics.podspec @@ -57,4 +57,5 @@ Pod::Spec.new do |s| s.dependency "glog" s.dependency "RCT-Folly/Fabric", folly_version s.dependency "React-Core/Default", version + s.dependency "React-utils" end diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/Rect.h b/packages/react-native/ReactCommon/react/renderer/graphics/Rect.h index 3061a029c30..45c3ee12f7a 100644 --- a/packages/react-native/ReactCommon/react/renderer/graphics/Rect.h +++ b/packages/react-native/ReactCommon/react/renderer/graphics/Rect.h @@ -10,10 +10,10 @@ #include #include -#include #include #include #include +#include namespace facebook::react { @@ -125,7 +125,7 @@ namespace std { template <> struct hash { size_t operator()(const facebook::react::Rect& rect) const noexcept { - return folly::hash::hash_combine(0, rect.origin, rect.size); + return facebook::react::hash_combine(rect.origin, rect.size); } }; diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/RectangleCorners.h b/packages/react-native/ReactCommon/react/renderer/graphics/RectangleCorners.h index f3584629d51..a5c2dd465a4 100644 --- a/packages/react-native/ReactCommon/react/renderer/graphics/RectangleCorners.h +++ b/packages/react-native/ReactCommon/react/renderer/graphics/RectangleCorners.h @@ -9,8 +9,8 @@ #include -#include #include +#include namespace facebook::react { @@ -57,8 +57,7 @@ template struct hash> { size_t operator()( const facebook::react::RectangleCorners& corners) const noexcept { - return folly::hash::hash_combine( - 0, + return facebook::react::hash_combine( corners.topLeft, corners.bottomLeft, corners.topRight, diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/RectangleEdges.h b/packages/react-native/ReactCommon/react/renderer/graphics/RectangleEdges.h index 332ee21778d..18ebe391ecf 100644 --- a/packages/react-native/ReactCommon/react/renderer/graphics/RectangleEdges.h +++ b/packages/react-native/ReactCommon/react/renderer/graphics/RectangleEdges.h @@ -9,9 +9,9 @@ #include -#include #include #include +#include namespace facebook::react { @@ -100,8 +100,8 @@ template struct hash> { size_t operator()( const facebook::react::RectangleEdges& edges) const noexcept { - return folly::hash::hash_combine( - 0, edges.left, edges.right, edges.top, edges.bottom); + return facebook::react::hash_combine( + edges.left, edges.right, edges.top, edges.bottom); } }; diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/Size.h b/packages/react-native/ReactCommon/react/renderer/graphics/Size.h index 4ab260fd757..490723cb4eb 100644 --- a/packages/react-native/ReactCommon/react/renderer/graphics/Size.h +++ b/packages/react-native/ReactCommon/react/renderer/graphics/Size.h @@ -9,9 +9,9 @@ #include -#include #include #include +#include namespace facebook::react { @@ -50,7 +50,7 @@ namespace std { template <> struct hash { size_t operator()(const facebook::react::Size& size) const { - return folly::hash::hash_combine(0, size.width, size.height); + return facebook::react::hash_combine(size.width, size.height); } }; diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/Transform.h b/packages/react-native/ReactCommon/react/renderer/graphics/Transform.h index bdf8028833e..1ed8353862b 100644 --- a/packages/react-native/ReactCommon/react/renderer/graphics/Transform.h +++ b/packages/react-native/ReactCommon/react/renderer/graphics/Transform.h @@ -10,13 +10,13 @@ #include #include -#include #include #include #include #include #include #include +#include #ifdef ANDROID #include @@ -232,8 +232,7 @@ namespace std { template <> struct hash { size_t operator()(const facebook::react::Transform& transform) const { - return folly::hash::hash_combine( - 0, + return facebook::react::hash_combine( transform.matrix[0], transform.matrix[1], transform.matrix[2],