commit e56a9099f0dad5980d1990dc6a164402abaa470c
author Eric Salo <salo@google.com> Mon Oct 30 09:39:19 2023 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Oct 30 09:43:59 2023 -0700
tree dae642176ecd0ec3732bd7310ad03009d84a1d60
parent 6a16ab614704967b80f91b0c2b0fa886c55116e7

upb: minimize uses of :message_types

PiperOrigin-RevId: 577872176

upb/mini_table/BUILD

diff --git a/upb/mini_table/BUILD b/upb/mini_table/BUILD
index ecf2bbb..f4b2ffe 100644
--- a/upb/mini_table/BUILD
+++ b/upb/mini_table/BUILD
@@ -51,7 +51,6 @@
         "//upb:base",
         "//upb:hash",
         "//upb:mem",
-        "//upb:message_types",
         "//upb:port",
     ],
 )

upb/reflection/BUILD

diff --git a/upb/reflection/BUILD b/upb/reflection/BUILD
index 0e92276..bf0c0e4 100644
--- a/upb/reflection/BUILD
+++ b/upb/reflection/BUILD
@@ -55,7 +55,6 @@
         "//upb:base",
         "//upb:mem",
         "//upb:message",
-        "//upb:message_types",
         "//upb:message_value",
         "//upb:port",
     ],
@@ -126,7 +125,6 @@
         "//upb:mem",
         "//upb:message",
         "//upb:message_accessors",
-        "//upb:message_types",
         "//upb:message_value",
         "//upb:mini_descriptor",
         "//upb:mini_descriptor_internal",

upb/reflection/message.h

diff --git a/upb/reflection/message.h b/upb/reflection/message.h
index 9e57c1a..54af6f1 100644
--- a/upb/reflection/message.h
+++ b/upb/reflection/message.h
@@ -12,7 +12,7 @@
 
 #include "upb/mem/arena.h"
 #include "upb/message/map.h"
-#include "upb/message/types.h"
+#include "upb/message/message.h"
 #include "upb/message/value.h"  // IWYU pragma: export
 #include "upb/reflection/common.h"
 

upb/util/BUILD

diff --git a/upb/util/BUILD b/upb/util/BUILD
index f15f351..f354be1 100644
--- a/upb/util/BUILD
+++ b/upb/util/BUILD
@@ -99,7 +99,6 @@
     deps = [
         "//upb:base",
         "//upb:message",
-        "//upb:message_types",
         "//upb:port",
         "//upb:reflection",
     ],

upb/util/required_fields.c

diff --git a/upb/util/required_fields.c b/upb/util/required_fields.c
index 4e66cdd..c6616ec 100644
--- a/upb/util/required_fields.c
+++ b/upb/util/required_fields.c
@@ -19,7 +19,7 @@
 #include "upb/base/descriptor_constants.h"
 #include "upb/message/array.h"
 #include "upb/message/map.h"
-#include "upb/message/types.h"
+#include "upb/message/message.h"
 #include "upb/port/vsnprintf_compat.h"
 #include "upb/reflection/def.h"
 #include "upb/reflection/message.h"