upb: delete mini_table/types.h

PiperOrigin-RevId: 593893551
protocolbuffers · Dec 27, 2023 · d7f6031 · d7f6031
1 parent c4a7b03
commit d7f6031
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 31 deletions.
diff --git a/upb/mini_descriptor/decode.h b/upb/mini_descriptor/decode.h
@@ -10,6 +10,7 @@
 
 #include "upb/base/status.h"
 #include "upb/mem/arena.h"
+#include "upb/mini_table/extension.h"
 #include "upb/mini_table/sub.h"
 
 // Export the newer headers, for legacy users.  New users should include the

diff --git a/upb/mini_descriptor/link.h b/upb/mini_descriptor/link.h
@@ -18,7 +18,10 @@
 
 #include "upb/base/status.h"
 #include "upb/mem/arena.h"
-#include "upb/mini_table/types.h"
+#include "upb/mini_table/enum.h"
+#include "upb/mini_table/field.h"
+#include "upb/mini_table/message.h"
+#include "upb/mini_table/sub.h"
 
 // Must be last.
 #include "upb/port/def.inc"

diff --git a/upb/mini_table/BUILD b/upb/mini_table/BUILD
@@ -24,7 +24,6 @@ cc_library(
         "file.h",
         "message.h",
         "sub.h",
-        "types.h",
     ],
     copts = UPB_DEFAULT_COPTS,
     visibility = ["//visibility:public"],
@@ -55,7 +54,6 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         "//upb:base",
-        "//upb:hash",
         "//upb:mem",
         "//upb:port",
     ],

diff --git a/upb/mini_table/enum.h b/upb/mini_table/enum.h
@@ -8,10 +8,11 @@
 #ifndef UPB_MINI_TABLE_ENUM_H_
 #define UPB_MINI_TABLE_ENUM_H_
 
+typedef struct upb_MiniTableEnum upb_MiniTableEnum;
+
 #include <stdint.h>
 
 #include "upb/mini_table/internal/enum.h"
-#include "upb/mini_table/types.h"  // IWYU pragma: export
 
 // Must be last
 #include "upb/port/def.inc"

diff --git a/upb/mini_table/extension.h b/upb/mini_table/extension.h
@@ -8,10 +8,12 @@
 #ifndef UPB_MINI_TABLE_EXTENSION_H_
 #define UPB_MINI_TABLE_EXTENSION_H_
 
+typedef struct upb_MiniTableExtension upb_MiniTableExtension;
+
 #include <stdint.h>
 
 #include "upb/mini_table/internal/extension.h"
-#include "upb/mini_table/types.h"  // IWYU pragma: export
+#include "upb/mini_table/message.h"
 
 // Must be last.
 #include "upb/port/def.inc"

diff --git a/upb/mini_table/field.h b/upb/mini_table/field.h
@@ -8,11 +8,12 @@
 #ifndef UPB_MINI_TABLE_FIELD_H_
 #define UPB_MINI_TABLE_FIELD_H_
 
+typedef struct upb_MiniTableField upb_MiniTableField;
+
 #include <stdint.h>
 
 #include "upb/base/descriptor_constants.h"
 #include "upb/mini_table/internal/field.h"
-#include "upb/mini_table/types.h"  // IWYU pragma: export
 
 // Must be last.
 #include "upb/port/def.inc"

diff --git a/upb/mini_table/file.h b/upb/mini_table/file.h
@@ -8,8 +8,11 @@
 #ifndef UPB_MINI_TABLE_FILE_H_
 #define UPB_MINI_TABLE_FILE_H_
 
+typedef struct upb_MiniTableFile upb_MiniTableFile;
+
+#include "upb/mini_table/extension.h"
 #include "upb/mini_table/internal/file.h"
-#include "upb/mini_table/types.h"  // IWYU pragma: export
+#include "upb/mini_table/message.h"
 
 // Must be last.
 #include "upb/port/def.inc"

diff --git a/upb/mini_table/message.h b/upb/mini_table/message.h
@@ -8,8 +8,11 @@
 #ifndef UPB_MINI_TABLE_MESSAGE_H_
 #define UPB_MINI_TABLE_MESSAGE_H_
 
+typedef struct upb_MiniTable upb_MiniTable;
+
+#include "upb/mini_table/enum.h"
+#include "upb/mini_table/field.h"
 #include "upb/mini_table/internal/message.h"
-#include "upb/mini_table/types.h"  // IWYU pragma: export
 
 // Must be last.
 #include "upb/port/def.inc"

diff --git a/upb/mini_table/sub.h b/upb/mini_table/sub.h
@@ -8,8 +8,11 @@
 #ifndef UPB_MINI_TABLE_SUB_H_
 #define UPB_MINI_TABLE_SUB_H_
 
+typedef union upb_MiniTableSub upb_MiniTableSub;
+
+#include "upb/mini_table/enum.h"
 #include "upb/mini_table/internal/sub.h"
-#include "upb/mini_table/types.h"  // IWYU pragma: export
+#include "upb/mini_table/message.h"
 
 // Must be last.
 #include "upb/port/def.inc"

diff --git a/upb/mini_table/types.h b/upb/mini_table/types.h
diff --git a/upb/test/fuzz_util.h b/upb/test/fuzz_util.h
@@ -11,8 +11,9 @@
 #include <string>
 #include <vector>
 
+#include "upb/mem/arena.h"
 #include "upb/mini_table/extension_registry.h"
-// #include "upb/mini_table/types.h"
+#include "upb/mini_table/message.h"
 
 namespace upb {
 namespace fuzz {