upb: clean up and consolidate the upb/message/ build targets

PiperOrigin-RevId: 594167226

protos/BUILD

@@ -35,7 +35,6 @@ cc_library(
         "//upb:mem",
         "//upb:message",
         "//upb:message_copy",
-        "//upb:message_types",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/strings",
     ],
@@ -59,10 +58,10 @@ cc_library(
         "//upb:message_accessors",
         "//upb:message_copy",
         "//upb:message_promote",
-        "//upb:message_types",
         "//upb:mini_table",
         "//upb:wire",
         "//upb:wire_reader",
+        "//upb/message:internal",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",

protos/protos.cc

@@ -18,8 +18,8 @@
 #include "upb/mem/arena.h"
 #include "upb/message/copy.h"
 #include "upb/message/internal/extension.h"
+#include "upb/message/message.h"
 #include "upb/message/promote.h"
-#include "upb/message/types.h"
 #include "upb/mini_table/extension.h"
 #include "upb/mini_table/extension_registry.h"
 #include "upb/mini_table/message.h"

protos/repeated_field.h

@@ -22,7 +22,7 @@
 #include "upb/mem/arena.h"
 #include "upb/message/array.h"
 #include "upb/message/copy.h"
-#include "upb/message/types.h"
+#include "upb/message/message.h"
 
 namespace protos {
 namespace internal {

protos/repeated_field_iterator.h

@@ -18,7 +18,7 @@
 #include "upb/base/string_view.h"
 #include "upb/mem/arena.h"
 #include "upb/message/array.h"
-#include "upb/message/types.h"
+#include "upb/message/message.h"
 
 namespace protos {
 namespace internal {

upb/BUILD

@@ -115,6 +115,7 @@ cc_library(
         ":mini_descriptor",
         ":mini_table",
         ":wire",
+        "//upb/message:internal",
     ],
 )
 
@@ -234,24 +235,6 @@ alias(
     visibility = ["//visibility:public"],
 )
 
-alias(
-    name = "message_tagged_ptr",
-    actual = "//upb/message:tagged_ptr",
-    visibility = ["//upb:friends"],
-)
-
-alias(
-    name = "message_types",
-    actual = "//upb/message:types",
-    visibility = ["//visibility:public"],
-)
-
-alias(
-    name = "message_value",
-    actual = "//upb/message:value",
-    visibility = ["//visibility:public"],
-)
-
 alias(
     name = "mini_descriptor",
     actual = "//upb/mini_descriptor",
@@ -370,9 +353,6 @@ upb_amalgamation(
         ":message_accessors",
         ":message_compare",
         ":message_copy",
-        ":message_tagged_ptr",
-        ":message_types",
-        ":message_value",
         ":mini_descriptor",
         ":mini_descriptor_internal",
         ":mini_table",
@@ -383,6 +363,7 @@ upb_amalgamation(
         ":wire",
         ":wire_reader",
         "//upb/mem:internal",
+        "//upb/message:internal",
         "//upb/mini_table:internal",
     ],
     strip_import_prefix = ["src"],
@@ -418,9 +399,6 @@ upb_amalgamation(
         ":message_accessors",
         ":message_compare",
         ":message_copy",
-        ":message_tagged_ptr",
-        ":message_types",
-        ":message_value",
         ":mini_descriptor",
         ":mini_descriptor_internal",
         ":mini_table",
@@ -431,6 +409,7 @@ upb_amalgamation(
         ":wire",
         ":wire_reader",
         "//upb/mem:internal",
+        "//upb/message:internal",
         "//upb/mini_table:internal",
     ],
     prefix = "php-",
@@ -467,9 +446,6 @@ upb_amalgamation(
         ":message_accessors",
         ":message_compare",
         ":message_copy",
-        ":message_tagged_ptr",
-        ":message_types",
-        ":message_value",
         ":mini_descriptor",
         ":mini_descriptor_internal",
         ":mini_table",
@@ -480,6 +456,7 @@ upb_amalgamation(
         ":wire",
         ":wire_reader",
         "//upb/mem:internal",
+        "//upb/message:internal",
         "//upb/mini_table:internal",
     ],
     prefix = "ruby-",

upb/json/BUILD

@@ -24,7 +24,6 @@ cc_library(
         "//upb:lex",
         "//upb:mem",
         "//upb:message",
-        "//upb:message_types",
         "//upb:mini_table",
         "//upb:port",
         "//upb:reflection",
@@ -101,7 +100,6 @@ upb_c_proto_library(
 #         "//upb:base",
 #         "//upb:mem",
 #         "//upb:message",
-#         "//upb:message_types",
 #         "//upb:mini_table",
 #         "//upb:reflection",
 #     ],

upb/json/decode.c

@@ -28,7 +28,6 @@
 #include "upb/message/array.h"
 #include "upb/message/map.h"
 #include "upb/message/message.h"
-#include "upb/message/types.h"
 #include "upb/mini_table/message.h"
 #include "upb/reflection/def.h"
 #include "upb/reflection/message.h"