Switch from static_cast to member functions for conversion

PiperOrigin-RevId: 676953959
google · Sep 23, 2024 · 7f8b769 · 7f8b769
1 parent 1040e41
commit 7f8b769
Show file tree

Hide file tree

Showing 40 changed files with 911 additions and 383 deletions.
diff --git a/common/legacy_value.cc b/common/legacy_value.cc
@@ -449,7 +449,7 @@ class CelListValueBuilder final : public ListValueBuilder {
 
   absl::Status Add(Value value) override {
     if (value.Is<ErrorValue>()) {
-      return static_cast<ErrorValue>(std::move(value)).NativeValue();
+      return std::move(value).Get<ErrorValue>().NativeValue();
     }
     CEL_ASSIGN_OR_RETURN(auto legacy_value, LegacyValue(arena_, value));
     elements_.push_back(legacy_value);
@@ -501,10 +501,10 @@ class CelMapValueBuilder final : public MapValueBuilder {
 
   absl::Status Put(Value key, Value value) override {
     if (key.Is<ErrorValue>()) {
-      return static_cast<ErrorValue>(std::move(key)).NativeValue();
+      return std::move(key).Get<ErrorValue>().NativeValue();
     }
     if (value.Is<ErrorValue>()) {
-      return static_cast<ErrorValue>(std::move(value)).NativeValue();
+      return std::move(value).Get<ErrorValue>().NativeValue();
     }
     CEL_ASSIGN_OR_RETURN(auto legacy_key, LegacyValue(arena_, key));
     CEL_ASSIGN_OR_RETURN(auto legacy_value, LegacyValue(arena_, value));

diff --git a/common/list_type_reflector.cc b/common/list_type_reflector.cc
@@ -126,7 +126,7 @@ class ListValueBuilderImpl final : public ListValueBuilder {
 
   absl::Status Add(Value value) override {
     if (value.Is<ErrorValue>()) {
-      return static_cast<ErrorValue>(std::move(value)).NativeValue();
+      return std::move(value).Get<ErrorValue>().NativeValue();
     }
     elements_.push_back(std::move(value));
     return absl::OkStatus();

diff --git a/common/map_type_reflector.cc b/common/map_type_reflector.cc
@@ -422,10 +422,10 @@ class MapValueBuilderImpl final : public MapValueBuilder {
 
   absl::Status Put(Value key, Value value) override {
     if (key.Is<ErrorValue>()) {
-      return static_cast<ErrorValue>(std::move(key)).NativeValue();
+      return std::move(key).Get<ErrorValue>().NativeValue();
     }
     if (value.Is<ErrorValue>()) {
-      return static_cast<ErrorValue>(std::move(value)).NativeValue();
+      return std::move(value).Get<ErrorValue>().NativeValue();
     }
     auto inserted = entries_.insert({std::move(key), std::move(value)}).second;
     if (!inserted) {