Remove repeated_field_iterator (protos)

PiperOrigin-RevId: 662933968

hpb/bazel/upb_cc_proto_library.bzl

@@ -257,8 +257,8 @@ _upb_cc_proto_library_aspect = aspect(
                 "//hpb:generated_protos_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
                 "@com_google_absl//absl/strings",
                 "@com_google_absl//absl/status:statusor",
+                "//hpb:repeated_field",
                 "//protos",
-                "//protos:repeated_field",
             ],
         ),
     },

hpb_generator/protoc-gen-upb-protos.cc

@@ -13,14 +13,14 @@
 
 #include "google/protobuf/descriptor.pb.h"
 #include "google/protobuf/compiler/code_generator.h"
-#include "google/protobuf/compiler/plugin.h"
-#include "google/protobuf/descriptor.h"
 #include "google/protobuf/compiler/hpb/gen_enums.h"
 #include "google/protobuf/compiler/hpb/gen_extensions.h"
 #include "google/protobuf/compiler/hpb/gen_messages.h"
 #include "google/protobuf/compiler/hpb/gen_utils.h"
 #include "google/protobuf/compiler/hpb/names.h"
 #include "google/protobuf/compiler/hpb/output.h"
+#include "google/protobuf/compiler/plugin.h"
+#include "google/protobuf/descriptor.h"
 
 namespace google::protobuf::hpb_generator {
 namespace {
@@ -135,8 +135,9 @@ void WriteHeader(const protobuf::FileDescriptor* file, Output& output,
 #define $0_HPB_PROTO_H_
 
 #include "google/protobuf/hpb/internal.h"
+#include "google/protobuf/hpb/repeated_field.h"
+
 #include "protos/protos.h"
-#include "protos/repeated_field.h"
 
 #include "absl/strings/string_view.h"
 #include "absl/status/statusor.h"

protos/BUILD

@@ -20,19 +20,6 @@
 # licenses(["notice"])
 #
 # cc_library(
-#     name = "repeated_field",
-#     hdrs = [
-#         "repeated_field.h",
-#         "repeated_field_iterator.h",
-#     ],
-#     copts = UPB_DEFAULT_CPPOPTS,
-#     visibility = ["//visibility:public"],
-#     deps = [
-#         "//hpb:repeated_field",
-#     ],
-# )
-#
-# cc_library(
 #     name = "protos",
 #     hdrs = [
 #         "protos.h",

protos/repeated_field_iterator.h

@@ -1,11 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2023 Google LLC.  All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file or at
-// https://developers.google.com/open-source/licenses/bsd
-
-#ifndef UPB_PROTOS_REPEATED_FIELD_ITERATOR_H_
-#define UPB_PROTOS_REPEATED_FIELD_ITERATOR_H_
-#include "google/protobuf/hpb/repeated_field_iterator.h"
-#endif

rust/test/benchmarks/BUILD

@@ -48,8 +48,8 @@ cc_test(
         ":bench_data_upb_cc_proto",
         ":benchmarks",
         ":proto_benchmarks_cpp",  # build_cleaner: keep
+        "//hpb:repeated_field",
         "//protos",
-        "//protos:repeated_field",
         "//src/google/protobuf:protobuf_lite",
         "//testing/base/public:gunit",
         "//third_party/benchmark",
@@ -69,8 +69,8 @@ cc_test(
         ":bench_data_upb_cc_proto",
         ":benchmarks",
         ":proto_benchmarks_upb",  # build_cleaner: keep
+        "//hpb:repeated_field",
         "//protos",
-        "//protos:repeated_field",
         "//src/google/protobuf:protobuf_lite",
         "//testing/base/public:gunit",
         "//third_party/benchmark",