Replace internal/port.h with absl/meta/type_traits.h

PiperOrigin-RevId: 365817691

Author: CEL Dev Team

common/BUILD

@@ -196,6 +196,7 @@ cc_test(
         "//internal:types",
         "//internal:value_internal",
         "//testutil:util",
+        "@com_google_absl//absl/meta:type_traits",
         "@com_google_absl//absl/strings",
         "@com_google_googleapis//google/rpc:status_cc_proto",
         "@com_google_googleapis//google/type:money_cc_proto",
@@ -218,6 +219,7 @@ cc_library(
         "//internal:list_impl",
         "//internal:map_impl",
         "//internal:types",
+        "@com_google_absl//absl/meta:type_traits",
     ],
 )
 

common/converters.h

@@ -5,6 +5,7 @@
 
 #include <memory>
 
+#include "absl/meta/type_traits.h"
 #include "common/parent_ref.h"
 #include "common/value.h"
 #include "internal/list_impl.h"
@@ -53,7 +54,7 @@ template <Value::Kind ValueKind, typename T>
 Value ValueFromList(T&& value) {
   static_assert(!std::is_pointer<T>::value, "use ValueForList");
   return Value::MakeList<
-      internal::ListWrapper<ValueKind, internal::remove_cvref_t<T>>>(
+      internal::ListWrapper<ValueKind, absl::remove_cvref_t<T>>>(
       std::forward<T>(value));
 }
 
@@ -92,7 +93,7 @@ template <Value::Kind KeyKind, Value::Kind ValueKind, typename T>
 Value ValueFromMap(T&& value) {
   static_assert(!std::is_pointer<T>::value, "use ValueForList");
   return Value::MakeMap<
-      internal::MapWrapper<KeyKind, ValueKind, internal::remove_cvref_t<T>>>(
+      internal::MapWrapper<KeyKind, ValueKind, absl::remove_cvref_t<T>>>(
       std::forward<T>(value));
 }
 

common/value_test.cc

@@ -10,6 +10,7 @@
 #include "google/type/money.pb.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
+#include "absl/meta/type_traits.h"
 #include "absl/strings/str_cat.h"
 #include "common/custom_object.h"
 #include "internal/status_util.h"
@@ -709,15 +710,15 @@ class ValueVisitTest : public ::testing::Test {
 
   template <typename H>
   void TestGetPtrVisitor() {
-    using T = remove_reference_t<decltype(*inst_of<H&>())>;
+    using T = absl::remove_reference_t<decltype(*inst_of<H&>())>;
     ExpectSameType<const T*, GetPtrVisitorType<H, T>>();
     // Return by const ref.
     ExpectSameType<const T&, GetVisitorType<H, const T&, T>>();
   }
 
   template <typename H, typename U>
   void TestGetVisitor() {
-    using T = remove_reference_t<decltype(*inst_of<H&>())>;
+    using T = absl::remove_reference_t<decltype(*inst_of<H&>())>;
     // Return by optional.
     ExpectSameType<absl::optional<U>,
                    GetVisitorType<H, absl::optional<U>, T>>();
@@ -727,7 +728,7 @@ class ValueVisitTest : public ::testing::Test {
 
   template <typename H>
   void TestValueAdapter() {
-    using T = remove_reference_t<decltype(*inst_of<H&>())>;
+    using T = absl::remove_reference_t<decltype(*inst_of<H&>())>;
     ExpectSameType<T&, ValueAdapterType<H&>>();
     ExpectSameType<const T&, ValueAdapterType<const H&>>();
   }

internal/BUILD

@@ -16,6 +16,7 @@ cc_library(
     deps = [
         ":holder",
         ":specialize",
+        "@com_google_absl//absl/meta:type_traits",
     ],
 )
 
@@ -57,10 +58,10 @@ cc_library(
         "holder.h",
     ],
     deps = [
-        ":port",
         ":specialize",
         ":types",
         ":visitor_util",
+        "@com_google_absl//absl/meta:type_traits",
     ],
 )
 
@@ -85,8 +86,8 @@ cc_library(
         "hash_util.h",
     ],
     deps = [
-        ":port",
         ":specialize",
+        "@com_google_absl//absl/meta:type_traits",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/time",
         "@com_google_googleapis//google/rpc:status_cc_proto",
@@ -129,7 +130,6 @@ cc_test(
         ":visitor_util",
         "//testutil:util",
         "@com_google_absl//absl/memory",
-        "@com_google_absl//absl/strings",
         "@com_google_googletest//:gtest_main",
     ],
 )
@@ -236,11 +236,6 @@ cc_test(
     ],
 )
 
-cc_library(
-    name = "port",
-    hdrs = ["port.h"],
-)
-
 cc_library(
     name = "specialize",
     hdrs = ["specialize.h"],
@@ -250,10 +245,10 @@ cc_library(
     name = "cast",
     hdrs = ["cast.h"],
     deps = [
-        ":port",
         ":specialize",
         ":types",
         "@com_google_absl//absl/memory",
+        "@com_google_absl//absl/meta:type_traits",
         "@com_google_absl//absl/types:optional",
     ],
 )
@@ -273,9 +268,9 @@ cc_library(
         "types.h",
     ],
     deps = [
-        ":port",
         ":specialize",
         "@com_google_absl//absl/memory",
+        "@com_google_absl//absl/meta:type_traits",
         "@com_google_absl//absl/strings",
     ],
 )

internal/cast.h

@@ -5,8 +5,8 @@
 #include <memory>
 
 #include "absl/memory/memory.h"
+#include "absl/meta/type_traits.h"
 #include "absl/types/optional.h"
-#include "internal/port.h"
 #include "internal/specialize.h"
 #include "internal/types.h"
 
@@ -63,7 +63,7 @@ struct StaticDownCastHelper<std::unique_ptr<T>> {
 template <typename T, typename U, typename = specialize>
 struct RepresentableAsHelper {
   static constexpr bool check(const U&) {
-    return std::is_same<remove_cvref_t<T>, U>::value;
+    return std::is_same<absl::remove_cvref_t<T>, U>::value;
   }
 };
 

internal/hash_util.h

@@ -6,9 +6,9 @@
 
 #include "google/protobuf/any.pb.h"
 #include "google/rpc/status.pb.h"
+#include "absl/meta/type_traits.h"
 #include "absl/strings/string_view.h"
 #include "absl/time/time.h"
-#include "internal/port.h"
 #include "internal/specialize.h"
 
 namespace google {

internal/holder.h

@@ -4,7 +4,7 @@
 #include <algorithm>
 #include <memory>
 
-#include "internal/port.h"
+#include "absl/meta/type_traits.h"
 #include "internal/specialize.h"
 #include "internal/types.h"
 #include "internal/visitor_util.h"
@@ -69,7 +69,7 @@ struct Copy : BaseHolderPolicy {
   constexpr static const bool kOwnsValue = true;
 
   template <typename T>
-  using ValueType = remove_const_t<T>;
+  using ValueType = absl::remove_const_t<T>;
 
   template <typename T>
   static T& get(T& value) {

internal/port.h

@@ -6,6 +6,7 @@
 #include <memory>
 #include <utility>
 
+#include "absl/meta/type_traits.h"
 #include "internal/holder.h"
 #include "internal/specialize.h"
 
@@ -240,8 +241,9 @@ using RefCopyHolder = Holder<T, Ref<Copy>>;
 // If the size of T is smaller than MAX, it is stored inline, otherwise
 // it is stored in a heap allocated, reference counted holder.
 template <typename T, std::size_t MAX = sizeof(void*)>
-using SizeLimitHolder = conditional_t<sizeof(T) <= MAX, Holder<const T, Copy>,
-                                      Holder<const T, Ref<Copy>>>;
+using SizeLimitHolder =
+    absl::conditional_t<sizeof(T) <= MAX, Holder<const T, Copy>,
+                        Holder<const T, Ref<Copy>>>;
 
 template <typename T>
 void ReffedPtr<T>::reset() {