Misc lint fixes.

PiperOrigin-RevId: 502580830

src/google/protobuf/compiler/objectivec/file.cc

@@ -39,8 +39,6 @@
 #include <string>
 #include <vector>
 
-#include "google/protobuf/compiler/code_generator.h"
-#include "google/protobuf/descriptor.h"
 #include "absl/container/btree_set.h"
 #include "absl/container/flat_hash_map.h"
 #include "absl/container/flat_hash_set.h"

src/google/protobuf/compiler/objectivec/helpers.cc

@@ -33,7 +33,6 @@
 #include <string>
 #include <vector>
 
-#include "google/protobuf/compiler/code_generator.h"
 #include "google/protobuf/stubs/logging.h"
 #include "absl/strings/ascii.h"
 #include "absl/strings/escaping.h"
@@ -311,7 +310,7 @@ std::string DefaultValue(const FieldDescriptor* field) {
   return std::string();
 }
 
-std::string BuildFlagsString(const FlagType flag_type,
+std::string BuildFlagsString(FlagType flag_type,
                              const std::vector<std::string>& strings) {
   if (strings.empty()) {
     return GetZeroEnumNameForFlagType(flag_type);

src/google/protobuf/compiler/objectivec/helpers.h

@@ -100,7 +100,7 @@ inline bool IsReferenceType(const FieldDescriptor* field) {
 std::string GPBGenericValueFieldName(const FieldDescriptor* field);
 std::string DefaultValue(const FieldDescriptor* field);
 
-std::string BuildFlagsString(const FlagType type,
+std::string BuildFlagsString(FlagType type,
                              const std::vector<std::string>& strings);
 
 // Returns a symbol that can be used in C code to refer to an Objective C

src/google/protobuf/compiler/objectivec/names.cc

@@ -39,12 +39,12 @@
 #include <string>
 #include <vector>
 
-#include "google/protobuf/compiler/code_generator.h"
 #include "absl/container/flat_hash_map.h"
 #include "absl/container/flat_hash_set.h"
 #include "absl/strings/ascii.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_split.h"
+#include "google/protobuf/compiler/code_generator.h"
 #include "google/protobuf/compiler/objectivec/line_consumer.h"
 #include "google/protobuf/compiler/objectivec/nsobject_methods.h"
 #include "google/protobuf/descriptor.pb.h"
@@ -1016,7 +1016,7 @@ bool PackageToPrefixesCollector::ConsumeLine(absl::string_view line,
   MaybeUnQuote(&prefix);
   // Don't really worry about error checking the package/prefix for
   // being valid.  Assume the file is validated when it is created/edited.
-  (*prefix_map_)[std::string(package)] = std::string(prefix);
+  (*prefix_map_)[package] = std::string(prefix);
   return true;
 }
 

src/google/protobuf/compiler/objectivec/text_format_decode_data.cc

@@ -36,7 +36,6 @@
 #include <string>
 #include <vector>
 
-#include "google/protobuf/compiler/code_generator.h"
 #include "absl/strings/ascii.h"
 #include "absl/strings/escaping.h"
 #include "absl/strings/match.h"
@@ -58,7 +57,7 @@ class DecodeDataBuilder {
  public:
   DecodeDataBuilder() { Reset(); }
 
-  bool AddCharacter(const char desired, const char input);
+  bool AddCharacter(char desired, char input);
   void AddUnderscore() {
     Push();
     need_underscore_ = true;
@@ -122,7 +121,7 @@ class DecodeDataBuilder {
   std::string decode_data_;
 };
 
-bool DecodeDataBuilder::AddCharacter(const char desired, const char input) {
+bool DecodeDataBuilder::AddCharacter(char desired, char input) {
   // If we've hit the max size, push to start a new segment.
   if (segment_len_ == kMaxSegmentLen) {
     Push();