From 774340d632ae13dc74c64f2eade30d8209686089 Mon Sep 17 00:00:00 2001
From: CEL Dev Team <cel-dev@google.com>
Date: Thu, 18 Jun 2026 06:50:51 -0700
Subject: [PATCH] No public description

PiperOrigin-RevId: 934323942
---
 parser/macro_registry.cc      | 4 ++--
 parser/macro_registry_test.cc | 4 ++--
 parser/parser.cc              | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/parser/macro_registry.cc b/parser/macro_registry.cc
index 3a816b10e..d36761e87 100644
--- a/parser/macro_registry.cc
+++ b/parser/macro_registry.cc
@@ -55,7 +55,7 @@ absl::optional<Macro> MacroRegistry::FindMacro(absl::string_view name,
                                                bool receiver_style) const {
   // <function>:<argument_count>:<receiver_style>
   if (name.empty() || absl::StrContains(name, ':')) {
-    return absl::nullopt;
+    return std::nullopt;
   }
   // Try argument count specific key first.
   auto key = absl::StrCat(name, ":", arg_count, ":",
@@ -68,7 +68,7 @@ absl::optional<Macro> MacroRegistry::FindMacro(absl::string_view name,
   if (auto it = macros_.find(key); it != macros_.end()) {
     return it->second;
   }
-  return absl::nullopt;
+  return std::nullopt;
 }
 
 std::vector<Macro> MacroRegistry::ListMacros() const {
diff --git a/parser/macro_registry_test.cc b/parser/macro_registry_test.cc
index 9e6da87a4..db8a99ab2 100644
--- a/parser/macro_registry_test.cc
+++ b/parser/macro_registry_test.cc
@@ -30,14 +30,14 @@ using ::testing::Ne;
 TEST(MacroRegistry, RegisterAndFind) {
   MacroRegistry macros;
   EXPECT_THAT(macros.RegisterMacro(HasMacro()), IsOk());
-  EXPECT_THAT(macros.FindMacro("has", 1, false), Ne(absl::nullopt));
+  EXPECT_THAT(macros.FindMacro("has", 1, false), Ne(std::nullopt));
 }
 
 TEST(MacroRegistry, RegisterRollsback) {
   MacroRegistry macros;
   EXPECT_THAT(macros.RegisterMacros({HasMacro(), AllMacro(), AllMacro()}),
               StatusIs(absl::StatusCode::kAlreadyExists));
-  EXPECT_THAT(macros.FindMacro("has", 1, false), Eq(absl::nullopt));
+  EXPECT_THAT(macros.FindMacro("has", 1, false), Eq(std::nullopt));
 }
 
 }  // namespace
diff --git a/parser/parser.cc b/parser/parser.cc
index a858337a4..24b4ca079 100644
--- a/parser/parser.cc
+++ b/parser/parser.cc
@@ -1468,11 +1468,11 @@ Expr ParserVisitor::GlobalCallOrMacroImpl(int64_t expr_id,
       }
     }
     factory_.BeginMacro(factory_.GetSourceRange(expr_id));
-    auto expr = macro->Expand(factory_, absl::nullopt, absl::MakeSpan(args));
+    auto expr = macro->Expand(factory_, std::nullopt, absl::MakeSpan(args));
     factory_.EndMacro();
     if (expr) {
       if (add_macro_calls_) {
-        factory_.AddMacroCall(expr->id(), function, absl::nullopt,
+        factory_.AddMacroCall(expr->id(), function, std::nullopt,
                               std::move(macro_args));
       }
       // We did not end up using `expr_id`. Delete metadata.