Skip to content

Commit 833bb0c

Browse files
CEL Dev Teamcopybara-github
authored andcommitted
No public description
PiperOrigin-RevId: 919410392
1 parent ec82288 commit 833bb0c

1 file changed

Lines changed: 10 additions & 12 deletions

File tree

testutil/test_macros.cc

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,8 @@ bool IsCelNamespace(const Expr& target) {
3737
return target.has_ident_expr() && target.ident_expr().name() == "cel";
3838
}
3939

40-
absl::optional<Expr> CelBlockMacroExpander(MacroExprFactory& factory,
41-
Expr& target,
42-
absl::Span<Expr> args) {
40+
std::optional<Expr> CelBlockMacroExpander(MacroExprFactory& factory,
41+
Expr& target, absl::Span<Expr> args) {
4342
if (!IsCelNamespace(target)) {
4443
return absl::nullopt;
4544
}
@@ -51,9 +50,8 @@ absl::optional<Expr> CelBlockMacroExpander(MacroExprFactory& factory,
5150
return factory.NewCall("cel.@block", args);
5251
}
5352

54-
absl::optional<Expr> CelIndexMacroExpander(MacroExprFactory& factory,
55-
Expr& target,
56-
absl::Span<Expr> args) {
53+
std::optional<Expr> CelIndexMacroExpander(MacroExprFactory& factory,
54+
Expr& target, absl::Span<Expr> args) {
5755
if (!IsCelNamespace(target)) {
5856
return absl::nullopt;
5957
}
@@ -70,9 +68,9 @@ absl::optional<Expr> CelIndexMacroExpander(MacroExprFactory& factory,
7068
return factory.NewIdent(absl::StrCat("@index", index));
7169
}
7270

73-
absl::optional<Expr> CelIterVarMacroExpander(MacroExprFactory& factory,
74-
Expr& target,
75-
absl::Span<Expr> args) {
71+
std::optional<Expr> CelIterVarMacroExpander(MacroExprFactory& factory,
72+
Expr& target,
73+
absl::Span<Expr> args) {
7674
if (!IsCelNamespace(target)) {
7775
return absl::nullopt;
7876
}
@@ -94,9 +92,9 @@ absl::optional<Expr> CelIterVarMacroExpander(MacroExprFactory& factory,
9492
unique_arg.const_expr().int_value()));
9593
}
9694

97-
absl::optional<Expr> CelAccuVarMacroExpander(MacroExprFactory& factory,
98-
Expr& target,
99-
absl::Span<Expr> args) {
95+
std::optional<Expr> CelAccuVarMacroExpander(MacroExprFactory& factory,
96+
Expr& target,
97+
absl::Span<Expr> args) {
10098
if (!IsCelNamespace(target)) {
10199
return absl::nullopt;
102100
}

0 commit comments

Comments
 (0)