@@ -79,7 +79,7 @@ TEST_F(ActivationTest, ValueNotFound) {
7979
8080 EXPECT_THAT (activation.FindVariable (" var1" , descriptor_pool (),
8181 message_factory (), arena ()),
82- IsOkAndHolds (Eq (absl ::nullopt )));
82+ IsOkAndHolds (Eq (std ::nullopt )));
8383}
8484
8585TEST_F (ActivationTest, InsertValue) {
@@ -122,11 +122,11 @@ TEST_F(ActivationTest, InsertProviderForwardsNotFound) {
122122 " var1" ,
123123 [](absl::string_view name, const google::protobuf::DescriptorPool* absl_nonnull,
124124 google::protobuf::MessageFactory* absl_nonnull,
125- google::protobuf::Arena* absl_nonnull) { return absl ::nullopt ; }));
125+ google::protobuf::Arena* absl_nonnull) { return std ::nullopt ; }));
126126
127127 EXPECT_THAT (activation.FindVariable (" var1" , descriptor_pool (),
128128 message_factory (), arena ()),
129- IsOkAndHolds (Eq (absl ::nullopt )));
129+ IsOkAndHolds (Eq (std ::nullopt )));
130130}
131131
132132TEST_F (ActivationTest, InsertProviderForwardsStatus) {
@@ -355,10 +355,10 @@ TEST_F(ActivationTest, MoveAssignment) {
355355 // NOLINTBEGIN(bugprone-use-after-move)
356356 EXPECT_THAT (moved_from.FindVariable (" val" , descriptor_pool (),
357357 message_factory (), arena ()),
358- IsOkAndHolds (Eq (absl ::nullopt )));
358+ IsOkAndHolds (Eq (std ::nullopt )));
359359 EXPECT_THAT (moved_from.FindVariable (" val_provided" , descriptor_pool (),
360360 message_factory (), arena ()),
361- IsOkAndHolds (Eq (absl ::nullopt )));
361+ IsOkAndHolds (Eq (std ::nullopt )));
362362 EXPECT_THAT (moved_from.FindFunctionOverloads (" Fn" ), SizeIs (0 ));
363363 EXPECT_THAT (moved_from.GetUnknownAttributes (), SizeIs (0 ));
364364 EXPECT_THAT (moved_from.GetMissingAttributes (), SizeIs (0 ));
@@ -405,10 +405,10 @@ TEST_F(ActivationTest, MoveCtor) {
405405 // NOLINTBEGIN(bugprone-use-after-move)
406406 EXPECT_THAT (moved_from.FindVariable (" val" , descriptor_pool (),
407407 message_factory (), arena ()),
408- IsOkAndHolds (Eq (absl ::nullopt )));
408+ IsOkAndHolds (Eq (std ::nullopt )));
409409 EXPECT_THAT (moved_from.FindVariable (" val_provided" , descriptor_pool (),
410410 message_factory (), arena ()),
411- IsOkAndHolds (Eq (absl ::nullopt )));
411+ IsOkAndHolds (Eq (std ::nullopt )));
412412 EXPECT_THAT (moved_from.FindFunctionOverloads (" Fn" ), SizeIs (0 ));
413413 EXPECT_THAT (moved_from.GetUnknownAttributes (), SizeIs (0 ));
414414 EXPECT_THAT (moved_from.GetMissingAttributes (), SizeIs (0 ));
0 commit comments