From ef57455367567055465d8d86032c54fb9db27aff Mon Sep 17 00:00:00 2001
From: CEL Dev Team <cel-dev@google.com>
Date: Thu, 18 Jun 2026 19:41:49 -0700
Subject: [PATCH] No public description

PiperOrigin-RevId: 934677950
---
 extensions/bindings_ext.cc    |  2 +-
 extensions/lists_functions.cc |  2 +-
 extensions/math_ext_macros.cc |  6 +++---
 extensions/math_ext_test.cc   |  4 ++--
 extensions/proto_ext.cc       | 12 ++++++------
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/extensions/bindings_ext.cc b/extensions/bindings_ext.cc
index c59f724bd..4823c077c 100644
--- a/extensions/bindings_ext.cc
+++ b/extensions/bindings_ext.cc
@@ -73,7 +73,7 @@ std::vector<Macro> bindings_macros() {
       [](MacroExprFactory& factory, Expr& target,
          absl::Span<Expr> args) -> absl::optional<Expr> {
         if (!IsTargetNamespace(target)) {
-          return absl::nullopt;
+          return std::nullopt;
         }
         if (!args[0].has_ident_expr()) {
           return factory.ReportErrorAt(
diff --git a/extensions/lists_functions.cc b/extensions/lists_functions.cc
index 10bc717ed..bfe05d887 100644
--- a/extensions/lists_functions.cc
+++ b/extensions/lists_functions.cc
@@ -454,7 +454,7 @@ Macro ListSortByMacro() {
             MakeMapComprehension(factory, factory.Copy(sortby_input_ident),
                                  std::move(key_ident), std::move(key_expr));
         if (!map_compr.has_value()) {
-          return absl::nullopt;
+          return std::nullopt;
         }
 
         // Build the call expression:
diff --git a/extensions/math_ext_macros.cc b/extensions/math_ext_macros.cc
index a66720a60..08b163132 100644
--- a/extensions/math_ext_macros.cc
+++ b/extensions/math_ext_macros.cc
@@ -72,7 +72,7 @@ absl::optional<Expr> CheckInvalidArgs(MacroExprFactory &factory,
     }
   }
 
-  return absl::nullopt;
+  return std::nullopt;
 }
 
 bool IsListLiteralWithValidArgs(const Expr &arg) {
@@ -99,7 +99,7 @@ std::vector<Macro> math_macros() {
       [](MacroExprFactory &factory, Expr &target,
          absl::Span<Expr> arguments) -> absl::optional<Expr> {
         if (!IsTargetNamespace(target)) {
-          return absl::nullopt;
+          return std::nullopt;
         }
 
         switch (arguments.size()) {
@@ -143,7 +143,7 @@ std::vector<Macro> math_macros() {
       [](MacroExprFactory &factory, Expr &target,
          absl::Span<Expr> arguments) -> absl::optional<Expr> {
         if (!IsTargetNamespace(target)) {
-          return absl::nullopt;
+          return std::nullopt;
         }
 
         switch (arguments.size()) {
diff --git a/extensions/math_ext_test.cc b/extensions/math_ext_test.cc
index ea9331970..ce05ae6ed 100644
--- a/extensions/math_ext_test.cc
+++ b/extensions/math_ext_test.cc
@@ -93,7 +93,7 @@ TestCase MinCase(CelValue v1, CelValue v2, CelValue result) {
 }
 
 TestCase MinCase(CelValue list, CelValue result) {
-  return TestCase{kMathMin, list, absl::nullopt, result};
+  return TestCase{kMathMin, list, std::nullopt, result};
 }
 
 TestCase MaxCase(CelValue v1, CelValue v2, CelValue result) {
@@ -101,7 +101,7 @@ TestCase MaxCase(CelValue v1, CelValue v2, CelValue result) {
 }
 
 TestCase MaxCase(CelValue list, CelValue result) {
-  return TestCase{kMathMax, list, absl::nullopt, result};
+  return TestCase{kMathMax, list, std::nullopt, result};
 }
 
 struct MacroTestCase {
diff --git a/extensions/proto_ext.cc b/extensions/proto_ext.cc
index f38039002..48618f7ae 100644
--- a/extensions/proto_ext.cc
+++ b/extensions/proto_ext.cc
@@ -45,11 +45,11 @@ absl::optional<std::string> ValidateExtensionIdentifier(const Expr& expr) {
       absl::Overload(
           [](const SelectExpr& select_expr) -> absl::optional<std::string> {
             if (select_expr.test_only()) {
-              return absl::nullopt;
+              return std::nullopt;
             }
             auto op_name = ValidateExtensionIdentifier(select_expr.operand());
             if (!op_name.has_value()) {
-              return absl::nullopt;
+              return std::nullopt;
             }
             return absl::StrCat(*op_name, ".", select_expr.field());
           },
@@ -57,7 +57,7 @@ absl::optional<std::string> ValidateExtensionIdentifier(const Expr& expr) {
             return ident_expr.name();
           },
           [](const auto&) -> absl::optional<std::string> {
-            return absl::nullopt;
+            return std::nullopt;
           }),
       expr.kind());
 }
@@ -68,7 +68,7 @@ absl::optional<std::string> GetExtensionFieldName(const Expr& expr) {
       select_expr) {
     return ValidateExtensionIdentifier(expr);
   }
-  return absl::nullopt;
+  return std::nullopt;
 }
 
 bool IsExtensionCall(const Expr& target) {
@@ -95,7 +95,7 @@ std::vector<Macro> proto_macros() {
       [](MacroExprFactory& factory, Expr& target,
          absl::Span<Expr> arguments) -> absl::optional<Expr> {
         if (!IsExtensionCall(target)) {
-          return absl::nullopt;
+          return std::nullopt;
         }
         auto extFieldName = GetExtensionFieldName(arguments[1]);
         if (!extFieldName.has_value()) {
@@ -109,7 +109,7 @@ std::vector<Macro> proto_macros() {
       [](MacroExprFactory& factory, Expr& target,
          absl::Span<Expr> arguments) -> absl::optional<Expr> {
         if (!IsExtensionCall(target)) {
-          return absl::nullopt;
+          return std::nullopt;
         }
         auto extFieldName = GetExtensionFieldName(arguments[1]);
         if (!extFieldName.has_value()) {