upb: clean up upb/message/internal/

PiperOrigin-RevId: 557164806

BUILD

@@ -123,7 +123,7 @@ cc_library(
 cc_library(
     name = "upb",
     hdrs = [
-        "upb/message/extension_internal.h",
+        "upb/message/internal/extension.h",
         "upb/message/message.h",
         "upb/upb.h",
         "upb/upb.hpp",
@@ -162,8 +162,8 @@ cc_library(
         "upb/message/message.c",
     ],
     hdrs = [
-        "upb/message/extension_internal.h",
-        "upb/message/internal.h",
+        "upb/message/internal/extension.h",
+        "upb/message/internal/message.h",
         "upb/message/message.h",
     ],
     copts = UPB_DEFAULT_COPTS,

protos/protos.cc

@@ -40,7 +40,7 @@
 #include "protos/protos_extension_lock.h"
 #include "upb/mem/arena.h"
 #include "upb/message/copy.h"
-#include "upb/message/extension_internal.h"
+#include "upb/message/internal/extension.h"
 #include "upb/message/promote.h"
 #include "upb/message/typedef.h"
 #include "upb/mini_table/extension.h"

protos/protos.h

@@ -38,7 +38,7 @@
 #include "absl/status/statusor.h"
 #include "upb/mem/arena.h"
 #include "upb/message/copy.h"
-#include "upb/message/extension_internal.h"
+#include "upb/message/internal/extension.h"
 #include "upb/upb.hpp"
 #include "upb/wire/decode.h"
 #include "upb/wire/encode.h"

upb/collections/internal/map_sorter.h

@@ -36,7 +36,7 @@
 #include <stdlib.h>
 
 #include "upb/collections/internal/map.h"
-#include "upb/message/extension_internal.h"
+#include "upb/message/internal/extension.h"
 #include "upb/message/internal/map_entry.h"
 
 // Must be last.

upb/generated_code_support.h

@@ -37,9 +37,9 @@
 #include "upb/collections/map_gencode_util.h"
 #include "upb/collections/message_value.h"
 #include "upb/message/accessors.h"
-#include "upb/message/extension_internal.h"
-#include "upb/message/internal.h"
 #include "upb/message/internal/accessors.h"
+#include "upb/message/internal/extension.h"
+#include "upb/message/internal/message.h"
 #include "upb/message/message.h"
 #include "upb/mini_descriptor/decode.h"
 #include "upb/mini_table/enum.h"

upb/message/accessors.h

@@ -36,8 +36,8 @@
 #include "upb/collections/internal/array.h"
 #include "upb/collections/internal/map.h"
 #include "upb/collections/map.h"
-#include "upb/message/internal.h"
 #include "upb/message/internal/accessors.h"
+#include "upb/message/internal/message.h"
 #include "upb/mini_table/enum.h"
 #include "upb/mini_table/field.h"
 

upb/message/copy.c

@@ -37,7 +37,7 @@
 #include "upb/base/string_view.h"
 #include "upb/mem/arena.h"
 #include "upb/message/accessors.h"
-#include "upb/message/internal.h"
+#include "upb/message/internal/message.h"
 #include "upb/message/message.h"
 #include "upb/message/typedef.h"
 #include "upb/mini_table/field.h"

upb/message/copy.h

@@ -32,7 +32,7 @@
 #define UPB_MESSAGE_COPY_H_
 
 #include "upb/collections/message_value.h"
-#include "upb/message/internal.h"
+#include "upb/message/internal/message.h"
 
 // Must be last.
 #include "upb/port/def.inc"

upb/message/copy_test.cc

@@ -48,7 +48,7 @@
 #include "upb/collections/map.h"
 #include "upb/mem/arena.h"
 #include "upb/message/accessors.h"
-#include "upb/message/internal.h"
+#include "upb/message/internal/message.h"
 #include "upb/message/message.h"
 #include "upb/mini_table/message.h"
 #include "upb/wire/encode.h"

upb/message/internal/accessors.h

@@ -32,8 +32,8 @@
 #define UPB_MESSAGE_INTERNAL_ACCESSORS_H_
 
 #include "upb/collections/internal/map.h"
-#include "upb/message/extension_internal.h"
-#include "upb/message/internal.h"
+#include "upb/message/internal/extension.h"
+#include "upb/message/internal/message.h"
 #include "upb/mini_table/internal/field.h"
 
 // Must be last.

upb/message/internal/extension.h

@@ -28,8 +28,8 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#ifndef UPB_MESSAGE_EXTENSION_INTERNAL_H_
-#define UPB_MESSAGE_EXTENSION_INTERNAL_H_
+#ifndef UPB_MESSAGE_INTERNAL_EXTENSION_H_
+#define UPB_MESSAGE_INTERNAL_EXTENSION_H_
 
 #include "upb/base/descriptor_constants.h"
 #include "upb/base/string_view.h"
@@ -83,4 +83,4 @@ const upb_Message_Extension* _upb_Message_Getext(
 
 #include "upb/port/undef.inc"
 
-#endif /* UPB_MESSAGE_EXTENSION_INTERNAL_H_ */
+#endif /* UPB_MESSAGE_INTERNAL_EXTENSION_H_ */

upb/message/internal/map_entry.h

@@ -68,7 +68,7 @@ typedef struct {
     // require 8-byte alignment.
     double d;
   };
-  // LINT.ThenChange(//depot/google3/third_party/upb/upb/message/internal.h:internal_layout)
+  // LINT.ThenChange(//depot/google3/third_party/upb/upb/message/internal/message.h:internal_layout)
   upb_MapEntryData data;
 } upb_MapEntry;
 

upb/message/internal/message.h

@@ -42,7 +42,7 @@
 #include <string.h>
 
 #include "upb/hash/common.h"
-#include "upb/message/extension_internal.h"
+#include "upb/message/internal/extension.h"
 #include "upb/message/message.h"
 #include "upb/mini_table/extension.h"
 #include "upb/mini_table/extension_registry.h"

upb/message/message.c

@@ -33,7 +33,7 @@
 #include <math.h>
 
 #include "upb/base/internal/log2.h"
-#include "upb/message/internal.h"
+#include "upb/message/internal/message.h"
 
 // Must be last.
 #include "upb/port/def.inc"

upb/message/promote.h

@@ -32,7 +32,7 @@
 #define UPB_MESSAGE_PROMOTE_H_
 
 #include "upb/collections/array.h"
-#include "upb/message/extension_internal.h"
+#include "upb/message/internal/extension.h"
 #include "upb/wire/decode.h"
 
 // Must be last.

upb/wire/encode.c

@@ -36,8 +36,8 @@
 
 #include "upb/collections/internal/array.h"
 #include "upb/collections/internal/map_sorter.h"
-#include "upb/message/extension_internal.h"
 #include "upb/message/internal/accessors.h"
+#include "upb/message/internal/extension.h"
 #include "upb/mini_table/sub.h"
 #include "upb/wire/common.h"
 #include "upb/wire/internal/common.h"

upb/wire/internal/decode.h

@@ -37,7 +37,7 @@
 #define UPB_WIRE_INTERNAL_DECODE_H_
 
 #include "upb/mem/internal/arena.h"
-#include "upb/message/internal.h"
+#include "upb/message/internal/message.h"
 #include "upb/wire/decode.h"
 #include "upb/wire/eps_copy_input_stream.h"
 #include "utf8_range.h"