Skip to content

No public description #2012

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

Merged
copybara-service merged 1 commit into from
May 21, 2026
+7 −9
Merged

No public description #2012

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
16 changes: 7 additions & 9 deletions codelab/network_functions.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,7 @@ absl::Status NetworkAddressRepEqual(
return absl::OkStatus();
}
const NetworkAddressRep rep = content.To<NetworkAddressRep>();
absl::optional<NetworkAddressRep> other_rep =
NetworkAddressRep::Unwrap(other);
std::optional<NetworkAddressRep> other_rep = NetworkAddressRep::Unwrap(other);
ABSL_DCHECK(other_rep.has_value());
*result = cel::BoolValue(rep.IsEqualTo(*other_rep));
return absl::OkStatus();
Expand Down Expand Up @@ -311,7 +310,7 @@ cel::Value parseAddress(
google::protobuf::Arena* absl_nonnull arena) {
std::string buf;
absl::string_view addr = str.ToStringView(&buf);
absl::optional<NetworkAddressRep> rep = NetworkAddressRep::Parse(addr);
std::optional<NetworkAddressRep> rep = NetworkAddressRep::Parse(addr);
if (!rep.has_value()) {
return cel::ErrorValue(absl::InvalidArgumentError("invalid address"));
}
Expand All @@ -321,7 +320,7 @@ cel::Value parseAddress(
cel::Value parseAddressOrZero(const cel::StringValue& str) {
std::string buf;
absl::string_view addr = str.ToStringView(&buf);
absl::optional<NetworkAddressRep> rep = NetworkAddressRep::Parse(addr);
std::optional<NetworkAddressRep> rep = NetworkAddressRep::Parse(addr);
static const NetworkAddressRep kZero;
if (!rep.has_value()) {
return NetworkAddressRep::MakeValue(kZero);
Expand All @@ -336,8 +335,7 @@ cel::Value parseAddressMatcher(
google::protobuf::Arena* absl_nonnull arena) {
std::string buf;
absl::string_view addr = str.ToStringView(&buf);
absl::optional<NetworkAddressMatcher> rep =
NetworkAddressMatcher::Parse(addr);
std::optional<NetworkAddressMatcher> rep = NetworkAddressMatcher::Parse(addr);
if (!rep.has_value()) {
return cel::ErrorValue(
absl::InvalidArgumentError("invalid address matcher"));
Expand Down Expand Up @@ -365,7 +363,7 @@ cel::Value NetworkAddressRep::MakeValue(const NetworkAddressRep& rep) {
cel::OpaqueValueContent::From(rep));
}

absl::optional<NetworkAddressRep> NetworkAddressRep::Unwrap(
std::optional<NetworkAddressRep> NetworkAddressRep::Unwrap(
const cel::Value& value) {
auto opaque = value.AsOpaque();
if (!opaque.has_value() ||
Expand All @@ -381,7 +379,7 @@ absl::optional<NetworkAddressRep> NetworkAddressRep::Unwrap(
return opaque->content().To<NetworkAddressRep>();
}

absl::optional<NetworkAddressRep> NetworkAddressRep::Parse(
std::optional<NetworkAddressRep> NetworkAddressRep::Parse(
absl::string_view str) {
uint32_t ipv4 = 0;
char ipv6[16];
Expand Down Expand Up @@ -418,7 +416,7 @@ bool NetworkAddressRep::IsLessThan(const NetworkAddressRep& other) const {
return false;
}

absl::optional<NetworkAddressMatcher> NetworkAddressMatcher::Parse(
std::optional<NetworkAddressMatcher> NetworkAddressMatcher::Parse(
absl::string_view str) {
// range style addr-addr
int dash_pos = str.find('-');
Expand Down