Automated Code Change

PiperOrigin-RevId: 824796020

Author: protobuf-github-bot

src/google/protobuf/descriptor.cc

@@ -506,7 +506,7 @@ class FlatAllocatorImpl {
   const std::string* AllocateStrings(In&&... in) {
     std::string* strings = AllocateArray<std::string>(sizeof...(in));
     std::string* res = strings;
-    Fold({(*strings++ = std::string(std::forward<In>(in)))...});
+    Fold({(*strings++ = std::forward<In>(in))...});
     return res;
   }
 
@@ -3608,7 +3608,7 @@ class SourceLocationCommentPrinter {
     }
   }
   void AddPostComment(std::string* output) {
-    if (have_source_loc_ && source_loc_.trailing_comments.size() > 0) {
+    if (have_source_loc_ && !source_loc_.trailing_comments.empty()) {
       absl::StrAppend(output, FormatComment(source_loc_.trailing_comments));
     }
   }

src/google/protobuf/descriptor_database.cc

@@ -347,7 +347,7 @@ void SimpleDescriptorDatabase::DescriptorIndex<Value>::FindAllFileNames(
 
 bool SimpleDescriptorDatabase::Add(const FileDescriptorProto& file) {
   FileDescriptorProto* new_file = new FileDescriptorProto;
-  new_file->CopyFrom(file);
+  *new_file = file;
   return AddAndOwn(new_file);
 }
 
@@ -394,7 +394,7 @@ bool SimpleDescriptorDatabase::MaybeCopy(
     const FileDescriptorProto* PROTOBUF_NULLABLE file,
     FileDescriptorProto* PROTOBUF_NONNULL output) {
   if (file == nullptr) return false;
-  output->CopyFrom(*file);
+  *output = *file;
   return true;
 }
 

src/google/protobuf/descriptor_unittest.cc

@@ -92,11 +92,9 @@ using ::google::protobuf::internal::cpp::HasHasbitWithoutProfile;
 using ::google::protobuf::internal::cpp::HasPreservingUnknownEnumSemantics;
 using ::google::protobuf::internal::cpp::Utf8CheckMode;
 using ::testing::AnyOf;
-using ::testing::AtLeast;
 using ::testing::ElementsAre;
 using ::testing::HasSubstr;
 using ::testing::NotNull;
-using ::testing::Return;
 
 absl::Status GetStatus(const absl::Status& s) { return s; }
 template <typename T>

src/google/protobuf/dynamic_message_unittest.cc

@@ -114,7 +114,7 @@ TEST(DynamicMessageTest,
 
   Reflection::ScratchSpace scratch;
   absl::string_view default_value = ref->GetStringView(*msg, field, scratch);
-  ref->SetString(msg.get(), field, std::string("foo"));
+  ref->SetString(msg.get(), field, "foo");
   EXPECT_EQ("foo", ref->GetStringView(*msg, field, scratch));
   msg->Clear();
   EXPECT_EQ(default_value, ref->GetStringView(*msg, field, scratch));

src/google/protobuf/extension_set_unittest.cc

@@ -340,19 +340,19 @@ TEST(ExtensionSetTest, CopyFrom) {
   unittest::TestAllExtensions message1, message2;
 
   TestUtil::SetAllExtensions(&message1);
-  message2.CopyFrom(message1);
+  message2 = message1;
   TestUtil::ExpectAllExtensionsSet(message2);
-  message2.CopyFrom(message1);  // exercise copy when fields already exist
+  message2 = message1;  // exercise copy when fields already exist
   TestUtil::ExpectAllExtensionsSet(message2);
 }
 
 TEST(ExtensionSetTest, CopyFromPacked) {
   unittest::TestPackedExtensions message1, message2;
 
   TestUtil::SetPackedExtensions(&message1);
-  message2.CopyFrom(message1);
+  message2 = message1;
   TestUtil::ExpectPackedExtensionsSet(message2);
-  message2.CopyFrom(message1);  // exercise copy when fields already exist
+  message2 = message1;  // exercise copy when fields already exist
   TestUtil::ExpectPackedExtensionsSet(message2);
 }
 

src/google/protobuf/generated_message_util.cc

@@ -342,12 +342,12 @@ bool IsNull(const void* ptr) {
 
 template <>
 bool IsNull<WireFormatLite::TYPE_STRING>(const void* ptr) {
-  return static_cast<const ArenaStringPtr*>(ptr)->Get().size() == 0;
+  return static_cast<const ArenaStringPtr*>(ptr)->Get().empty();
 }
 
 template <>
 bool IsNull<WireFormatLite::TYPE_BYTES>(const void* ptr) {
-  return static_cast<const ArenaStringPtr*>(ptr)->Get().size() == 0;
+  return static_cast<const ArenaStringPtr*>(ptr)->Get().empty();
 }
 
 template <>

src/google/protobuf/map_field_test.cc

@@ -33,8 +33,6 @@ namespace protobuf {
 
 namespace internal {
 
-using proto2_unittest::TestAllTypes;
-
 struct MapFieldTestPeer {
   static auto GetArena(const RepeatedPtrFieldBase& v) { return v.GetArena(); }
   template <typename T>

src/google/protobuf/map_test.inc

@@ -2471,11 +2471,11 @@ TEST(GeneratedMapFieldTest, CopyFrom) {
   UNITTEST::TestMap message1, message2;
 
   MapTestUtil::SetMapFields(&message1);
-  message2.CopyFrom(message1);
+  message2 = message1;
   MapTestUtil::ExpectMapFieldsSet(message2);
 
   // Copying from self should be a no-op.
-  message2.CopyFrom(message2);
+  message2 = message2;
   MapTestUtil::ExpectMapFieldsSet(message2);
 }
 
@@ -2485,7 +2485,7 @@ TEST(GeneratedMapFieldTest, CopyFromMessageMap) {
   (*message1.mutable_map_int32_message())[0].add_repeated_int32(100);
   (*message2.mutable_map_int32_message())[0].add_repeated_int32(101);
 
-  message1.CopyFrom(message2);
+  message1 = message2;
 
   // Checks repeated field is overwritten.
   EXPECT_EQ(1, message1.map_int32_message().at(0).repeated_int32_size());