From f669ef6576da64e1f5e9af4f4a625b175d7e2f61 Mon Sep 17 00:00:00 2001 From: Eric Salo Date: Tue, 15 Aug 2023 09:57:55 -0700 Subject: [PATCH] upb: clean up upb/message/internal/ PiperOrigin-RevId: 557164806 --- BUILD | 6 +++--- protos/protos.cc | 2 +- protos/protos.h | 2 +- upb/collections/internal/map_sorter.h | 2 +- upb/generated_code_support.h | 4 ++-- upb/message/accessors.h | 2 +- upb/message/copy.c | 2 +- upb/message/copy.h | 2 +- upb/message/copy_test.cc | 2 +- upb/message/internal/accessors.h | 4 ++-- upb/message/{extension_internal.h => internal/extension.h} | 6 +++--- upb/message/internal/map_entry.h | 2 +- upb/message/{internal.h => internal/message.h} | 2 +- upb/message/message.c | 2 +- upb/message/promote.h | 2 +- upb/wire/encode.c | 2 +- upb/wire/internal/decode.h | 2 +- 17 files changed, 23 insertions(+), 23 deletions(-) rename upb/message/{extension_internal.h => internal/extension.h} (96%) rename upb/message/{internal.h => internal/message.h} (99%) diff --git a/BUILD b/BUILD index c47a3e796a..91e9c9ef67 100644 --- a/BUILD +++ b/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, diff --git a/protos/protos.cc b/protos/protos.cc index f7403d654c..34fb2328e9 100644 --- a/protos/protos.cc +++ b/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" diff --git a/protos/protos.h b/protos/protos.h index ef6a7c092e..bb814ecc8f 100644 --- a/protos/protos.h +++ b/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" diff --git a/upb/collections/internal/map_sorter.h b/upb/collections/internal/map_sorter.h index 8b9fcc9002..fdc46f1362 100644 --- a/upb/collections/internal/map_sorter.h +++ b/upb/collections/internal/map_sorter.h @@ -36,7 +36,7 @@ #include #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. diff --git a/upb/generated_code_support.h b/upb/generated_code_support.h index f482847cbe..d589640e3b 100644 --- a/upb/generated_code_support.h +++ b/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" diff --git a/upb/message/accessors.h b/upb/message/accessors.h index f5627d82c4..0305977fb5 100644 --- a/upb/message/accessors.h +++ b/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" diff --git a/upb/message/copy.c b/upb/message/copy.c index eab1710619..23989e1038 100644 --- a/upb/message/copy.c +++ b/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" diff --git a/upb/message/copy.h b/upb/message/copy.h index b1a23a5eaa..dea292d60a 100644 --- a/upb/message/copy.h +++ b/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" diff --git a/upb/message/copy_test.cc b/upb/message/copy_test.cc index a555c5e3a5..ff3a6f0c7d 100644 --- a/upb/message/copy_test.cc +++ b/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" diff --git a/upb/message/internal/accessors.h b/upb/message/internal/accessors.h index 2490cd8475..917fa50a3d 100644 --- a/upb/message/internal/accessors.h +++ b/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. diff --git a/upb/message/extension_internal.h b/upb/message/internal/extension.h similarity index 96% rename from upb/message/extension_internal.h rename to upb/message/internal/extension.h index 7cd055bcfd..01329c1a7f 100644 --- a/upb/message/extension_internal.h +++ b/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_ */ diff --git a/upb/message/internal/map_entry.h b/upb/message/internal/map_entry.h index 00b0867dcf..b7d60143fa 100644 --- a/upb/message/internal/map_entry.h +++ b/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; diff --git a/upb/message/internal.h b/upb/message/internal/message.h similarity index 99% rename from upb/message/internal.h rename to upb/message/internal/message.h index 06ec76f2ce..f7e7f39ef3 100644 --- a/upb/message/internal.h +++ b/upb/message/internal/message.h @@ -42,7 +42,7 @@ #include #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" diff --git a/upb/message/message.c b/upb/message/message.c index ac0368657c..30a16dcfd2 100644 --- a/upb/message/message.c +++ b/upb/message/message.c @@ -33,7 +33,7 @@ #include #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" diff --git a/upb/message/promote.h b/upb/message/promote.h index 17dbf6eeff..48737eeaf7 100644 --- a/upb/message/promote.h +++ b/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. diff --git a/upb/wire/encode.c b/upb/wire/encode.c index a9bdd2000d..b87d9cc5eb 100644 --- a/upb/wire/encode.c +++ b/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" diff --git a/upb/wire/internal/decode.h b/upb/wire/internal/decode.h index 5ef90f7d34..aa3d1b3304 100644 --- a/upb/wire/internal/decode.h +++ b/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"