No public description

CEL Dev Team · copybara-github · commit 7dc7eacfbccf · 2026-06-17T01:09:08.000-07:00
PiperOrigin-RevId: 933560360
diff --git a/checker/internal/descriptor_pool_type_introspector.cc b/checker/internal/descriptor_pool_type_introspector.cc
@@ -42,7 +42,7 @@ FindStructTypeFieldByNameDirectly(
   const google::protobuf::Descriptor* absl_nullable descriptor =
       descriptor_pool->FindMessageTypeByName(type);
   if (descriptor == nullptr) {
-    return absl::nullopt;
+    return std::nullopt;
   }
   const google::protobuf::FieldDescriptor* absl_nullable field =
       descriptor->FindFieldByName(name);
@@ -54,7 +54,7 @@ FindStructTypeFieldByNameDirectly(
   if (field != nullptr) {
     return StructTypeField(MessageTypeField(field));
   }
-  return absl::nullopt;
+  return std::nullopt;
 }
 
 // Standard implementation for listing fields.
@@ -67,7 +67,7 @@ ListStructTypeFieldsDirectly(
   const google::protobuf::Descriptor* absl_nullable descriptor =
       descriptor_pool->FindMessageTypeByName(type);
   if (descriptor == nullptr) {
-    return absl::nullopt;
+    return std::nullopt;
   }
 
   std::vector<const google::protobuf::FieldDescriptor*> extensions;
@@ -100,7 +100,7 @@ DescriptorPoolTypeIntrospector::FindTypeImpl(absl::string_view name) const {
   if (enum_descriptor != nullptr) {
     return Type::Enum(enum_descriptor);
   }
-  return absl::nullopt;
+  return std::nullopt;
 }
 
 absl::StatusOr<std::optional<TypeIntrospector::EnumConstant>>
@@ -112,7 +112,7 @@ DescriptorPoolTypeIntrospector::FindEnumConstantImpl(
     const google::protobuf::EnumValueDescriptor* absl_nullable enum_value_descriptor =
         enum_descriptor->FindValueByName(value);
     if (enum_value_descriptor == nullptr) {
-      return absl::nullopt;
+      return std::nullopt;
     }
     return EnumConstant{
         .type = Type::Enum(enum_descriptor),
@@ -121,7 +121,7 @@ DescriptorPoolTypeIntrospector::FindEnumConstantImpl(
         .number = enum_value_descriptor->number(),
     };
   }
-  return absl::nullopt;
+  return std::nullopt;
 }
 
 absl::StatusOr<std::optional<StructTypeField>>
@@ -134,7 +134,7 @@ DescriptorPoolTypeIntrospector::FindStructTypeFieldByNameImpl(
   const FieldTable* field_table = GetFieldTable(type);
 
   if (field_table == nullptr) {
-    return absl::nullopt;
+    return std::nullopt;
   }
 
   if (auto it = field_table->json_name_map.find(name);
@@ -147,7 +147,7 @@ DescriptorPoolTypeIntrospector::FindStructTypeFieldByNameImpl(
     return field_table->fields[it->second].field;
   }
 
-  return absl::nullopt;
+  return std::nullopt;
 }
 
 absl::StatusOr<
@@ -160,7 +160,7 @@ DescriptorPoolTypeIntrospector::ListFieldsForStructTypeImpl(
 
   const FieldTable* field_table = GetFieldTable(type);
   if (field_table == nullptr) {
-    return absl::nullopt;
+    return std::nullopt;
   }
   std::vector<TypeIntrospector::StructTypeFieldListing> fields;
   fields.reserve(field_table->non_extensions.size());
diff --git a/checker/internal/descriptor_pool_type_introspector_test.cc b/checker/internal/descriptor_pool_type_introspector_test.cc
@@ -47,7 +47,7 @@ TEST(DescriptorPoolTypeIntrospectorTest, FindType) {
                   "cel.expr.conformance.proto3.TestAllTypes.NestedEnum"),
               IsOkAndHolds(Optional(Property(&Type::IsEnum, true))));
   EXPECT_THAT(introspector.FindType("non.existent.Type"),
-              IsOkAndHolds(Eq(absl::nullopt)));
+              IsOkAndHolds(Eq(std::nullopt)));
 }
 
 TEST(DescriptorPoolTypeIntrospectorTest, FindEnumConstant) {
@@ -84,7 +84,7 @@ TEST(DescriptorPoolTypeIntrospectorTest,
   auto field = introspector.FindStructTypeFieldByName(
       "cel.expr.conformance.proto3.TestAllTypes", "singleInt64");
 
-  EXPECT_THAT(field, IsOkAndHolds(Eq(absl::nullopt)));
+  EXPECT_THAT(field, IsOkAndHolds(Eq(std::nullopt)));
 }
 
 TEST(DescriptorPoolTypeIntrospectorTest, FindExtension) {
@@ -108,7 +108,7 @@ TEST(DescriptorPoolTypeIntrospectorTest, FindStructTypeFieldByNameWithJsonOpt) {
   auto field = introspector.FindStructTypeFieldByName(
       "cel.expr.conformance.proto3.TestAllTypes", "single_int64");
 
-  ASSERT_THAT(field, IsOkAndHolds(Eq(absl::nullopt)));
+  ASSERT_THAT(field, IsOkAndHolds(Eq(std::nullopt)));
 }
 
 TEST(DescriptorPoolTypeIntrospectorTest,
@@ -168,7 +168,7 @@ TEST(DescriptorPoolTypeIntrospectorTest, ListFieldsForStructTypeNotFound) {
       internal::GetTestingDescriptorPool());
   auto fields = introspector.ListFieldsForStructType(
       "cel.expr.conformance.proto3.SomeOtherType");
-  EXPECT_THAT(fields, IsOkAndHolds(Eq(absl::nullopt)));
+  EXPECT_THAT(fields, IsOkAndHolds(Eq(std::nullopt)));
 }
 
 }  // namespace
diff --git a/checker/internal/type_check_env.cc b/checker/internal/type_check_env.cc
@@ -58,7 +58,7 @@ absl::StatusOr<std::optional<Type>> TypeCheckEnv::LookupTypeName(
       return type;
     }
   }
-  return absl::nullopt;
+  return std::nullopt;
 }
 
 absl::StatusOr<std::optional<VariableDecl>> TypeCheckEnv::LookupEnumConstant(
@@ -75,7 +75,7 @@ absl::StatusOr<std::optional<VariableDecl>> TypeCheckEnv::LookupEnumConstant(
       return decl;
     }
   }
-  return absl::nullopt;
+  return std::nullopt;
 }
 
 absl::StatusOr<std::optional<VariableDecl>> TypeCheckEnv::LookupTypeConstant(
@@ -92,14 +92,14 @@ absl::StatusOr<std::optional<VariableDecl>> TypeCheckEnv::LookupTypeConstant(
     return LookupEnumConstant(enum_name_candidate, value_name_candidate);
   }
 
-  return absl::nullopt;
+  return std::nullopt;
 }
 
 absl::StatusOr<std::optional<StructTypeField>> TypeCheckEnv::LookupStructField(
     absl::string_view type_name, absl::string_view field_name) const {
   if (proto_type_mask_registry_ != nullptr &&
       !proto_type_mask_registry_->FieldIsVisible(type_name, field_name)) {
-    return absl::nullopt;
+    return std::nullopt;
   }
   // Check the type providers in registration order.
   // Note: this doesn't allow for shadowing a type with a subset type of the
@@ -113,7 +113,7 @@ absl::StatusOr<std::optional<StructTypeField>> TypeCheckEnv::LookupStructField(
       return field;
     }
   }
-  return absl::nullopt;
+  return std::nullopt;
 }
 
 const VariableDecl* absl_nullable VariableScope::LookupLocalVariable(
diff --git a/checker/internal/type_checker_builder_impl.cc b/checker/internal/type_checker_builder_impl.cc
@@ -198,7 +198,7 @@ std::optional<FunctionDecl> FilterDecl(FunctionDecl decl,
     }
   }
   if (filtered.overloads().empty()) {
-    return absl::nullopt;
+    return std::nullopt;
   }
   filtered.set_name(std::move(name));
   return filtered;
diff --git a/checker/internal/type_checker_builder_impl_test.cc b/checker/internal/type_checker_builder_impl_test.cc
@@ -349,7 +349,7 @@ TEST(ContextDeclsTest, CustomStructNotSupported) {
       if (name == "com.example.MyStruct") {
         return common_internal::MakeBasicStructType("com.example.MyStruct");
       }
-      return absl::nullopt;
+      return std::nullopt;
     }
   };
 
@@ -370,7 +370,7 @@ TEST(ContextDeclsWithProtoTypeMaskTest, CustomStructNotSupported) {
       if (name == "com.example.MyStruct") {
         return common_internal::MakeBasicStructType("com.example.MyStruct");
       }
-      return absl::nullopt;
+      return std::nullopt;
     }
   };
 
diff --git a/checker/internal/type_checker_impl.cc b/checker/internal/type_checker_impl.cc
@@ -1098,11 +1098,11 @@ std::optional<Type> ResolveVisitor::CheckFieldType(int64_t id,
       auto field_info = env_->LookupStructField(struct_type.name(), field);
       if (!field_info.ok()) {
         status_.Update(field_info.status());
-        return absl::nullopt;
+        return std::nullopt;
       }
       if (!field_info->has_value()) {
         ReportUndefinedField(id, field, struct_type.name());
-        return absl::nullopt;
+        return std::nullopt;
       }
       auto type = field_info->value().GetType();
       if (type.kind() == TypeKind::kEnum) {
@@ -1134,7 +1134,7 @@ std::optional<Type> ResolveVisitor::CheckFieldType(int64_t id,
           "expression of type '",
           FormatTypeName(inference_context_->FinalizeType(operand_type)),
           "' cannot be the operand of a select operation")));
-  return absl::nullopt;
+  return std::nullopt;
 }
 
 void ResolveVisitor::ResolveSelectOperation(const Expr& expr,
diff --git a/checker/internal/type_inference_context.cc b/checker/internal/type_inference_context.cc
@@ -149,7 +149,7 @@ std::optional<Type> WrapperToPrimitive(const Type& t) {
     case TypeKind::kUintWrapper:
       return UintType();
     default:
-      return absl::nullopt;
+      return std::nullopt;
   }
 }
 
@@ -579,7 +579,7 @@ TypeInferenceContext::ResolveOverload(const FunctionDecl& decl,
   }
 
   if (!result_type.has_value() || matching_overloads.empty()) {
-    return absl::nullopt;
+    return std::nullopt;
   }
   return OverloadResolution{
       .result_type = FullySubstitute(*result_type, /*free_to_dyn=*/false),

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ FindStructTypeFieldByNameDirectly(`
`42`	`42`	`const google::protobuf::Descriptor* absl_nullable descriptor =`
`43`	`43`	`descriptor_pool->FindMessageTypeByName(type);`
`44`	`44`	`if (descriptor == nullptr) {`
`45`		`- return absl::nullopt;`
	`45`	`+ return std::nullopt;`
`46`	`46`	`}`
`47`	`47`	`const google::protobuf::FieldDescriptor* absl_nullable field =`
`48`	`48`	`descriptor->FindFieldByName(name);`
`@@ -54,7 +54,7 @@ FindStructTypeFieldByNameDirectly(`
`54`	`54`	`if (field != nullptr) {`
`55`	`55`	`return StructTypeField(MessageTypeField(field));`
`56`	`56`	`}`
`57`		`- return absl::nullopt;`
	`57`	`+ return std::nullopt;`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`// Standard implementation for listing fields.`
`@@ -67,7 +67,7 @@ ListStructTypeFieldsDirectly(`
`67`	`67`	`const google::protobuf::Descriptor* absl_nullable descriptor =`
`68`	`68`	`descriptor_pool->FindMessageTypeByName(type);`
`69`	`69`	`if (descriptor == nullptr) {`
`70`		`- return absl::nullopt;`
	`70`	`+ return std::nullopt;`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`std::vector<const google::protobuf::FieldDescriptor*> extensions;`
`@@ -100,7 +100,7 @@ DescriptorPoolTypeIntrospector::FindTypeImpl(absl::string_view name) const {`
`100`	`100`	`if (enum_descriptor != nullptr) {`
`101`	`101`	`return Type::Enum(enum_descriptor);`
`102`	`102`	`}`
`103`		`- return absl::nullopt;`
	`103`	`+ return std::nullopt;`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`absl::StatusOr<std::optional<TypeIntrospector::EnumConstant>>`
`@@ -112,7 +112,7 @@ DescriptorPoolTypeIntrospector::FindEnumConstantImpl(`
`112`	`112`	`const google::protobuf::EnumValueDescriptor* absl_nullable enum_value_descriptor =`
`113`	`113`	`enum_descriptor->FindValueByName(value);`
`114`	`114`	`if (enum_value_descriptor == nullptr) {`
`115`		`- return absl::nullopt;`
	`115`	`+ return std::nullopt;`
`116`	`116`	`}`
`117`	`117`	`return EnumConstant{`
`118`	`118`	`.type = Type::Enum(enum_descriptor),`
`@@ -121,7 +121,7 @@ DescriptorPoolTypeIntrospector::FindEnumConstantImpl(`
`121`	`121`	`.number = enum_value_descriptor->number(),`
`122`	`122`	`};`
`123`	`123`	`}`
`124`		`- return absl::nullopt;`
	`124`	`+ return std::nullopt;`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`absl::StatusOr<std::optional<StructTypeField>>`
`@@ -134,7 +134,7 @@ DescriptorPoolTypeIntrospector::FindStructTypeFieldByNameImpl(`
`134`	`134`	`const FieldTable* field_table = GetFieldTable(type);`
`135`	`135`
`136`	`136`	`if (field_table == nullptr) {`
`137`		`- return absl::nullopt;`
	`137`	`+ return std::nullopt;`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`if (auto it = field_table->json_name_map.find(name);`
`@@ -147,7 +147,7 @@ DescriptorPoolTypeIntrospector::FindStructTypeFieldByNameImpl(`
`147`	`147`	`return field_table->fields[it->second].field;`
`148`	`148`	`}`
`149`	`149`
`150`		`- return absl::nullopt;`
	`150`	`+ return std::nullopt;`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`absl::StatusOr<`
`@@ -160,7 +160,7 @@ DescriptorPoolTypeIntrospector::ListFieldsForStructTypeImpl(`
`160`	`160`
`161`	`161`	`const FieldTable* field_table = GetFieldTable(type);`
`162`	`162`	`if (field_table == nullptr) {`
`163`		`- return absl::nullopt;`
	`163`	`+ return std::nullopt;`
`164`	`164`	`}`
`165`	`165`	`std::vector<TypeIntrospector::StructTypeFieldListing> fields;`
`166`	`166`	`fields.reserve(field_table->non_extensions.size());`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ absl::StatusOr<std::optional<Type>> TypeCheckEnv::LookupTypeName(`
`58`	`58`	`return type;`
`59`	`59`	`}`
`60`	`60`	`}`
`61`		`- return absl::nullopt;`
	`61`	`+ return std::nullopt;`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`absl::StatusOr<std::optional<VariableDecl>> TypeCheckEnv::LookupEnumConstant(`
`@@ -75,7 +75,7 @@ absl::StatusOr<std::optional<VariableDecl>> TypeCheckEnv::LookupEnumConstant(`
`75`	`75`	`return decl;`
`76`	`76`	`}`
`77`	`77`	`}`
`78`		`- return absl::nullopt;`
	`78`	`+ return std::nullopt;`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`absl::StatusOr<std::optional<VariableDecl>> TypeCheckEnv::LookupTypeConstant(`
`@@ -92,14 +92,14 @@ absl::StatusOr<std::optional<VariableDecl>> TypeCheckEnv::LookupTypeConstant(`
`92`	`92`	`return LookupEnumConstant(enum_name_candidate, value_name_candidate);`
`93`	`93`	`}`
`94`	`94`
`95`		`- return absl::nullopt;`
	`95`	`+ return std::nullopt;`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`absl::StatusOr<std::optional<StructTypeField>> TypeCheckEnv::LookupStructField(`
`99`	`99`	`absl::string_view type_name, absl::string_view field_name) const {`
`100`	`100`	`if (proto_type_mask_registry_ != nullptr &&`
`101`	`101`	`!proto_type_mask_registry_->FieldIsVisible(type_name, field_name)) {`
`102`		`- return absl::nullopt;`
	`102`	`+ return std::nullopt;`
`103`	`103`	`}`
`104`	`104`	`// Check the type providers in registration order.`
`105`	`105`	`// Note: this doesn't allow for shadowing a type with a subset type of the`
`@@ -113,7 +113,7 @@ absl::StatusOr<std::optional<StructTypeField>> TypeCheckEnv::LookupStructField(`
`113`	`113`	`return field;`
`114`	`114`	`}`
`115`	`115`	`}`
`116`		`- return absl::nullopt;`
	`116`	`+ return std::nullopt;`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`const VariableDecl* absl_nullable VariableScope::LookupLocalVariable(`
Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ std::optional<FunctionDecl> FilterDecl(FunctionDecl decl,`
`198`	`198`	`}`
`199`	`199`	`}`
`200`	`200`	`if (filtered.overloads().empty()) {`
`201`		`- return absl::nullopt;`
	`201`	`+ return std::nullopt;`
`202`	`202`	`}`
`203`	`203`	`filtered.set_name(std::move(name));`
`204`	`204`	`return filtered;`
Original file line number	Diff line number	Diff line change
`@@ -349,7 +349,7 @@ TEST(ContextDeclsTest, CustomStructNotSupported) {`
`349`	`349`	`if (name == "com.example.MyStruct") {`
`350`	`350`	`return common_internal::MakeBasicStructType("com.example.MyStruct");`
`351`	`351`	`}`
`352`		`- return absl::nullopt;`
	`352`	`+ return std::nullopt;`
`353`	`353`	`}`
`354`	`354`	`};`
`355`	`355`
`@@ -370,7 +370,7 @@ TEST(ContextDeclsWithProtoTypeMaskTest, CustomStructNotSupported) {`
`370`	`370`	`if (name == "com.example.MyStruct") {`
`371`	`371`	`return common_internal::MakeBasicStructType("com.example.MyStruct");`
`372`	`372`	`}`
`373`		`- return absl::nullopt;`
	`373`	`+ return std::nullopt;`
`374`	`374`	`}`
`375`	`375`	`};`
`376`	`376`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ std::optional<Type> WrapperToPrimitive(const Type& t) {`
`149`	`149`	`case TypeKind::kUintWrapper:`
`150`	`150`	`return UintType();`
`151`	`151`	`default:`
`152`		`- return absl::nullopt;`
	`152`	`+ return std::nullopt;`
`153`	`153`	`}`
`154`	`154`	`}`
`155`	`155`
`@@ -579,7 +579,7 @@ TypeInferenceContext::ResolveOverload(const FunctionDecl& decl,`
`579`	`579`	`}`
`580`	`580`
`581`	`581`	`if (!result_type.has_value() \|\| matching_overloads.empty()) {`
`582`		`- return absl::nullopt;`
	`582`	`+ return std::nullopt;`
`583`	`583`	`}`
`584`	`584`	`return OverloadResolution{`
`585`	`585`	`.result_type = FullySubstitute(result_type, /free_to_dyn=*/false),`