upb: delete mini_table/types.h

PiperOrigin-RevId: 594089137

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

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"

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",
     ],

upb/mini_table/enum.h

@@ -11,11 +11,12 @@
 #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"
 
+typedef struct upb_MiniTableEnum upb_MiniTableEnum;
+
 #ifdef __cplusplus
 extern "C" {
 #endif

upb/mini_table/extension.h

@@ -10,12 +10,15 @@
 
 #include <stdint.h>
 
+#include "upb/mini_table/field.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"
 
+typedef struct upb_MiniTableExtension upb_MiniTableExtension;
+
 #ifdef __cplusplus
 extern "C" {
 #endif

upb/mini_table/field.h

@@ -12,11 +12,12 @@
 
 #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"
 
+typedef struct upb_MiniTableField upb_MiniTableField;
+
 #ifdef __cplusplus
 extern "C" {
 #endif

upb/mini_table/file.h

@@ -8,12 +8,16 @@
 #ifndef UPB_MINI_TABLE_FILE_H_
 #define UPB_MINI_TABLE_FILE_H_
 
+#include "upb/mini_table/enum.h"
+#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"
 
+typedef struct upb_MiniTableFile upb_MiniTableFile;
+
 #ifdef __cplusplus
 extern "C" {
 #endif

upb/mini_table/message.h

@@ -8,12 +8,15 @@
 #ifndef UPB_MINI_TABLE_MESSAGE_H_
 #define UPB_MINI_TABLE_MESSAGE_H_
 
+#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"
 
+typedef struct upb_MiniTable upb_MiniTable;
+
 #ifdef __cplusplus
 extern "C" {
 #endif

upb/mini_table/sub.h

@@ -8,12 +8,15 @@
 #ifndef UPB_MINI_TABLE_SUB_H_
 #define UPB_MINI_TABLE_SUB_H_
 
+#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"
 
+typedef union upb_MiniTableSub upb_MiniTableSub;
+
 #ifdef __cplusplus
 extern "C" {
 #endif

upb/mini_table/types.h

@@ -1,21 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2023 Google LLC.  All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file or at
-// https://developers.google.com/open-source/licenses/bsd
-
-#ifndef UPB_MINI_TABLE_TYPES_H_
-#define UPB_MINI_TABLE_TYPES_H_
-
-// Minitable types are recursively defined so declare them all together here.
-
-typedef struct upb_MiniTable upb_MiniTable;
-typedef struct upb_MiniTableEnum upb_MiniTableEnum;
-typedef struct upb_MiniTableExtension upb_MiniTableExtension;
-typedef struct upb_MiniTableField upb_MiniTableField;
-typedef struct upb_MiniTableFile upb_MiniTableFile;
-
-typedef union upb_MiniTableSub upb_MiniTableSub;
-
-#endif /* UPB_MINI_TABLE_TYPES_H_ */

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 {