Skip to content

Commit 1fc646e

Browse files
CEL Dev Teamcopybara-github
CEL Dev Team
authored and
copybara-github
committed
No public description
PiperOrigin-RevId: 932826871
1 parent 51faf9f commit 1fc646e

2 files changed

Lines changed: 32 additions & 32 deletions

File tree

‎base/operators.cc‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -179,27 +179,27 @@ CEL_INTERNAL_TERNARY_OPERATORS_ENUM(CEL_TERNARY_OPERATOR)
179179
absl::optional<Operator> Operator::FindByName(absl::string_view input) {
180180
absl::call_once(operators_once_flag, InitializeOperators);
181181
if (input.empty()) {
182-
return absl::nullopt;
182+
return std::nullopt;
183183
}
184184
auto it =
185185
std::lower_bound(operators_by_name.cbegin(), operators_by_name.cend(),
186186
input, OperatorDataNameComparer{});
187187
if (it == operators_by_name.cend() || (*it)->name != input) {
188-
return absl::nullopt;
188+
return std::nullopt;
189189
}
190190
return Operator(*it);
191191
}
192192

193193
absl::optional<Operator> Operator::FindByDisplayName(absl::string_view input) {
194194
absl::call_once(operators_once_flag, InitializeOperators);
195195
if (input.empty()) {
196-
return absl::nullopt;
196+
return std::nullopt;
197197
}
198198
auto it = std::lower_bound(operators_by_display_name.cbegin(),
199199
operators_by_display_name.cend(), input,
200200
OperatorDataDisplayNameComparer{});
201201
if (it == operators_by_name.cend() || (*it)->display_name != input) {
202-
return absl::nullopt;
202+
return std::nullopt;
203203
}
204204
return Operator(*it);
205205
}
@@ -208,13 +208,13 @@ absl::optional<UnaryOperator> UnaryOperator::FindByName(
208208
absl::string_view input) {
209209
absl::call_once(operators_once_flag, InitializeOperators);
210210
if (input.empty()) {
211-
return absl::nullopt;
211+
return std::nullopt;
212212
}
213213
auto it = std::lower_bound(unary_operators_by_name.cbegin(),
214214
unary_operators_by_name.cend(), input,
215215
OperatorDataNameComparer{});
216216
if (it == unary_operators_by_name.cend() || (*it)->name != input) {
217-
return absl::nullopt;
217+
return std::nullopt;
218218
}
219219
return UnaryOperator(*it);
220220
}
@@ -223,14 +223,14 @@ absl::optional<UnaryOperator> UnaryOperator::FindByDisplayName(
223223
absl::string_view input) {
224224
absl::call_once(operators_once_flag, InitializeOperators);
225225
if (input.empty()) {
226-
return absl::nullopt;
226+
return std::nullopt;
227227
}
228228
auto it = std::lower_bound(unary_operators_by_display_name.cbegin(),
229229
unary_operators_by_display_name.cend(), input,
230230
OperatorDataDisplayNameComparer{});
231231
if (it == unary_operators_by_display_name.cend() ||
232232
(*it)->display_name != input) {
233-
return absl::nullopt;
233+
return std::nullopt;
234234
}
235235
return UnaryOperator(*it);
236236
}
@@ -239,13 +239,13 @@ absl::optional<BinaryOperator> BinaryOperator::FindByName(
239239
absl::string_view input) {
240240
absl::call_once(operators_once_flag, InitializeOperators);
241241
if (input.empty()) {
242-
return absl::nullopt;
242+
return std::nullopt;
243243
}
244244
auto it = std::lower_bound(binary_operators_by_name.cbegin(),
245245
binary_operators_by_name.cend(), input,
246246
OperatorDataNameComparer{});
247247
if (it == binary_operators_by_name.cend() || (*it)->name != input) {
248-
return absl::nullopt;
248+
return std::nullopt;
249249
}
250250
return BinaryOperator(*it);
251251
}
@@ -254,14 +254,14 @@ absl::optional<BinaryOperator> BinaryOperator::FindByDisplayName(
254254
absl::string_view input) {
255255
absl::call_once(operators_once_flag, InitializeOperators);
256256
if (input.empty()) {
257-
return absl::nullopt;
257+
return std::nullopt;
258258
}
259259
auto it = std::lower_bound(binary_operators_by_display_name.cbegin(),
260260
binary_operators_by_display_name.cend(), input,
261261
OperatorDataDisplayNameComparer{});
262262
if (it == binary_operators_by_display_name.cend() ||
263263
(*it)->display_name != input) {
264-
return absl::nullopt;
264+
return std::nullopt;
265265
}
266266
return BinaryOperator(*it);
267267
}
@@ -270,13 +270,13 @@ absl::optional<TernaryOperator> TernaryOperator::FindByName(
270270
absl::string_view input) {
271271
absl::call_once(operators_once_flag, InitializeOperators);
272272
if (input.empty()) {
273-
return absl::nullopt;
273+
return std::nullopt;
274274
}
275275
auto it = std::lower_bound(ternary_operators_by_name.cbegin(),
276276
ternary_operators_by_name.cend(), input,
277277
OperatorDataNameComparer{});
278278
if (it == ternary_operators_by_name.cend() || (*it)->name != input) {
279-
return absl::nullopt;
279+
return std::nullopt;
280280
}
281281
return TernaryOperator(*it);
282282
}
@@ -285,14 +285,14 @@ absl::optional<TernaryOperator> TernaryOperator::FindByDisplayName(
285285
absl::string_view input) {
286286
absl::call_once(operators_once_flag, InitializeOperators);
287287
if (input.empty()) {
288-
return absl::nullopt;
288+
return std::nullopt;
289289
}
290290
auto it = std::lower_bound(ternary_operators_by_display_name.cbegin(),
291291
ternary_operators_by_display_name.cend(), input,
292292
OperatorDataDisplayNameComparer{});
293293
if (it == ternary_operators_by_display_name.cend() ||
294294
(*it)->display_name != input) {
295-
return absl::nullopt;
295+
return std::nullopt;
296296
}
297297
return TernaryOperator(*it);
298298
}

‎base/operators_test.cc‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -130,55 +130,55 @@ CEL_INTERNAL_TERNARY_OPERATORS_ENUM(CEL_TERNARY_OPERATOR)
130130
TEST(Operator, FindByName) {
131131
EXPECT_THAT(Operator::FindByName("@in"), Optional(Eq(Operator::In())));
132132
EXPECT_THAT(Operator::FindByName("_in_"), Optional(Eq(Operator::OldIn())));
133-
EXPECT_THAT(Operator::FindByName("in"), Eq(absl::nullopt));
134-
EXPECT_THAT(Operator::FindByName(""), Eq(absl::nullopt));
133+
EXPECT_THAT(Operator::FindByName("in"), Eq(std::nullopt));
134+
EXPECT_THAT(Operator::FindByName(""), Eq(std::nullopt));
135135
}
136136

137137
TEST(Operator, FindByDisplayName) {
138138
EXPECT_THAT(Operator::FindByDisplayName("-"),
139139
Optional(Eq(Operator::Subtract())));
140-
EXPECT_THAT(Operator::FindByDisplayName("@in"), Eq(absl::nullopt));
141-
EXPECT_THAT(Operator::FindByDisplayName(""), Eq(absl::nullopt));
140+
EXPECT_THAT(Operator::FindByDisplayName("@in"), Eq(std::nullopt));
141+
EXPECT_THAT(Operator::FindByDisplayName(""), Eq(std::nullopt));
142142
}
143143

144144
TEST(UnaryOperator, FindByName) {
145145
EXPECT_THAT(UnaryOperator::FindByName("-_"),
146146
Optional(Eq(Operator::Negate())));
147-
EXPECT_THAT(UnaryOperator::FindByName("_-_"), Eq(absl::nullopt));
148-
EXPECT_THAT(UnaryOperator::FindByName(""), Eq(absl::nullopt));
147+
EXPECT_THAT(UnaryOperator::FindByName("_-_"), Eq(std::nullopt));
148+
EXPECT_THAT(UnaryOperator::FindByName(""), Eq(std::nullopt));
149149
}
150150

151151
TEST(UnaryOperator, FindByDisplayName) {
152152
EXPECT_THAT(UnaryOperator::FindByDisplayName("-"),
153153
Optional(Eq(Operator::Negate())));
154-
EXPECT_THAT(UnaryOperator::FindByDisplayName("&&"), Eq(absl::nullopt));
155-
EXPECT_THAT(UnaryOperator::FindByDisplayName(""), Eq(absl::nullopt));
154+
EXPECT_THAT(UnaryOperator::FindByDisplayName("&&"), Eq(std::nullopt));
155+
EXPECT_THAT(UnaryOperator::FindByDisplayName(""), Eq(std::nullopt));
156156
}
157157

158158
TEST(BinaryOperator, FindByName) {
159159
EXPECT_THAT(BinaryOperator::FindByName("_-_"),
160160
Optional(Eq(Operator::Subtract())));
161-
EXPECT_THAT(BinaryOperator::FindByName("-_"), Eq(absl::nullopt));
162-
EXPECT_THAT(BinaryOperator::FindByName(""), Eq(absl::nullopt));
161+
EXPECT_THAT(BinaryOperator::FindByName("-_"), Eq(std::nullopt));
162+
EXPECT_THAT(BinaryOperator::FindByName(""), Eq(std::nullopt));
163163
}
164164

165165
TEST(BinaryOperator, FindByDisplayName) {
166166
EXPECT_THAT(BinaryOperator::FindByDisplayName("-"),
167167
Optional(Eq(Operator::Subtract())));
168-
EXPECT_THAT(BinaryOperator::FindByDisplayName("!"), Eq(absl::nullopt));
169-
EXPECT_THAT(BinaryOperator::FindByDisplayName(""), Eq(absl::nullopt));
168+
EXPECT_THAT(BinaryOperator::FindByDisplayName("!"), Eq(std::nullopt));
169+
EXPECT_THAT(BinaryOperator::FindByDisplayName(""), Eq(std::nullopt));
170170
}
171171

172172
TEST(TernaryOperator, FindByName) {
173173
EXPECT_THAT(TernaryOperator::FindByName("_?_:_"),
174174
Optional(Eq(TernaryOperator::Conditional())));
175-
EXPECT_THAT(TernaryOperator::FindByName("-_"), Eq(absl::nullopt));
176-
EXPECT_THAT(TernaryOperator::FindByName(""), Eq(absl::nullopt));
175+
EXPECT_THAT(TernaryOperator::FindByName("-_"), Eq(std::nullopt));
176+
EXPECT_THAT(TernaryOperator::FindByName(""), Eq(std::nullopt));
177177
}
178178

179179
TEST(TernaryOperator, FindByDisplayName) {
180-
EXPECT_THAT(TernaryOperator::FindByDisplayName(""), Eq(absl::nullopt));
181-
EXPECT_THAT(TernaryOperator::FindByDisplayName("!"), Eq(absl::nullopt));
180+
EXPECT_THAT(TernaryOperator::FindByDisplayName(""), Eq(std::nullopt));
181+
EXPECT_THAT(TernaryOperator::FindByDisplayName("!"), Eq(std::nullopt));
182182
}
183183

184184
TEST(Operator, SupportsAbslHash) {

0 commit comments

Comments
 (0)