upb: merge upb:message_accessors into upb:message

PiperOrigin-RevId: 595137531

protos/BUILD

@@ -55,7 +55,6 @@ cc_library(
         "//upb:base",
         "//upb:mem",
         "//upb:message",
-        "//upb:message_accessors",
         "//upb:message_copy",
         "//upb:message_promote",
         "//upb:mini_table",

upb/BUILD

@@ -111,7 +111,6 @@ cc_library(
         ":base",
         ":mem",
         ":message",
-        ":message_accessors",
         ":mini_descriptor",
         ":mini_table",
         ":wire",
@@ -187,12 +186,6 @@ alias(
     visibility = ["//visibility:public"],
 )
 
-alias(
-    name = "message_accessors",
-    actual = "//upb/message:accessors",
-    visibility = ["//visibility:public"],
-)
-
 alias(
     name = "message_compare",
     actual = "//upb/message:compare",
@@ -289,7 +282,6 @@ cc_binary(
     deps = [
         ":mem",
         ":message",
-        ":message_accessors",
         ":message_compare",
         ":message_split64",
         ":mini_descriptor",
@@ -317,7 +309,6 @@ upb_amalgamation(
         ":generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
         ":mem",
         ":message",
-        ":message_accessors",
         ":message_compare",
         ":message_copy",
         ":mini_descriptor",
@@ -363,7 +354,6 @@ upb_amalgamation(
         ":json",
         ":mem",
         ":message",
-        ":message_accessors",
         ":message_compare",
         ":message_copy",
         ":mini_descriptor",
@@ -410,7 +400,6 @@ upb_amalgamation(
         ":json",
         ":mem",
         ":message",
-        ":message_accessors",
         ":message_compare",
         ":message_copy",
         ":mini_descriptor",

upb/message/BUILD

@@ -19,6 +19,7 @@ load(
 cc_library(
     name = "message",
     srcs = [
+        "accessors.c",
         "array.c",
         "compat.c",
         "map.c",
@@ -26,6 +27,7 @@ cc_library(
         "message.c",
     ],
     hdrs = [
+        "accessors.h",
         "array.h",
         "compat.h",
         "map.h",
@@ -76,26 +78,6 @@ cc_library(
     ],
 )
 
-cc_library(
-    name = "accessors",
-    srcs = [
-        "accessors.c",
-    ],
-    hdrs = [
-        "accessors.h",
-    ],
-    copts = UPB_DEFAULT_COPTS,
-    visibility = ["//visibility:public"],
-    deps = [
-        ":internal",
-        ":message",
-        "//upb:base",
-        "//upb:mem",
-        "//upb:mini_table",
-        "//upb:port",
-    ],
-)
-
 cc_library(
     name = "compare",
     srcs = [
@@ -126,7 +108,6 @@ cc_library(
     copts = UPB_DEFAULT_COPTS,
     visibility = ["//visibility:public"],
     deps = [
-        ":accessors",
         ":internal",
         ":message",
         "//upb:base",
@@ -149,7 +130,6 @@ cc_library(
     copts = UPB_DEFAULT_COPTS,
     visibility = ["//visibility:public"],
     deps = [
-        ":accessors",
         ":internal",
         ":message",
         "//upb:base",
@@ -171,7 +151,6 @@ cc_library(
     copts = UPB_DEFAULT_COPTS,
     visibility = ["//visibility:public"],
     deps = [
-        ":accessors",
         ":message",
         "//upb:port",
     ],
@@ -206,7 +185,6 @@ cc_test(
     name = "accessors_test",
     srcs = ["accessors_test.cc"],
     deps = [
-        ":accessors",
         ":message",
         "//:protobuf",
         "//upb:base",
@@ -243,7 +221,6 @@ cc_test(
     name = "copy_test",
     srcs = ["copy_test.cc"],
     deps = [
-        ":accessors",
         ":copy",
         ":internal",
         ":message",
@@ -278,7 +255,6 @@ cc_test(
     name = "promote_test",
     srcs = ["promote_test.cc"],
     deps = [
-        ":accessors",
         ":copy",
         ":internal",
         ":message",

upb/mini_descriptor/BUILD

@@ -62,7 +62,7 @@ cc_test(
         "//:protobuf",
         "//upb:base",
         "//upb:mem",
-        "//upb:message_accessors",
+        "//upb:message",
         "//upb:mini_table",
         "//upb:port",
         "//upb:wire",

upb/reflection/BUILD

@@ -135,7 +135,6 @@ bootstrap_cc_library(
         "//upb:base",
         "//upb:mem",
         "//upb:message",
-        "//upb:message_accessors",
         "//upb:message_copy",
         "//upb:mini_descriptor",
         "//upb:mini_table",

upb/wire/BUILD

@@ -30,7 +30,6 @@ cc_library(
         "//upb:base",
         "//upb:mem",
         "//upb:message",
-        "//upb:message_accessors",
         "//upb:mini_table",
         "//upb:port",
         "//upb/base:internal",