Skip to content

Commit f496bcf

Browse files
CEL Dev Teamcopybara-github
authored andcommitted
No public description
PiperOrigin-RevId: 917656577
1 parent 833bb0c commit f496bcf

3 files changed

Lines changed: 6 additions & 7 deletions

File tree

runtime/activation_test.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ TEST_F(ActivationTest, MoveAssignment) {
326326
"val_provided",
327327
[](absl::string_view name, const google::protobuf::DescriptorPool* absl_nonnull,
328328
google::protobuf::MessageFactory* absl_nonnull, google::protobuf::Arena* absl_nonnull)
329-
-> absl::StatusOr<absl::optional<Value>> { return IntValue(42); }));
329+
-> absl::StatusOr<std::optional<Value>> { return IntValue(42); }));
330330
moved_from.SetUnknownPatterns(
331331
{AttributePattern("var1",
332332
{AttributeQualifierPattern::OfString("field1")}),
@@ -377,7 +377,7 @@ TEST_F(ActivationTest, MoveCtor) {
377377
"val_provided",
378378
[](absl::string_view name, const google::protobuf::DescriptorPool* absl_nonnull,
379379
google::protobuf::MessageFactory* absl_nonnull, google::protobuf::Arena* absl_nonnull)
380-
-> absl::StatusOr<absl::optional<Value>> { return IntValue(42); }));
380+
-> absl::StatusOr<std::optional<Value>> { return IntValue(42); }));
381381
moved_from.SetUnknownPatterns(
382382
{AttributePattern("var1",
383383
{AttributeQualifierPattern::OfString("field1")}),

runtime/function_registry.cc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,13 @@ class ActivationFunctionProviderImpl
4444
public:
4545
ActivationFunctionProviderImpl() = default;
4646

47-
absl::StatusOr<absl::optional<cel::FunctionOverloadReference>> GetFunction(
47+
absl::StatusOr<std::optional<FunctionOverloadReference>> GetFunction(
4848
const cel::FunctionDescriptor& descriptor,
4949
const cel::ActivationInterface& activation) const override {
5050
std::vector<cel::FunctionOverloadReference> overloads =
5151
activation.FindFunctionOverloads(descriptor.name());
5252

53-
absl::optional<cel::FunctionOverloadReference> matching_overload =
54-
absl::nullopt;
53+
std::optional<FunctionOverloadReference> matching_overload = absl::nullopt;
5554

5655
for (const auto& overload : overloads) {
5756
if (overload.descriptor.ShapeMatches(descriptor)) {

runtime/function_registry_test.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ TEST(FunctionRegistryTest, DefaultLazyProviderNoOverloadFound) {
120120
ASSERT_THAT(providers, SizeIs(1));
121121
const FunctionProvider& provider = providers[0].provider;
122122
ASSERT_OK_AND_ASSIGN(
123-
absl::optional<FunctionOverloadReference> func,
123+
std::optional<FunctionOverloadReference> func,
124124
provider.GetFunction({"LazyFunc", false, {cel::Kind::kInt64}},
125125
activation));
126126

@@ -146,7 +146,7 @@ TEST(FunctionRegistryTest, DefaultLazyProviderReturnsImpl) {
146146
ASSERT_THAT(providers, SizeIs(1));
147147
const FunctionProvider& provider = providers[0].provider;
148148
ASSERT_OK_AND_ASSIGN(
149-
absl::optional<FunctionOverloadReference> func,
149+
std::optional<FunctionOverloadReference> func,
150150
provider.GetFunction(
151151
FunctionDescriptor("LazyFunction", false, {Kind::kInt}), activation));
152152

0 commit comments

Comments
 (0)