From 7d4f4c474278d5f5d510714c831b19231a8974d5 Mon Sep 17 00:00:00 2001
From: Dave Kwon <dokwon@meta.com>
Date: Sun, 12 Jan 2025 17:23:20 -0800
Subject: [PATCH] Refactor `is_patch_v` to PatchTraits

Summary: Need public `PatchTraits` to re-use `is_patch_v` to avoid cyclic dependency.

Reviewed By: praihan

Differential Revision: D68005445

fbshipit-source-id: 0d3c72caeb1a394f6c0676d0f9c2df0232997fa7
---
 .../thrift/src/thrift/lib/cpp2/op/Patch.h     | 11 +-----
 .../src/thrift/lib/cpp2/op/PatchTraits.h      | 34 +++++++++++++++++++
 2 files changed, 35 insertions(+), 10 deletions(-)
 create mode 100644 third-party/thrift/src/thrift/lib/cpp2/op/PatchTraits.h

diff --git a/third-party/thrift/src/thrift/lib/cpp2/op/Patch.h b/third-party/thrift/src/thrift/lib/cpp2/op/Patch.h
index f3a28abf083482..3678a64178ef47 100644
--- a/third-party/thrift/src/thrift/lib/cpp2/op/Patch.h
+++ b/third-party/thrift/src/thrift/lib/cpp2/op/Patch.h
@@ -16,11 +16,10 @@
 
 #pragma once
 
-#include <type_traits>
-
 #include <fmt/core.h>
 #include <thrift/lib/cpp2/Thrift.h>
 #include <thrift/lib/cpp2/op/Encode.h>
+#include <thrift/lib/cpp2/op/PatchTraits.h>
 #include <thrift/lib/cpp2/op/detail/Patch.h>
 #include <thrift/lib/cpp2/protocol/DebugProtocol.h>
 #include <thrift/lib/cpp2/type/Tag.h>
@@ -114,14 +113,6 @@ using safe_patch_value_type = typename detail::SafePatchValueType<T>::type;
 template <typename T>
 using patch_type = typename detail::PatchType<type::infer_tag<T>>::type;
 
-template <typename T, typename = void>
-inline constexpr bool is_patch_v = false;
-
-template <typename T>
-inline constexpr bool
-    is_patch_v<T, folly::void_t<typename T::underlying_type>> =
-        std::is_base_of_v<detail::BasePatch<typename T::underlying_type, T>, T>;
-
 template <typename T>
 inline constexpr bool is_assign_only_patch_v = false;
 template <typename T>
diff --git a/third-party/thrift/src/thrift/lib/cpp2/op/PatchTraits.h b/third-party/thrift/src/thrift/lib/cpp2/op/PatchTraits.h
new file mode 100644
index 00000000000000..4515bc472e417d
--- /dev/null
+++ b/third-party/thrift/src/thrift/lib/cpp2/op/PatchTraits.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <type_traits>
+
+#include <thrift/lib/cpp2/op/detail/BasePatch.h>
+#include <thrift/lib/cpp2/op/detail/PatchTraits.h>
+
+namespace apache::thrift::op {
+
+template <typename T, typename = void>
+inline constexpr bool is_patch_v = false;
+
+template <typename T>
+inline constexpr bool
+    is_patch_v<T, folly::void_t<typename T::underlying_type>> =
+        std::is_base_of_v<detail::BasePatch<typename T::underlying_type, T>, T>;
+
+} // namespace apache::thrift::op