Skip to content

No public description #2077

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: master
Choose a base branch
from
Open

No public description #2077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eval/public/structs/cel_proto_wrap_util.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,7 @@ class ValueFromMessageMaker {
return CreateWellknownTypeValue<Struct>(message, factory, arena);
// WELLKNOWNTYPE_FIELDMASK has no special CelValue type
default:
return absl::nullopt;
return std::nullopt;
}
}

Expand All @@ -716,7 +716,7 @@ absl::optional<CelValue> DynamicMap::operator[](CelValue key) const {

auto it = values_->fields().find(std::string(str_key.value()));
if (it == values_->fields().end()) {
return absl::nullopt;
return std::nullopt;
}

return ValueManager(factory_, arena_).ValueFromMessage(&it->second);
Expand Down
2 changes: 1 addition & 1 deletion eval/public/structs/cel_proto_wrapper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ absl::optional<CelValue> CelProtoWrapper::MaybeWrapValue(
if (msg != nullptr) {
return InternalWrapMessage(msg);
} else {
return absl::nullopt;
return std::nullopt;
}
}

Expand Down
14 changes: 7 additions & 7 deletions eval/public/structs/legacy_type_provider.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class LegacyStructValueBuilder final : public cel::StructValueBuilder {
CEL_RETURN_IF_ERROR(adapter_.mutation_apis()->SetField(
name, legacy_value, memory_manager_, builder_))
.With(cel::ErrorValueReturn());
return absl::nullopt;
return std::nullopt;
}

absl::StatusOr<absl::optional<cel::ErrorValue>> SetFieldByNumber(
Expand All @@ -76,7 +76,7 @@ class LegacyStructValueBuilder final : public cel::StructValueBuilder {
CEL_RETURN_IF_ERROR(adapter_.mutation_apis()->SetFieldByNumber(
number, legacy_value, memory_manager_, builder_))
.With(cel::ErrorValueReturn());
return absl::nullopt;
return std::nullopt;
}

absl::StatusOr<cel::StructValue> Build() && override {
Expand Down Expand Up @@ -116,7 +116,7 @@ class LegacyValueBuilder final : public cel::ValueBuilder {
CEL_RETURN_IF_ERROR(adapter_.mutation_apis()->SetField(
name, legacy_value, memory_manager_, builder_))
.With(cel::ErrorValueReturn());
return absl::nullopt;
return std::nullopt;
}

absl::StatusOr<absl::optional<cel::ErrorValue>> SetFieldByNumber(
Expand All @@ -129,7 +129,7 @@ class LegacyValueBuilder final : public cel::ValueBuilder {
CEL_RETURN_IF_ERROR(adapter_.mutation_apis()->SetFieldByNumber(
number, legacy_value, memory_manager_, builder_))
.With(cel::ErrorValueReturn());
return absl::nullopt;
return std::nullopt;
}

absl::StatusOr<cel::Value> Build() && override {
Expand Down Expand Up @@ -187,7 +187,7 @@ absl::StatusOr<absl::optional<cel::Type>> LegacyTypeProvider::FindTypeImpl(
return cel::common_internal::MakeBasicStructType(
(*type_info)->GetTypename(MessageWrapper()));
}
return absl::nullopt;
return std::nullopt;
}

absl::StatusOr<absl::optional<cel::StructTypeField>>
Expand All @@ -206,13 +206,13 @@ LegacyTypeProvider::FindStructTypeFieldByNameImpl(
const auto* mutation_apis =
(*type_info)->GetMutationApis(MessageWrapper());
if (mutation_apis == nullptr || !mutation_apis->DefinesField(name)) {
return absl::nullopt;
return std::nullopt;
}
return cel::common_internal::BasicStructTypeField(name, 0,
cel::DynType{});
}
}
return absl::nullopt;
return std::nullopt;
}

} // namespace google::api::expr::runtime
14 changes: 7 additions & 7 deletions eval/public/structs/legacy_type_provider_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class LegacyTypeProviderTestEmpty : public LegacyTypeProvider {
public:
absl::optional<LegacyTypeAdapter> ProvideLegacyType(
absl::string_view name) const override {
return absl::nullopt;
return std::nullopt;
}
};

Expand Down Expand Up @@ -60,14 +60,14 @@ class LegacyTypeProviderTestImpl : public LegacyTypeProvider {
if (name == "test") {
return LegacyTypeAdapter(nullptr, nullptr);
}
return absl::nullopt;
return std::nullopt;
}
absl::optional<const LegacyTypeInfoApis*> ProvideLegacyTypeInfo(
absl::string_view name) const override {
if (name == "test") {
return test_type_info_;
}
return absl::nullopt;
return std::nullopt;
}

private:
Expand All @@ -76,17 +76,17 @@ class LegacyTypeProviderTestImpl : public LegacyTypeProvider {

TEST(LegacyTypeProviderTest, EmptyTypeProviderHasProvideTypeInfo) {
LegacyTypeProviderTestEmpty provider;
EXPECT_EQ(provider.ProvideLegacyType("test"), absl::nullopt);
EXPECT_EQ(provider.ProvideLegacyTypeInfo("test"), absl::nullopt);
EXPECT_EQ(provider.ProvideLegacyType("test"), std::nullopt);
EXPECT_EQ(provider.ProvideLegacyTypeInfo("test"), std::nullopt);
}

TEST(LegacyTypeProviderTest, NonEmptyTypeProviderProvidesSomeTypes) {
LegacyTypeInfoApisEmpty test_type_info;
LegacyTypeProviderTestImpl provider(&test_type_info);
EXPECT_TRUE(provider.ProvideLegacyType("test").has_value());
EXPECT_TRUE(provider.ProvideLegacyTypeInfo("test").has_value());
EXPECT_EQ(provider.ProvideLegacyType("other"), absl::nullopt);
EXPECT_EQ(provider.ProvideLegacyTypeInfo("other"), absl::nullopt);
EXPECT_EQ(provider.ProvideLegacyType("other"), std::nullopt);
EXPECT_EQ(provider.ProvideLegacyTypeInfo("other"), std::nullopt);
}

} // namespace
Expand Down
4 changes: 2 additions & 2 deletions eval/public/structs/proto_message_type_adapter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,14 +472,14 @@ const LegacyTypeAccessApis* ProtoMessageTypeAdapter::GetAccessApis(
absl::optional<LegacyTypeInfoApis::FieldDescription>
ProtoMessageTypeAdapter::FindFieldByName(absl::string_view field_name) const {
if (descriptor_ == nullptr) {
return absl::nullopt;
return std::nullopt;
}

const google::protobuf::FieldDescriptor* field_descriptor =
descriptor_->FindFieldByName(field_name);

if (field_descriptor == nullptr) {
return absl::nullopt;
return std::nullopt;
}

return LegacyTypeInfoApis::FieldDescription{field_descriptor->number(),
Expand Down
2 changes: 1 addition & 1 deletion eval/public/structs/proto_message_type_adapter_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@ TEST(ProtoMesssageTypeAdapter, FindFieldNotFound) {
"google.api.expr.runtime.TestMessage"),
google::protobuf::MessageFactory::generated_factory());

EXPECT_EQ(adapter.FindFieldByName("foo_not_a_field"), absl::nullopt);
EXPECT_EQ(adapter.FindFieldByName("foo_not_a_field"), std::nullopt);
}

TEST(ProtoMesssageTypeAdapter, TypeInfoMutator) {
Expand Down
4 changes: 2 additions & 2 deletions eval/public/structs/protobuf_descriptor_type_provider.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ absl::optional<LegacyTypeAdapter> ProtobufDescriptorProvider::ProvideLegacyType(
absl::string_view name) const {
const ProtoMessageTypeAdapter* result = GetTypeAdapter(name);
if (result == nullptr) {
return absl::nullopt;
return std::nullopt;
}
// ProtoMessageTypeAdapter provides apis for both access and mutation.
return LegacyTypeAdapter(result, result);
Expand All @@ -38,7 +38,7 @@ ProtobufDescriptorProvider::ProvideLegacyTypeInfo(
absl::string_view name) const {
const ProtoMessageTypeAdapter* result = GetTypeAdapter(name);
if (result == nullptr) {
return absl::nullopt;
return std::nullopt;
}
return result;
}
Expand Down
4 changes: 2 additions & 2 deletions eval/public/structs/trivial_legacy_type_info_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ TEST(TrivialTypeInfo, FindFieldByName) {
TrivialTypeInfo info;
MessageWrapper wrapper;

EXPECT_EQ(info.FindFieldByName("foo"), absl::nullopt);
EXPECT_EQ(info.FindFieldByName("foo"), std::nullopt);
EXPECT_EQ(TrivialTypeInfo::GetInstance()->FindFieldByName("foo"),
absl::nullopt);
std::nullopt);
}

} // namespace
Expand Down
Loading