Skip to content

Commit 5e4ee87

Browse files
CEL Dev Teamcopybara-github
CEL Dev Team
authored and
copybara-github
committed
No public description
PiperOrigin-RevId: 942389605
1 parent a3fb693 commit 5e4ee87

23 files changed

Lines changed: 161 additions & 162 deletions

‎common/values/bytes_value_test.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ TEST_F(BytesValueTest, TryFlat) {
8080
EXPECT_THAT(
8181
BytesValue(absl::MakeFragmentedCord({"Hello, World!", "World, Hello!"}))
8282
.TryFlat(),
83-
Eq(absl::nullopt));
83+
Eq(std::nullopt));
8484
}
8585

8686
TEST_F(BytesValueTest, ToString) {

‎common/values/custom_list_value_test.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ TEST_F(CustomListValueTest, Dispatcher_NewIterator1) {
442442
EXPECT_THAT(iterator->Next1(descriptor_pool(), message_factory(), arena()),
443443
IsOkAndHolds(Optional(IntValueIs(1))));
444444
EXPECT_THAT(iterator->Next1(descriptor_pool(), message_factory(), arena()),
445-
IsOkAndHolds(Eq(absl::nullopt)));
445+
IsOkAndHolds(Eq(std::nullopt)));
446446
}
447447

448448
TEST_F(CustomListValueTest, Interface_NewIterator1) {
@@ -453,7 +453,7 @@ TEST_F(CustomListValueTest, Interface_NewIterator1) {
453453
EXPECT_THAT(iterator->Next1(descriptor_pool(), message_factory(), arena()),
454454
IsOkAndHolds(Optional(IntValueIs(1))));
455455
EXPECT_THAT(iterator->Next1(descriptor_pool(), message_factory(), arena()),
456-
IsOkAndHolds(Eq(absl::nullopt)));
456+
IsOkAndHolds(Eq(std::nullopt)));
457457
}
458458

459459
TEST_F(CustomListValueTest, Dispatcher_NewIterator2) {
@@ -464,7 +464,7 @@ TEST_F(CustomListValueTest, Dispatcher_NewIterator2) {
464464
EXPECT_THAT(iterator->Next2(descriptor_pool(), message_factory(), arena()),
465465
IsOkAndHolds(Optional(Pair(IntValueIs(1), IntValueIs(1)))));
466466
EXPECT_THAT(iterator->Next2(descriptor_pool(), message_factory(), arena()),
467-
IsOkAndHolds(Eq(absl::nullopt)));
467+
IsOkAndHolds(Eq(std::nullopt)));
468468
}
469469

470470
TEST_F(CustomListValueTest, Interface_NewIterator2) {
@@ -475,7 +475,7 @@ TEST_F(CustomListValueTest, Interface_NewIterator2) {
475475
EXPECT_THAT(iterator->Next2(descriptor_pool(), message_factory(), arena()),
476476
IsOkAndHolds(Optional(Pair(IntValueIs(1), IntValueIs(1)))));
477477
EXPECT_THAT(iterator->Next2(descriptor_pool(), message_factory(), arena()),
478-
IsOkAndHolds(Eq(absl::nullopt)));
478+
IsOkAndHolds(Eq(std::nullopt)));
479479
}
480480

481481
TEST_F(CustomListValueTest, Dispatcher_Contains) {

‎common/values/custom_map_value.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,13 @@ class EmptyMapValue final : public common_internal::CompatMapValue {
106106
}
107107

108108
absl::optional<CelValue> operator[](CelValue key) const override {
109-
return absl::nullopt;
109+
return std::nullopt;
110110
}
111111

112112
using CompatMapValue::Get;
113113
absl::optional<CelValue> Get(google::protobuf::Arena* arena,
114114
CelValue key) const override {
115-
return absl::nullopt;
115+
return std::nullopt;
116116
}
117117

118118
absl::StatusOr<bool> Has(const CelValue& key) const override { return false; }

‎common/values/custom_map_value_test.cc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ TEST_F(CustomMapValueTest, Dispatcher_Find) {
480480
IsOkAndHolds(Optional(IntValueIs(1))));
481481
ASSERT_THAT(map.Find(StringValue("baz"), descriptor_pool(), message_factory(),
482482
arena()),
483-
IsOkAndHolds(Eq(absl::nullopt)));
483+
IsOkAndHolds(Eq(std::nullopt)));
484484
}
485485

486486
TEST_F(CustomMapValueTest, Interface_Find) {
@@ -493,7 +493,7 @@ TEST_F(CustomMapValueTest, Interface_Find) {
493493
IsOkAndHolds(Optional(IntValueIs(1))));
494494
ASSERT_THAT(map.Find(StringValue("baz"), descriptor_pool(), message_factory(),
495495
arena()),
496-
IsOkAndHolds(Eq(absl::nullopt)));
496+
IsOkAndHolds(Eq(std::nullopt)));
497497
}
498498

499499
TEST_F(CustomMapValueTest, Dispatcher_Has) {
@@ -588,7 +588,7 @@ TEST_F(CustomMapValueTest, Dispatcher_NewIterator1) {
588588
EXPECT_THAT(iterator->Next1(descriptor_pool(), message_factory(), arena()),
589589
IsOkAndHolds(Optional(StringValueIs("bar"))));
590590
EXPECT_THAT(iterator->Next1(descriptor_pool(), message_factory(), arena()),
591-
IsOkAndHolds(Eq(absl::nullopt)));
591+
IsOkAndHolds(Eq(std::nullopt)));
592592
}
593593

594594
TEST_F(CustomMapValueTest, Interface_NewIterator1) {
@@ -599,7 +599,7 @@ TEST_F(CustomMapValueTest, Interface_NewIterator1) {
599599
EXPECT_THAT(iterator->Next1(descriptor_pool(), message_factory(), arena()),
600600
IsOkAndHolds(Optional(StringValueIs("bar"))));
601601
EXPECT_THAT(iterator->Next1(descriptor_pool(), message_factory(), arena()),
602-
IsOkAndHolds(Eq(absl::nullopt)));
602+
IsOkAndHolds(Eq(std::nullopt)));
603603
}
604604

605605
TEST_F(CustomMapValueTest, Dispatcher_NewIterator2) {
@@ -612,7 +612,7 @@ TEST_F(CustomMapValueTest, Dispatcher_NewIterator2) {
612612
iterator->Next2(descriptor_pool(), message_factory(), arena()),
613613
IsOkAndHolds(Optional(Pair(StringValueIs("bar"), IntValueIs(1)))));
614614
EXPECT_THAT(iterator->Next2(descriptor_pool(), message_factory(), arena()),
615-
IsOkAndHolds(Eq(absl::nullopt)));
615+
IsOkAndHolds(Eq(std::nullopt)));
616616
}
617617

618618
TEST_F(CustomMapValueTest, Interface_NewIterator2) {
@@ -625,7 +625,7 @@ TEST_F(CustomMapValueTest, Interface_NewIterator2) {
625625
iterator->Next2(descriptor_pool(), message_factory(), arena()),
626626
IsOkAndHolds(Optional(Pair(StringValueIs("bar"), IntValueIs(1)))));
627627
EXPECT_THAT(iterator->Next2(descriptor_pool(), message_factory(), arena()),
628-
IsOkAndHolds(Eq(absl::nullopt)));
628+
IsOkAndHolds(Eq(std::nullopt)));
629629
}
630630

631631
TEST_F(CustomMapValueTest, Dispatcher) {

‎common/values/legacy_list_value.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ absl::optional<LegacyListValue> AsLegacyListValue(const Value& value) {
7070
custom_list_value->interface())));
7171
}
7272
}
73-
return absl::nullopt;
73+
return std::nullopt;
7474
}
7575

7676
} // namespace cel::common_internal

‎common/values/legacy_map_value.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ absl::optional<LegacyMapValue> AsLegacyMapValue(const Value& value) {
7070
custom_map_value->interface())));
7171
}
7272
}
73-
return absl::nullopt;
73+
return std::nullopt;
7474
}
7575

7676
} // namespace cel::common_internal

‎common/values/legacy_struct_value.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ absl::optional<LegacyStructValue> AsLegacyStructValue(const Value& value) {
3737
if (IsLegacyStructValue(value)) {
3838
return GetLegacyStructValue(value);
3939
}
40-
return absl::nullopt;
40+
return std::nullopt;
4141
}
4242

4343
} // namespace cel::common_internal

‎common/values/list_value.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,15 +263,15 @@ optional_ref<const CustomListValue> ListValue::AsCustom() const& {
263263
alternative != nullptr) {
264264
return *alternative;
265265
}
266-
return absl::nullopt;
266+
return std::nullopt;
267267
}
268268

269269
absl::optional<CustomListValue> ListValue::AsCustom() && {
270270
if (auto* alternative = variant_.As<CustomListValue>();
271271
alternative != nullptr) {
272272
return std::move(*alternative);
273273
}
274-
return absl::nullopt;
274+
return std::nullopt;
275275
}
276276

277277
const CustomListValue& ListValue::GetCustom() const& {

‎common/values/map_value.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,15 +337,15 @@ optional_ref<const CustomMapValue> MapValue::AsCustom() const& {
337337
alternative != nullptr) {
338338
return *alternative;
339339
}
340-
return absl::nullopt;
340+
return std::nullopt;
341341
}
342342

343343
absl::optional<CustomMapValue> MapValue::AsCustom() && {
344344
if (auto* alternative = variant_.As<CustomMapValue>();
345345
alternative != nullptr) {
346346
return std::move(*alternative);
347347
}
348-
return absl::nullopt;
348+
return std::nullopt;
349349
}
350350

351351
const CustomMapValue& MapValue::GetCustom() const& {

‎common/values/message_value.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,15 +262,15 @@ cel::optional_ref<const ParsedMessageValue> MessageValue::AsParsed() const& {
262262
alternative != nullptr) {
263263
return *alternative;
264264
}
265-
return absl::nullopt;
265+
return std::nullopt;
266266
}
267267

268268
absl::optional<ParsedMessageValue> MessageValue::AsParsed() && {
269269
if (auto* alternative = absl::get_if<ParsedMessageValue>(&variant_);
270270
alternative != nullptr) {
271271
return std::move(*alternative);
272272
}
273-
return absl::nullopt;
273+
return std::nullopt;
274274
}
275275

276276
const ParsedMessageValue& MessageValue::GetParsed() const& {

0 commit comments

Comments
 (0)