Skip to content

Commit 0361a59

Browse files
Migrate coded output stream arguments from const std::string& to absl::string_view.
PiperOrigin-RevId: 703734280
1 parent d70fbd2 commit 0361a59

File tree

2 files changed

+15
-24
lines changed

2 files changed

+15
-24
lines changed

src/google/protobuf/io/coded_stream.cc

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -986,25 +986,17 @@ uint8_t* EpsCopyOutputStream::WriteCord(const absl::Cord& cord, uint8_t* ptr) {
986986
}
987987
}
988988

989-
uint8_t* EpsCopyOutputStream::WriteStringMaybeAliasedOutline(uint32_t num,
990-
const std::string& s,
991-
uint8_t* ptr) {
989+
uint8_t* EpsCopyOutputStream::WriteStringMaybeAliasedOutline(
990+
uint32_t num, absl::string_view s, uint8_t* ptr) {
992991
ptr = EnsureSpace(ptr);
993992
uint32_t size = s.size();
994993
ptr = WriteLengthDelim(num, size, ptr);
995994
return WriteRawMaybeAliased(s.data(), size, ptr);
996995
}
997996

998-
uint8_t* EpsCopyOutputStream::WriteStringOutline(uint32_t num, const std::string& s,
999-
uint8_t* ptr) {
1000-
ptr = EnsureSpace(ptr);
1001-
uint32_t size = s.size();
1002-
ptr = WriteLengthDelim(num, size, ptr);
1003-
return WriteRaw(s.data(), size, ptr);
1004-
}
1005-
1006-
uint8_t* EpsCopyOutputStream::WriteStringOutline(uint32_t num, absl::string_view s,
1007-
uint8_t* ptr) {
997+
uint8_t* EpsCopyOutputStream::WriteStringOutline(uint32_t num,
998+
absl::string_view s,
999+
uint8_t* ptr) {
10081000
ptr = EnsureSpace(ptr);
10091001
uint32_t size = s.size();
10101002
ptr = WriteLengthDelim(num, size, ptr);
@@ -1028,8 +1020,8 @@ uint8_t* CodedOutputStream::WriteCordToArray(const absl::Cord& cord,
10281020
}
10291021

10301022

1031-
uint8_t* CodedOutputStream::WriteStringWithSizeToArray(const std::string& str,
1032-
uint8_t* target) {
1023+
uint8_t* CodedOutputStream::WriteStringWithSizeToArray(absl::string_view str,
1024+
uint8_t* target) {
10331025
ABSL_DCHECK_LE(str.size(), std::numeric_limits<uint32_t>::max());
10341026
target = WriteVarint32ToArray(str.size(), target);
10351027
return WriteStringToArray(str, target);

src/google/protobuf/io/coded_stream.h

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ class PROTOBUF_EXPORT EpsCopyOutputStream {
693693
#ifndef NDEBUG
694694
PROTOBUF_NOINLINE
695695
#endif
696-
uint8_t* WriteStringMaybeAliased(uint32_t num, const std::string& s,
696+
uint8_t* WriteStringMaybeAliased(uint32_t num, absl::string_view s,
697697
uint8_t* ptr) {
698698
std::ptrdiff_t size = s.size();
699699
if (ABSL_PREDICT_FALSE(size >= 128 ||
@@ -705,7 +705,7 @@ class PROTOBUF_EXPORT EpsCopyOutputStream {
705705
std::memcpy(ptr, s.data(), size);
706706
return ptr + size;
707707
}
708-
uint8_t* WriteBytesMaybeAliased(uint32_t num, const std::string& s,
708+
uint8_t* WriteBytesMaybeAliased(uint32_t num, absl::string_view s,
709709
uint8_t* ptr) {
710710
return WriteStringMaybeAliased(num, s, ptr);
711711
}
@@ -864,9 +864,8 @@ class PROTOBUF_EXPORT EpsCopyOutputStream {
864864

865865
uint8_t* WriteAliasedRaw(const void* data, int size, uint8_t* ptr);
866866

867-
uint8_t* WriteStringMaybeAliasedOutline(uint32_t num, const std::string& s,
867+
uint8_t* WriteStringMaybeAliasedOutline(uint32_t num, absl::string_view s,
868868
uint8_t* ptr);
869-
uint8_t* WriteStringOutline(uint32_t num, const std::string& s, uint8_t* ptr);
870869
uint8_t* WriteStringOutline(uint32_t num, absl::string_view s, uint8_t* ptr);
871870
uint8_t* WriteCordOutline(const absl::Cord& c, uint8_t* ptr);
872871

@@ -1117,11 +1116,11 @@ class PROTOBUF_EXPORT CodedOutputStream {
11171116
uint8_t* target);
11181117

11191118
// Equivalent to WriteRaw(str.data(), str.size()).
1120-
void WriteString(const std::string& str);
1119+
void WriteString(absl::string_view str);
11211120
// Like WriteString() but writing directly to the target array.
1122-
static uint8_t* WriteStringToArray(const std::string& str, uint8_t* target);
1121+
static uint8_t* WriteStringToArray(absl::string_view str, uint8_t* target);
11231122
// Write the varint-encoded size of str followed by str.
1124-
static uint8_t* WriteStringWithSizeToArray(const std::string& str,
1123+
static uint8_t* WriteStringWithSizeToArray(absl::string_view str,
11251124
uint8_t* target);
11261125

11271126
// Like WriteString() but writes a Cord.
@@ -1790,7 +1789,7 @@ inline size_t CodedOutputStream::VarintSize32SignExtendedPlusOne(
17901789
}
17911790
#undef PROTOBUF_CODED_STREAM_H_PREFER_BSR
17921791

1793-
inline void CodedOutputStream::WriteString(const std::string& str) {
1792+
inline void CodedOutputStream::WriteString(absl::string_view str) {
17941793
WriteRaw(str.data(), static_cast<int>(str.size()));
17951794
}
17961795

@@ -1805,7 +1804,7 @@ inline uint8_t* CodedOutputStream::WriteRawToArray(const void* data, int size,
18051804
return target + size;
18061805
}
18071806

1808-
inline uint8_t* CodedOutputStream::WriteStringToArray(const std::string& str,
1807+
inline uint8_t* CodedOutputStream::WriteStringToArray(absl::string_view str,
18091808
uint8_t* target) {
18101809
return WriteRawToArray(str.data(), static_cast<int>(str.size()), target);
18111810
}

0 commit comments

Comments
 (0)