commit 07fba1da074320b21b3fbd027f1db346b435b065
author Eric Salo <salo@google.com> Fri Sep 29 14:50:56 2023 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Sep 29 14:53:28 2023 -0700
tree eef0710804915038a57f2d6442ba9c7cdc154745
parent e42c1780a01aa8325bf3c481f9942e3397b589a4

upb: merge ":collections" into ":message"

PiperOrigin-RevId: 569594353

python/BUILD

diff --git a/python/BUILD b/python/BUILD
index 6d8ba1c..92e9c49 100644
--- a/python/BUILD
+++ b/python/BUILD
@@ -190,10 +190,10 @@
     ],
     target_compatible_with = select(_message_target_compatible_with),
     deps = [
-        "//upb:collections",
         "//upb:descriptor_upb_proto_reflection",
         "//upb:eps_copy_input_stream",
         "//upb:hash",
+        "//upb:message",
         "//upb:message_copy",
         "//upb:port",
         "//upb:reflection",

python/convert.c

diff --git a/python/convert.c b/python/convert.c
index 98d9b75..413c42f 100644
--- a/python/convert.c
+++ b/python/convert.c
@@ -32,7 +32,7 @@
 
 #include "python/message.h"
 #include "python/protobuf.h"
-#include "upb/collections/map.h"
+#include "upb/message/map.h"
 #include "upb/reflection/message.h"
 #include "upb/util/compare.h"
 

python/map.c

diff --git a/python/map.c b/python/map.c
index bd9022d..a1d75de 100644
--- a/python/map.c
+++ b/python/map.c
@@ -33,7 +33,7 @@
 #include "python/convert.h"
 #include "python/message.h"
 #include "python/protobuf.h"
-#include "upb/collections/map.h"
+#include "upb/message/map.h"
 #include "upb/reflection/def.h"
 
 // -----------------------------------------------------------------------------