Skip to content

No public description #1528

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

Closed
wants to merge 1 commit into from
Closed

No public description #1528

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 internal/equals_text_proto.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ bool TextProtoMatcher::MatchAndExplain(
} else {
auto other_message = absl::WrapUnique(message_->New());
absl::Cord serialized;
ABSL_CHECK(other.SerializeToCord(&serialized)); // Crash OK
ABSL_CHECK(other_message->ParseFromCord(serialized)); // Crash OK
ABSL_CHECK(other.SerializeToString(&serialized)); // Crash OK
ABSL_CHECK(other_message->ParseFromString(serialized)); // Crash OK
match = differencer.Compare(*other_message, *message_);
}
if (!match && listener->IsInterested()) {
Expand Down
12 changes: 6 additions & 6 deletions internal/json.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,33 +303,33 @@ class MessageToJsonState {
} break;
case Descriptor::WELLKNOWNTYPE_VALUE: {
absl::Cord serialized;
if (!message.SerializePartialToCord(&serialized)) {
if (!message.SerializePartialToString(&serialized)) {
return absl::UnknownError(
"failed to serialize message google.protobuf.Value");
}
if (!result->ParsePartialFromCord(serialized)) {
if (!result->ParsePartialFromString(serialized)) {
return absl::UnknownError(
"failed to parsed message: google.protobuf.Value");
}
} break;
case Descriptor::WELLKNOWNTYPE_LISTVALUE: {
absl::Cord serialized;
if (!message.SerializePartialToCord(&serialized)) {
if (!message.SerializePartialToString(&serialized)) {
return absl::UnknownError(
"failed to serialize message google.protobuf.ListValue");
}
if (!MutableListValue(result)->ParsePartialFromCord(serialized)) {
if (!MutableListValue(result)->ParsePartialFromString(serialized)) {
return absl::UnknownError(
"failed to parsed message: google.protobuf.ListValue");
}
} break;
case Descriptor::WELLKNOWNTYPE_STRUCT: {
absl::Cord serialized;
if (!message.SerializePartialToCord(&serialized)) {
if (!message.SerializePartialToString(&serialized)) {
return absl::UnknownError(
"failed to serialize message google.protobuf.Struct");
}
if (!MutableStructValue(result)->ParsePartialFromCord(serialized)) {
if (!MutableStructValue(result)->ParsePartialFromString(serialized)) {
return absl::UnknownError(
"failed to parsed message: google.protobuf.Struct");
}
Expand Down
4 changes: 2 additions & 2 deletions internal/message_equality_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ google::protobuf::Message* PackMessage(const google::protobuf::Message& message)
cel::to_address(instance),
absl::StrCat("type.googleapis.com/", message.GetTypeName()));
absl::Cord value;
ABSL_CHECK(message.SerializeToCord(&value));
ABSL_CHECK(message.SerializeToString(&value));
reflection.SetValue(cel::to_address(instance), value);
return instance;
}
Expand Down Expand Up @@ -390,7 +390,7 @@ void PackMessageTo(const google::protobuf::Message& message, google::protobuf::M
reflection.SetTypeUrl(
instance, absl::StrCat("type.googleapis.com/", message.GetTypeName()));
absl::Cord value;
ABSL_CHECK(message.SerializeToCord(&value));
ABSL_CHECK(message.SerializeToString(&value));
reflection.SetValue(instance, value);
}

Expand Down
2 changes: 1 addition & 1 deletion internal/well_known_types.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1972,7 +1972,7 @@ absl::StatusOr<Unique<google::protobuf::Message>> AdaptAny(
return unpacked->ParseFromString(string);
},
[&](const absl::Cord& cord) -> bool {
return unpacked->ParseFromCord(cord);
return unpacked->ParseFromString(cord);
}),
AsVariant(value));
if (!ok) {
Expand Down