From e00189c323d42b0cacafc320aa890eb4d630d394 Mon Sep 17 00:00:00 2001
From: CEL Dev Team <cel-dev@google.com>
Date: Sat, 23 May 2026 02:26:10 -0700
Subject: [PATCH] No public description

PiperOrigin-RevId: 920098804
---
 runtime/activation_test.cc        | 4 ++--
 runtime/function_registry.cc      | 5 ++---
 runtime/function_registry_test.cc | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/runtime/activation_test.cc b/runtime/activation_test.cc
index e6a74f027..4303116a3 100644
--- a/runtime/activation_test.cc
+++ b/runtime/activation_test.cc
@@ -326,7 +326,7 @@ TEST_F(ActivationTest, MoveAssignment) {
       "val_provided",
       [](absl::string_view name, const google::protobuf::DescriptorPool* absl_nonnull,
          google::protobuf::MessageFactory* absl_nonnull, google::protobuf::Arena* absl_nonnull)
-          -> absl::StatusOr<absl::optional<Value>> { return IntValue(42); }));
+          -> absl::StatusOr<std::optional<Value>> { return IntValue(42); }));
   moved_from.SetUnknownPatterns(
       {AttributePattern("var1",
                         {AttributeQualifierPattern::OfString("field1")}),
@@ -377,7 +377,7 @@ TEST_F(ActivationTest, MoveCtor) {
       "val_provided",
       [](absl::string_view name, const google::protobuf::DescriptorPool* absl_nonnull,
          google::protobuf::MessageFactory* absl_nonnull, google::protobuf::Arena* absl_nonnull)
-          -> absl::StatusOr<absl::optional<Value>> { return IntValue(42); }));
+          -> absl::StatusOr<std::optional<Value>> { return IntValue(42); }));
   moved_from.SetUnknownPatterns(
       {AttributePattern("var1",
                         {AttributeQualifierPattern::OfString("field1")}),
diff --git a/runtime/function_registry.cc b/runtime/function_registry.cc
index ac1e53eb5..59f267255 100644
--- a/runtime/function_registry.cc
+++ b/runtime/function_registry.cc
@@ -44,14 +44,13 @@ class ActivationFunctionProviderImpl
  public:
   ActivationFunctionProviderImpl() = default;
 
-  absl::StatusOr<absl::optional<cel::FunctionOverloadReference>> GetFunction(
+  absl::StatusOr<std::optional<FunctionOverloadReference>> GetFunction(
       const cel::FunctionDescriptor& descriptor,
       const cel::ActivationInterface& activation) const override {
     std::vector<cel::FunctionOverloadReference> overloads =
         activation.FindFunctionOverloads(descriptor.name());
 
-    absl::optional<cel::FunctionOverloadReference> matching_overload =
-        absl::nullopt;
+    std::optional<FunctionOverloadReference> matching_overload = absl::nullopt;
 
     for (const auto& overload : overloads) {
       if (overload.descriptor.ShapeMatches(descriptor)) {
diff --git a/runtime/function_registry_test.cc b/runtime/function_registry_test.cc
index af7f5bc06..53916777a 100644
--- a/runtime/function_registry_test.cc
+++ b/runtime/function_registry_test.cc
@@ -120,7 +120,7 @@ TEST(FunctionRegistryTest, DefaultLazyProviderNoOverloadFound) {
   ASSERT_THAT(providers, SizeIs(1));
   const FunctionProvider& provider = providers[0].provider;
   ASSERT_OK_AND_ASSIGN(
-      absl::optional<FunctionOverloadReference> func,
+      std::optional<FunctionOverloadReference> func,
       provider.GetFunction({"LazyFunc", false, {cel::Kind::kInt64}},
                            activation));
 
@@ -146,7 +146,7 @@ TEST(FunctionRegistryTest, DefaultLazyProviderReturnsImpl) {
   ASSERT_THAT(providers, SizeIs(1));
   const FunctionProvider& provider = providers[0].provider;
   ASSERT_OK_AND_ASSIGN(
-      absl::optional<FunctionOverloadReference> func,
+      std::optional<FunctionOverloadReference> func,
       provider.GetFunction(
           FunctionDescriptor("LazyFunction", false, {Kind::kInt}), activation));