Merge remote-tracking branch 'refs/remotes/upstream/main' into sync-s…

…tage # Conflicts: # src/google/protobuf/compiler/objectivec/objectivec_enum.cc # src/google/protobuf/compiler/objectivec/objectivec_extension.cc # src/google/protobuf/compiler/objectivec/objectivec_field.cc # src/google/protobuf/compiler/objectivec/objectivec_file.cc # src/google/protobuf/compiler/objectivec/objectivec_generator.cc # src/google/protobuf/compiler/objectivec/objectivec_helpers.cc # src/google/protobuf/compiler/objectivec/objectivec_message.cc # src/google/protobuf/compiler/objectivec/objectivec_oneof.cc # src/google/protobuf/compiler/objectivec/objectivec_primitive_field.cc # src/google/protobuf/compiler/plugin.pb.h # src/google/protobuf/descriptor.pb.h
protocolbuffers · mkruskal-google · Sep 20, 2022 · Sep 12, 2022 · Sep 12, 2022 · Sep 19, 2022
commit ab09b6421a041d6520033015399424ac1ec73fc0
@@ -42,10 +42,6 @@
 #include <unordered_set>
 #include <vector>
 
-#include "absl/strings/ascii.h"
-#include "absl/strings/escaping.h"
-#include "absl/strings/str_replace.h"
-#include "absl/strings/str_split.h"
 #include "google/protobuf/compiler/code_generator.h"
 #include "google/protobuf/stubs/strutil.h"
 #include "absl/strings/ascii.h"
@@ -520,7 +516,8 @@ void PathSplit(const std::string& path, std::string* directory,
 }
 
 bool IsSpecialNamePrefix(const std::string& name,
-                         const std::string* special_names, size_t count) {
+                         const std::string* special_names,
+                         size_t count) {
   for (size_t i = 0; i < count; ++i) {
     const size_t length = special_names[i].length();
     if (name.compare(0, length, special_names[i]) == 0) {
@@ -595,8 +592,8 @@ bool IsRetainedName(const std::string& name) {
   // http://developer.apple.com/library/mac/#documentation/Cocoa/Conceptual/MemoryMgmt/Articles/mmRules.html
   static const std::string retained_names[] = {"new", "alloc", "copy",
                                                "mutableCopy"};
-  return IsSpecialNamePrefix(
-      name, retained_names, sizeof(retained_names) / sizeof(retained_names[0]));
+  return IsSpecialNamePrefix(name, retained_names,
+                             sizeof(retained_names) / sizeof(retained_names[0]));
 }
 
 bool IsInitName(const std::string& name) {

@@ -35,7 +35,6 @@
 
 #include "absl/strings/str_cat.h"
 #include "google/protobuf/compiler/objectivec/objectivec_helpers.h"
-#include "google/protobuf/compiler/objectivec/objectivec_oneof.h"
 #include "google/protobuf/io/printer.h"
 
 namespace google {

diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h
diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h