hpb: move repeated_field_iterator and repeated_field_iterator_test to hpb/backend/upb

honglooker · copybara-github · commit 0981686bd25e · 2025-07-21T11:03:01.000-07:00
PiperOrigin-RevId: 785499458
diff --git a/hpb/BUILD b/hpb/BUILD
@@ -7,7 +7,6 @@
 
 load("@bazel_skylib//rules:common_settings.bzl", "string_flag")
 load("@rules_cc//cc:cc_library.bzl", "cc_library")
-load("@rules_cc//cc:cc_test.bzl", "cc_test")
 load(
     "//hpb/bazel:hpb_proto_library.bzl",
     "hpb_proto_library_copts",
@@ -95,14 +94,14 @@ cc_library(
     name = "repeated_field",
     hdrs = [
         "repeated_field.h",
-        "repeated_field_iterator.h",
     ],
     copts = UPB_DEFAULT_CPPOPTS,
     visibility = ["//visibility:public"],
     deps = [
         ":hpb",
         ":ptr",
         "//hpb/backend/upb:interop",
+        "//hpb/backend/upb:repeated_field_iterator",
         "//hpb/internal:template_help",
         "//upb/base",
         "//upb/mem",
@@ -134,23 +133,6 @@ hpb_proto_library_copts(
     visibility = ["//hpb/bazel:__pkg__"],
 )
 
-cc_test(
-    name = "repeated_field_iterator_test",
-    srcs = ["repeated_field_iterator_test.cc"],
-    deps = [
-        ":arena",
-        ":hpb",
-        ":repeated_field",
-        "//hpb/backend/upb:interop",
-        "//upb/base",
-        "//upb/mem",
-        "//upb/message",
-        "@abseil-cpp//absl/strings:string_view",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
-    ],
-)
-
 cc_library(
     name = "requires",
     hdrs = ["requires.h"],
diff --git a/hpb/backend/upb/BUILD b/hpb/backend/upb/BUILD
@@ -86,3 +86,33 @@ cc_library(
         "@abseil-cpp//absl/strings:string_view",
     ],
 )
+
+cc_library(
+    name = "repeated_field_iterator",
+    hdrs = ["repeated_field_iterator.h"],
+    visibility = ["//hpb:__subpackages__"],
+    deps = [
+        ":interop",
+        "//hpb",
+        "//upb/base",
+        "//upb/mem",
+        "//upb/message",
+        "@abseil-cpp//absl/strings:string_view",
+    ],
+)
+
+cc_test(
+    name = "repeated_field_iterator_test",
+    srcs = ["repeated_field_iterator_test.cc"],
+    deps = [
+        ":interop",
+        ":repeated_field_iterator",
+        "//hpb:arena",
+        "//upb/base",
+        "//upb/mem",
+        "//upb/message",
+        "@abseil-cpp//absl/strings:string_view",
+        "@googletest//:gtest",
+        "@googletest//:gtest_main",
+    ],
+)
diff --git a/hpb/backend/upb/repeated_field_iterator.h b/hpb/backend/upb/repeated_field_iterator.h
diff --git a/hpb/backend/upb/repeated_field_iterator_test.cc b/hpb/backend/upb/repeated_field_iterator_test.cc
@@ -5,7 +5,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "hpb/repeated_field_iterator.h"
+#include "hpb/backend/upb/repeated_field_iterator.h"
 
 #include <algorithm>
 #include <array>
diff --git a/hpb/repeated_field.h b/hpb/repeated_field.h
@@ -16,9 +16,9 @@
 
 #include "absl/strings/string_view.h"
 #include "hpb/backend/upb/interop.h"
+#include "hpb/backend/upb/repeated_field_iterator.h"
 #include "hpb/internal/template_help.h"
 #include "hpb/ptr.h"
-#include "hpb/repeated_field_iterator.h"
 #include "upb/base/string_view.h"
 #include "upb/mem/arena.h"
 #include "upb/message/array.h"
