From ce026abf92d0862c645c449fa91c2138058d3e21 Mon Sep 17 00:00:00 2001 From: Sandy Zhang Date: Mon, 13 May 2024 08:46:41 -0700 Subject: [PATCH] Work around windows path length limitations by moving immutable -> full in open source (new generator paths) and shortening long file names. Re-enable windows bazel test. PiperOrigin-RevId: 633224191 --- .github/workflows/test_bazel.yml | 2 -- src/google/protobuf/compiler/java/BUILD.bazel | 2 +- src/google/protobuf/compiler/java/file.cc | 2 +- .../compiler/java/{immutable => full}/BUILD.bazel | 6 +++--- .../compiler/java/{immutable => full}/enum.cc | 2 +- .../compiler/java/{immutable => full}/enum.h | 0 .../compiler/java/{immutable => full}/enum_field.cc | 2 +- .../compiler/java/{immutable => full}/enum_field.h | 2 +- .../compiler/java/{immutable => full}/extension.cc | 2 +- .../compiler/java/{immutable => full}/extension.h | 0 .../java/{immutable => full}/field_generator.h | 0 .../java/{immutable => full}/generator_factory.cc | 8 ++++---- .../java/{immutable => full}/generator_factory.h | 0 .../make_field_gens.cc} | 12 ++++++------ .../make_field_gens.h} | 8 ++++---- .../compiler/java/{immutable => full}/map_field.cc | 2 +- .../compiler/java/{immutable => full}/map_field.h | 2 +- .../compiler/java/{immutable => full}/message.cc | 10 +++++----- .../compiler/java/{immutable => full}/message.h | 2 +- .../java/{immutable => full}/message_builder.cc | 10 +++++----- .../java/{immutable => full}/message_builder.h | 2 +- .../java/{immutable => full}/message_field.cc | 2 +- .../java/{immutable => full}/message_field.h | 2 +- .../java/{immutable => full}/primitive_field.cc | 2 +- .../java/{immutable => full}/primitive_field.h | 2 +- .../compiler/java/{immutable => full}/service.cc | 2 +- .../compiler/java/{immutable => full}/service.h | 0 .../java/{immutable => full}/string_field.cc | 2 +- .../compiler/java/{immutable => full}/string_field.h | 2 +- src/google/protobuf/compiler/java/lite/BUILD.bazel | 6 +++--- .../protobuf/compiler/java/lite/generator_factory.cc | 2 +- .../{make_field_generators.cc => make_field_gens.cc} | 2 +- .../{make_field_generators.h => make_field_gens.h} | 6 +++--- src/google/protobuf/compiler/java/lite/message.cc | 2 +- .../protobuf/compiler/java/lite/message_builder.cc | 2 +- src/google/protobuf/compiler/objectivec/BUILD.bazel | 4 ++-- src/google/protobuf/compiler/objectivec/enum.cc | 2 +- src/google/protobuf/compiler/objectivec/message.cc | 2 +- .../objectivec/text_format_decode_data_unittest.cc | 2 +- ...{text_format_decode_data.cc => tf_decode_data.cc} | 2 +- .../{text_format_decode_data.h => tf_decode_data.h} | 6 +++--- .../protobuf/compiler/rust/accessors/BUILD.bazel | 2 +- .../protobuf/compiler/rust/accessors/accessors.cc | 2 +- .../accessors/{accessor_generator.h => generator.h} | 0 src/google/protobuf/compiler/rust/accessors/map.cc | 2 +- .../compiler/rust/accessors/repeated_field.cc | 2 +- .../compiler/rust/accessors/singular_message.cc | 2 +- .../compiler/rust/accessors/singular_scalar.cc | 2 +- .../compiler/rust/accessors/singular_string.cc | 2 +- .../compiler/rust/accessors/unsupported_field.cc | 2 +- 50 files changed, 71 insertions(+), 73 deletions(-) rename src/google/protobuf/compiler/java/{immutable => full}/BUILD.bazel (97%) rename src/google/protobuf/compiler/java/{immutable => full}/enum.cc (99%) rename src/google/protobuf/compiler/java/{immutable => full}/enum.h (100%) rename src/google/protobuf/compiler/java/{immutable => full}/enum_field.cc (99%) rename src/google/protobuf/compiler/java/{immutable => full}/enum_field.h (98%) rename src/google/protobuf/compiler/java/{immutable => full}/extension.cc (98%) rename src/google/protobuf/compiler/java/{immutable => full}/extension.h (100%) rename src/google/protobuf/compiler/java/{immutable => full}/field_generator.h (100%) rename src/google/protobuf/compiler/java/{immutable => full}/generator_factory.cc (89%) rename src/google/protobuf/compiler/java/{immutable => full}/generator_factory.h (100%) rename src/google/protobuf/compiler/java/{immutable/make_field_generators.cc => full/make_field_gens.cc} (91%) rename src/google/protobuf/compiler/java/{immutable/make_field_generators.h => full/make_field_gens.h} (77%) rename src/google/protobuf/compiler/java/{immutable => full}/map_field.cc (99%) rename src/google/protobuf/compiler/java/{immutable => full}/map_field.h (97%) rename src/google/protobuf/compiler/java/{immutable => full}/message.cc (99%) rename src/google/protobuf/compiler/java/{immutable => full}/message.h (97%) rename src/google/protobuf/compiler/java/{immutable => full}/message_builder.cc (98%) rename src/google/protobuf/compiler/java/{immutable => full}/message_builder.h (97%) rename src/google/protobuf/compiler/java/{immutable => full}/message_field.cc (99%) rename src/google/protobuf/compiler/java/{immutable => full}/message_field.h (99%) rename src/google/protobuf/compiler/java/{immutable => full}/primitive_field.cc (99%) rename src/google/protobuf/compiler/java/{immutable => full}/primitive_field.h (98%) rename src/google/protobuf/compiler/java/{immutable => full}/service.cc (99%) rename src/google/protobuf/compiler/java/{immutable => full}/service.h (100%) rename src/google/protobuf/compiler/java/{immutable => full}/string_field.cc (99%) rename src/google/protobuf/compiler/java/{immutable => full}/string_field.h (98%) rename src/google/protobuf/compiler/java/lite/{make_field_generators.cc => make_field_gens.cc} (98%) rename src/google/protobuf/compiler/java/lite/{make_field_generators.h => make_field_gens.h} (80%) rename src/google/protobuf/compiler/objectivec/{text_format_decode_data.cc => tf_decode_data.cc} (98%) rename src/google/protobuf/compiler/objectivec/{text_format_decode_data.h => tf_decode_data.h} (88%) rename src/google/protobuf/compiler/rust/accessors/{accessor_generator.h => generator.h} (100%) diff --git a/.github/workflows/test_bazel.yml b/.github/workflows/test_bazel.yml index 8b6139c35a..3a488a1bb4 100644 --- a/.github/workflows/test_bazel.yml +++ b/.github/workflows/test_bazel.yml @@ -47,8 +47,6 @@ jobs: - name: Run tests uses: protocolbuffers/protobuf-ci/bazel@v3 - # TODO Silence this until we have a fix. - if: runner.os != 'Windows' || matrix.bzlmod with: credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }} bazel-cache: examples diff --git a/src/google/protobuf/compiler/java/BUILD.bazel b/src/google/protobuf/compiler/java/BUILD.bazel index ad25fecb27..40cd4a5fd8 100644 --- a/src/google/protobuf/compiler/java/BUILD.bazel +++ b/src/google/protobuf/compiler/java/BUILD.bazel @@ -128,7 +128,7 @@ cc_library( "//src/google/protobuf/compiler:code_generator", "//src/google/protobuf/compiler:retention", "//src/google/protobuf/compiler:versions", - "//src/google/protobuf/compiler/java/immutable", + "//src/google/protobuf/compiler/java/full", "//src/google/protobuf/compiler/java/lite", "//src/google/protobuf/io", "//src/google/protobuf/io:printer", diff --git a/src/google/protobuf/compiler/java/file.cc b/src/google/protobuf/compiler/java/file.cc index 2ce6e8978e..6995513bd1 100644 --- a/src/google/protobuf/compiler/java/file.cc +++ b/src/google/protobuf/compiler/java/file.cc @@ -25,7 +25,7 @@ #include "google/protobuf/compiler/java/generator_common.h" #include "google/protobuf/compiler/java/generator_factory.h" #include "google/protobuf/compiler/java/helpers.h" -#include "google/protobuf/compiler/java/immutable/generator_factory.h" +#include "google/protobuf/compiler/java/full/generator_factory.h" #include "google/protobuf/compiler/java/lite/generator_factory.h" #include "google/protobuf/compiler/java/name_resolver.h" #include "google/protobuf/compiler/java/options.h" diff --git a/src/google/protobuf/compiler/java/immutable/BUILD.bazel b/src/google/protobuf/compiler/java/full/BUILD.bazel similarity index 97% rename from src/google/protobuf/compiler/java/immutable/BUILD.bazel rename to src/google/protobuf/compiler/java/full/BUILD.bazel index 0f01091bcd..1a7f874326 100644 --- a/src/google/protobuf/compiler/java/immutable/BUILD.bazel +++ b/src/google/protobuf/compiler/java/full/BUILD.bazel @@ -46,8 +46,8 @@ cc_library( cc_library( name = "mfg", - srcs = ["make_field_generators.cc"], - hdrs = ["make_field_generators.h"], + srcs = ["make_field_gens.cc"], + hdrs = ["make_field_gens.h"], strip_include_prefix = "/src", deps = [ ":fg", @@ -94,7 +94,7 @@ cc_library( ) cc_library( - name = "immutable", + name = "full", srcs = [ "extension.cc", "generator_factory.cc", diff --git a/src/google/protobuf/compiler/java/immutable/enum.cc b/src/google/protobuf/compiler/java/full/enum.cc similarity index 99% rename from src/google/protobuf/compiler/java/immutable/enum.cc rename to src/google/protobuf/compiler/java/full/enum.cc index 9ceefcb1a8..c321c08f31 100644 --- a/src/google/protobuf/compiler/java/immutable/enum.cc +++ b/src/google/protobuf/compiler/java/full/enum.cc @@ -9,7 +9,7 @@ // Based on original Protocol Buffers design by // Sanjay Ghemawat, Jeff Dean, and others. -#include "google/protobuf/compiler/java/immutable/enum.h" +#include "google/protobuf/compiler/java/full/enum.h" #include #include diff --git a/src/google/protobuf/compiler/java/immutable/enum.h b/src/google/protobuf/compiler/java/full/enum.h similarity index 100% rename from src/google/protobuf/compiler/java/immutable/enum.h rename to src/google/protobuf/compiler/java/full/enum.h diff --git a/src/google/protobuf/compiler/java/immutable/enum_field.cc b/src/google/protobuf/compiler/java/full/enum_field.cc similarity index 99% rename from src/google/protobuf/compiler/java/immutable/enum_field.cc rename to src/google/protobuf/compiler/java/full/enum_field.cc index 71207a9d49..e0ea6eea65 100644 --- a/src/google/protobuf/compiler/java/immutable/enum_field.cc +++ b/src/google/protobuf/compiler/java/full/enum_field.cc @@ -9,7 +9,7 @@ // Based on original Protocol Buffers design by // Sanjay Ghemawat, Jeff Dean, and others. -#include "google/protobuf/compiler/java/immutable/enum_field.h" +#include "google/protobuf/compiler/java/full/enum_field.h" #include #include diff --git a/src/google/protobuf/compiler/java/immutable/enum_field.h b/src/google/protobuf/compiler/java/full/enum_field.h similarity index 98% rename from src/google/protobuf/compiler/java/immutable/enum_field.h rename to src/google/protobuf/compiler/java/full/enum_field.h index 625b7c21af..c238fad42c 100644 --- a/src/google/protobuf/compiler/java/immutable/enum_field.h +++ b/src/google/protobuf/compiler/java/full/enum_field.h @@ -15,7 +15,7 @@ #include #include "absl/container/flat_hash_map.h" -#include "google/protobuf/compiler/java/immutable/field_generator.h" +#include "google/protobuf/compiler/java/full/field_generator.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/io/printer.h" diff --git a/src/google/protobuf/compiler/java/immutable/extension.cc b/src/google/protobuf/compiler/java/full/extension.cc similarity index 98% rename from src/google/protobuf/compiler/java/immutable/extension.cc rename to src/google/protobuf/compiler/java/full/extension.cc index d731d82400..03fd9d8524 100644 --- a/src/google/protobuf/compiler/java/immutable/extension.cc +++ b/src/google/protobuf/compiler/java/full/extension.cc @@ -9,7 +9,7 @@ // Based on original Protocol Buffers design by // Sanjay Ghemawat, Jeff Dean, and others. -#include "google/protobuf/compiler/java/immutable/extension.h" +#include "google/protobuf/compiler/java/full/extension.h" #include "google/protobuf/compiler/java/context.h" #include "google/protobuf/compiler/java/doc_comment.h" diff --git a/src/google/protobuf/compiler/java/immutable/extension.h b/src/google/protobuf/compiler/java/full/extension.h similarity index 100% rename from src/google/protobuf/compiler/java/immutable/extension.h rename to src/google/protobuf/compiler/java/full/extension.h diff --git a/src/google/protobuf/compiler/java/immutable/field_generator.h b/src/google/protobuf/compiler/java/full/field_generator.h similarity index 100% rename from src/google/protobuf/compiler/java/immutable/field_generator.h rename to src/google/protobuf/compiler/java/full/field_generator.h diff --git a/src/google/protobuf/compiler/java/immutable/generator_factory.cc b/src/google/protobuf/compiler/java/full/generator_factory.cc similarity index 89% rename from src/google/protobuf/compiler/java/immutable/generator_factory.cc rename to src/google/protobuf/compiler/java/full/generator_factory.cc index f1b9989449..280987f345 100644 --- a/src/google/protobuf/compiler/java/immutable/generator_factory.cc +++ b/src/google/protobuf/compiler/java/full/generator_factory.cc @@ -12,10 +12,10 @@ #include #include "google/protobuf/compiler/java/context.h" -#include "google/protobuf/compiler/java/immutable/enum.h" -#include "google/protobuf/compiler/java/immutable/extension.h" -#include "google/protobuf/compiler/java/immutable/message.h" -#include "google/protobuf/compiler/java/immutable/service.h" +#include "google/protobuf/compiler/java/full/enum.h" +#include "google/protobuf/compiler/java/full/extension.h" +#include "google/protobuf/compiler/java/full/message.h" +#include "google/protobuf/compiler/java/full/service.h" #include "google/protobuf/descriptor.h" namespace google { diff --git a/src/google/protobuf/compiler/java/immutable/generator_factory.h b/src/google/protobuf/compiler/java/full/generator_factory.h similarity index 100% rename from src/google/protobuf/compiler/java/immutable/generator_factory.h rename to src/google/protobuf/compiler/java/full/generator_factory.h diff --git a/src/google/protobuf/compiler/java/immutable/make_field_generators.cc b/src/google/protobuf/compiler/java/full/make_field_gens.cc similarity index 91% rename from src/google/protobuf/compiler/java/immutable/make_field_generators.cc rename to src/google/protobuf/compiler/java/full/make_field_gens.cc index 7636c493bb..08400a68ec 100644 --- a/src/google/protobuf/compiler/java/immutable/make_field_generators.cc +++ b/src/google/protobuf/compiler/java/full/make_field_gens.cc @@ -15,12 +15,12 @@ #include "google/protobuf/compiler/java/context.h" #include "google/protobuf/compiler/java/generator_common.h" #include "google/protobuf/compiler/java/helpers.h" -#include "google/protobuf/compiler/java/immutable/enum_field.h" -#include "google/protobuf/compiler/java/immutable/field_generator.h" -#include "google/protobuf/compiler/java/immutable/map_field.h" -#include "google/protobuf/compiler/java/immutable/message_field.h" -#include "google/protobuf/compiler/java/immutable/primitive_field.h" -#include "google/protobuf/compiler/java/immutable/string_field.h" +#include "google/protobuf/compiler/java/full/enum_field.h" +#include "google/protobuf/compiler/java/full/field_generator.h" +#include "google/protobuf/compiler/java/full/map_field.h" +#include "google/protobuf/compiler/java/full/message_field.h" +#include "google/protobuf/compiler/java/full/primitive_field.h" +#include "google/protobuf/compiler/java/full/string_field.h" #include "google/protobuf/descriptor.h" namespace google { diff --git a/src/google/protobuf/compiler/java/immutable/make_field_generators.h b/src/google/protobuf/compiler/java/full/make_field_gens.h similarity index 77% rename from src/google/protobuf/compiler/java/immutable/make_field_generators.h rename to src/google/protobuf/compiler/java/full/make_field_gens.h index a5dab5dbec..0c02f97823 100644 --- a/src/google/protobuf/compiler/java/immutable/make_field_generators.h +++ b/src/google/protobuf/compiler/java/full/make_field_gens.h @@ -5,12 +5,12 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_IMMUTABLE_MAKE_FIELD_GENERATORS_H__ -#define GOOGLE_PROTOBUF_COMPILER_JAVA_IMMUTABLE_MAKE_FIELD_GENERATORS_H__ +#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_IMMUTABLE_MAKE_FIELD_GENS_H__ +#define GOOGLE_PROTOBUF_COMPILER_JAVA_IMMUTABLE_MAKE_FIELD_GENS_H__ #include "google/protobuf/compiler/java/context.h" #include "google/protobuf/compiler/java/generator_common.h" -#include "google/protobuf/compiler/java/immutable/field_generator.h" +#include "google/protobuf/compiler/java/full/field_generator.h" #include "google/protobuf/descriptor.h" namespace google { @@ -26,4 +26,4 @@ FieldGeneratorMap MakeImmutableFieldGenerators( } // namespace protobuf } // namespace google -#endif // GOOGLE_PROTOBUF_COMPILER_JAVA_IMMUTABLE_MAKE_FIELD_GENERATORS_H__ +#endif // GOOGLE_PROTOBUF_COMPILER_JAVA_IMMUTABLE_MAKE_FIELD_GENS_H__ diff --git a/src/google/protobuf/compiler/java/immutable/map_field.cc b/src/google/protobuf/compiler/java/full/map_field.cc similarity index 99% rename from src/google/protobuf/compiler/java/immutable/map_field.cc rename to src/google/protobuf/compiler/java/full/map_field.cc index 1281862958..be36f7dc16 100644 --- a/src/google/protobuf/compiler/java/immutable/map_field.cc +++ b/src/google/protobuf/compiler/java/full/map_field.cc @@ -5,7 +5,7 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "google/protobuf/compiler/java/immutable/map_field.h" +#include "google/protobuf/compiler/java/full/map_field.h" #include diff --git a/src/google/protobuf/compiler/java/immutable/map_field.h b/src/google/protobuf/compiler/java/full/map_field.h similarity index 97% rename from src/google/protobuf/compiler/java/immutable/map_field.h rename to src/google/protobuf/compiler/java/full/map_field.h index 72613f8659..c41205c4cb 100644 --- a/src/google/protobuf/compiler/java/immutable/map_field.h +++ b/src/google/protobuf/compiler/java/full/map_field.h @@ -9,7 +9,7 @@ #define GOOGLE_PROTOBUF_COMPILER_JAVA_MAP_FIELD_H__ #include "google/protobuf/compiler/java/context.h" -#include "google/protobuf/compiler/java/immutable/field_generator.h" +#include "google/protobuf/compiler/java/full/field_generator.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/io/printer.h" diff --git a/src/google/protobuf/compiler/java/immutable/message.cc b/src/google/protobuf/compiler/java/full/message.cc similarity index 99% rename from src/google/protobuf/compiler/java/immutable/message.cc rename to src/google/protobuf/compiler/java/full/message.cc index 0d75c69efb..10abbb90e8 100644 --- a/src/google/protobuf/compiler/java/immutable/message.cc +++ b/src/google/protobuf/compiler/java/full/message.cc @@ -9,7 +9,7 @@ // Based on original Protocol Buffers design by // Sanjay Ghemawat, Jeff Dean, and others. -#include "google/protobuf/compiler/java/immutable/message.h" +#include "google/protobuf/compiler/java/full/message.h" #include #include @@ -28,10 +28,10 @@ #include "google/protobuf/compiler/java/field_common.h" #include "google/protobuf/compiler/java/generator_common.h" #include "google/protobuf/compiler/java/helpers.h" -#include "google/protobuf/compiler/java/immutable/enum.h" -#include "google/protobuf/compiler/java/immutable/extension.h" -#include "google/protobuf/compiler/java/immutable/make_field_generators.h" -#include "google/protobuf/compiler/java/immutable/message_builder.h" +#include "google/protobuf/compiler/java/full/enum.h" +#include "google/protobuf/compiler/java/full/extension.h" +#include "google/protobuf/compiler/java/full/make_field_gens.h" +#include "google/protobuf/compiler/java/full/message_builder.h" #include "google/protobuf/compiler/java/message_serialization.h" #include "google/protobuf/compiler/java/name_resolver.h" #include "google/protobuf/descriptor.h" diff --git a/src/google/protobuf/compiler/java/immutable/message.h b/src/google/protobuf/compiler/java/full/message.h similarity index 97% rename from src/google/protobuf/compiler/java/immutable/message.h rename to src/google/protobuf/compiler/java/full/message.h index 268f191fcd..3b929b8d3f 100644 --- a/src/google/protobuf/compiler/java/immutable/message.h +++ b/src/google/protobuf/compiler/java/full/message.h @@ -17,7 +17,7 @@ #include #include "google/protobuf/compiler/java/generator_factory.h" -#include "google/protobuf/compiler/java/immutable/field_generator.h" +#include "google/protobuf/compiler/java/full/field_generator.h" #include "google/protobuf/descriptor.h" namespace google { diff --git a/src/google/protobuf/compiler/java/immutable/message_builder.cc b/src/google/protobuf/compiler/java/full/message_builder.cc similarity index 98% rename from src/google/protobuf/compiler/java/immutable/message_builder.cc rename to src/google/protobuf/compiler/java/full/message_builder.cc index 3bc0900c16..53de5d3246 100644 --- a/src/google/protobuf/compiler/java/immutable/message_builder.cc +++ b/src/google/protobuf/compiler/java/full/message_builder.cc @@ -9,7 +9,7 @@ // Based on original Protocol Buffers design by // Sanjay Ghemawat, Jeff Dean, and others. -#include "google/protobuf/compiler/java/immutable/message_builder.h" +#include "google/protobuf/compiler/java/full/message_builder.h" #include #include @@ -27,10 +27,10 @@ #include "google/protobuf/compiler/java/field_common.h" #include "google/protobuf/compiler/java/generator_factory.h" #include "google/protobuf/compiler/java/helpers.h" -#include "google/protobuf/compiler/java/immutable/enum.h" -#include "google/protobuf/compiler/java/immutable/extension.h" -#include "google/protobuf/compiler/java/immutable/field_generator.h" -#include "google/protobuf/compiler/java/immutable/make_field_generators.h" +#include "google/protobuf/compiler/java/full/enum.h" +#include "google/protobuf/compiler/java/full/extension.h" +#include "google/protobuf/compiler/java/full/field_generator.h" +#include "google/protobuf/compiler/java/full/make_field_gens.h" #include "google/protobuf/compiler/java/name_resolver.h" #include "google/protobuf/descriptor.pb.h" #include "google/protobuf/io/printer.h" diff --git a/src/google/protobuf/compiler/java/immutable/message_builder.h b/src/google/protobuf/compiler/java/full/message_builder.h similarity index 97% rename from src/google/protobuf/compiler/java/immutable/message_builder.h rename to src/google/protobuf/compiler/java/full/message_builder.h index ad2b378721..f63f8f4b0a 100644 --- a/src/google/protobuf/compiler/java/immutable/message_builder.h +++ b/src/google/protobuf/compiler/java/full/message_builder.h @@ -17,7 +17,7 @@ #include #include "absl/container/btree_map.h" -#include "google/protobuf/compiler/java/immutable/field_generator.h" +#include "google/protobuf/compiler/java/full/field_generator.h" #include "google/protobuf/descriptor.h" namespace google { diff --git a/src/google/protobuf/compiler/java/immutable/message_field.cc b/src/google/protobuf/compiler/java/full/message_field.cc similarity index 99% rename from src/google/protobuf/compiler/java/immutable/message_field.cc rename to src/google/protobuf/compiler/java/full/message_field.cc index 31eb0ea858..54ae8dea17 100644 --- a/src/google/protobuf/compiler/java/immutable/message_field.cc +++ b/src/google/protobuf/compiler/java/full/message_field.cc @@ -9,7 +9,7 @@ // Based on original Protocol Buffers design by // Sanjay Ghemawat, Jeff Dean, and others. -#include "google/protobuf/compiler/java/immutable/message_field.h" +#include "google/protobuf/compiler/java/full/message_field.h" #include diff --git a/src/google/protobuf/compiler/java/immutable/message_field.h b/src/google/protobuf/compiler/java/full/message_field.h similarity index 99% rename from src/google/protobuf/compiler/java/immutable/message_field.h rename to src/google/protobuf/compiler/java/full/message_field.h index ee3c4e5289..709ea4309d 100644 --- a/src/google/protobuf/compiler/java/immutable/message_field.h +++ b/src/google/protobuf/compiler/java/full/message_field.h @@ -14,7 +14,7 @@ #include -#include "google/protobuf/compiler/java/immutable/field_generator.h" +#include "google/protobuf/compiler/java/full/field_generator.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/io/printer.h" diff --git a/src/google/protobuf/compiler/java/immutable/primitive_field.cc b/src/google/protobuf/compiler/java/full/primitive_field.cc similarity index 99% rename from src/google/protobuf/compiler/java/immutable/primitive_field.cc rename to src/google/protobuf/compiler/java/full/primitive_field.cc index 3dc402e5c2..b9fe799f4d 100644 --- a/src/google/protobuf/compiler/java/immutable/primitive_field.cc +++ b/src/google/protobuf/compiler/java/full/primitive_field.cc @@ -9,7 +9,7 @@ // Based on original Protocol Buffers design by // Sanjay Ghemawat, Jeff Dean, and others. -#include "google/protobuf/compiler/java/immutable/primitive_field.h" +#include "google/protobuf/compiler/java/full/primitive_field.h" #include #include diff --git a/src/google/protobuf/compiler/java/immutable/primitive_field.h b/src/google/protobuf/compiler/java/full/primitive_field.h similarity index 98% rename from src/google/protobuf/compiler/java/immutable/primitive_field.h rename to src/google/protobuf/compiler/java/full/primitive_field.h index 9aa52bfb8e..6533228ce3 100644 --- a/src/google/protobuf/compiler/java/immutable/primitive_field.h +++ b/src/google/protobuf/compiler/java/full/primitive_field.h @@ -14,7 +14,7 @@ #include -#include "google/protobuf/compiler/java/immutable/field_generator.h" +#include "google/protobuf/compiler/java/full/field_generator.h" #include "google/protobuf/descriptor.h" namespace google { diff --git a/src/google/protobuf/compiler/java/immutable/service.cc b/src/google/protobuf/compiler/java/full/service.cc similarity index 99% rename from src/google/protobuf/compiler/java/immutable/service.cc rename to src/google/protobuf/compiler/java/full/service.cc index f93f9136d7..97d70966b4 100644 --- a/src/google/protobuf/compiler/java/immutable/service.cc +++ b/src/google/protobuf/compiler/java/full/service.cc @@ -9,7 +9,7 @@ // Based on original Protocol Buffers design by // Sanjay Ghemawat, Jeff Dean, and others. -#include "google/protobuf/compiler/java/immutable/service.h" +#include "google/protobuf/compiler/java/full/service.h" #include "absl/log/absl_log.h" #include "absl/strings/str_cat.h" diff --git a/src/google/protobuf/compiler/java/immutable/service.h b/src/google/protobuf/compiler/java/full/service.h similarity index 100% rename from src/google/protobuf/compiler/java/immutable/service.h rename to src/google/protobuf/compiler/java/full/service.h diff --git a/src/google/protobuf/compiler/java/immutable/string_field.cc b/src/google/protobuf/compiler/java/full/string_field.cc similarity index 99% rename from src/google/protobuf/compiler/java/immutable/string_field.cc rename to src/google/protobuf/compiler/java/full/string_field.cc index 1321f51675..d5b5d582bc 100644 --- a/src/google/protobuf/compiler/java/immutable/string_field.cc +++ b/src/google/protobuf/compiler/java/full/string_field.cc @@ -10,7 +10,7 @@ // Based on original Protocol Buffers design by // Sanjay Ghemawat, Jeff Dean, and others. -#include "google/protobuf/compiler/java/immutable/string_field.h" +#include "google/protobuf/compiler/java/full/string_field.h" #include #include diff --git a/src/google/protobuf/compiler/java/immutable/string_field.h b/src/google/protobuf/compiler/java/full/string_field.h similarity index 98% rename from src/google/protobuf/compiler/java/immutable/string_field.h rename to src/google/protobuf/compiler/java/full/string_field.h index cf95be0da8..1d2d1b76b5 100644 --- a/src/google/protobuf/compiler/java/immutable/string_field.h +++ b/src/google/protobuf/compiler/java/full/string_field.h @@ -15,7 +15,7 @@ #include -#include "google/protobuf/compiler/java/immutable/field_generator.h" +#include "google/protobuf/compiler/java/full/field_generator.h" #include "google/protobuf/descriptor.h" namespace google { diff --git a/src/google/protobuf/compiler/java/lite/BUILD.bazel b/src/google/protobuf/compiler/java/lite/BUILD.bazel index a26f8f9da6..ec4b222aa6 100644 --- a/src/google/protobuf/compiler/java/lite/BUILD.bazel +++ b/src/google/protobuf/compiler/java/lite/BUILD.bazel @@ -3,7 +3,7 @@ cc_library( srcs = [ "enum_field.cc", "extension.cc", - "make_field_generators.cc", + "make_field_gens.cc", "map_field.cc", "message_field.cc", "primitive_field.cc", @@ -11,7 +11,7 @@ cc_library( ], hdrs = [ "field_generator.h", - "make_field_generators.h", + "make_field_gens.h", # We don't actually want to put the remaining headers in `hdrs`. # They are logically private, and should be in srcs=[], but # unfortunately `strip_include_prefix` doesn't have any effect @@ -68,7 +68,7 @@ cc_library( "//src/google/protobuf/compiler/java:generator_common", "//src/google/protobuf/compiler/java:helpers", "//src/google/protobuf/compiler/java:internal_helpers", - "//src/google/protobuf/compiler/java/immutable:service", + "//src/google/protobuf/compiler/java/full:service", "//src/google/protobuf/io", "//src/google/protobuf/io:printer", "@com_google_absl//absl/container:btree", diff --git a/src/google/protobuf/compiler/java/lite/generator_factory.cc b/src/google/protobuf/compiler/java/lite/generator_factory.cc index c3f52fe92a..8b9ddb4518 100644 --- a/src/google/protobuf/compiler/java/lite/generator_factory.cc +++ b/src/google/protobuf/compiler/java/lite/generator_factory.cc @@ -12,7 +12,7 @@ #include #include "google/protobuf/compiler/java/context.h" -#include "google/protobuf/compiler/java/immutable/service.h" +#include "google/protobuf/compiler/java/full/service.h" #include "google/protobuf/compiler/java/lite/enum.h" #include "google/protobuf/compiler/java/lite/extension.h" #include "google/protobuf/compiler/java/lite/message.h" diff --git a/src/google/protobuf/compiler/java/lite/make_field_generators.cc b/src/google/protobuf/compiler/java/lite/make_field_gens.cc similarity index 98% rename from src/google/protobuf/compiler/java/lite/make_field_generators.cc rename to src/google/protobuf/compiler/java/lite/make_field_gens.cc index 6071662c58..c4b92deac3 100644 --- a/src/google/protobuf/compiler/java/lite/make_field_generators.cc +++ b/src/google/protobuf/compiler/java/lite/make_field_gens.cc @@ -9,7 +9,7 @@ // Based on original Protocol Buffers design by // Sanjay Ghemawat, Jeff Dean, and others. -#include "google/protobuf/compiler/java/lite/make_field_generators.h" +#include "google/protobuf/compiler/java/lite/make_field_gens.h" #include #include diff --git a/src/google/protobuf/compiler/java/lite/make_field_generators.h b/src/google/protobuf/compiler/java/lite/make_field_gens.h similarity index 80% rename from src/google/protobuf/compiler/java/lite/make_field_generators.h rename to src/google/protobuf/compiler/java/lite/make_field_gens.h index 436c3f896e..ebc9f22e05 100644 --- a/src/google/protobuf/compiler/java/lite/make_field_generators.h +++ b/src/google/protobuf/compiler/java/lite/make_field_gens.h @@ -5,8 +5,8 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_LITE_MAKE_FIELD_GENERATORS_H__ -#define GOOGLE_PROTOBUF_COMPILER_JAVA_LITE_MAKE_FIELD_GENERATORS_H__ +#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_LITE_MAKE_FIELD_GENS_H__ +#define GOOGLE_PROTOBUF_COMPILER_JAVA_LITE_MAKE_FIELD_GENS_H__ #include #include @@ -29,4 +29,4 @@ FieldGeneratorMap MakeImmutableFieldLiteGenerators( } // namespace protobuf } // namespace google -#endif // GOOGLE_PROTOBUF_COMPILER_JAVA_LITE_MAKE_FIELD_GENERATORS_H__ +#endif // GOOGLE_PROTOBUF_COMPILER_JAVA_LITE_MAKE_FIELD_GENS_H__ diff --git a/src/google/protobuf/compiler/java/lite/message.cc b/src/google/protobuf/compiler/java/lite/message.cc index 3363162dc1..81e95242aa 100644 --- a/src/google/protobuf/compiler/java/lite/message.cc +++ b/src/google/protobuf/compiler/java/lite/message.cc @@ -33,7 +33,7 @@ #include "google/protobuf/compiler/java/helpers.h" #include "google/protobuf/compiler/java/lite/enum.h" #include "google/protobuf/compiler/java/lite/extension.h" -#include "google/protobuf/compiler/java/lite/make_field_generators.h" +#include "google/protobuf/compiler/java/lite/make_field_gens.h" #include "google/protobuf/compiler/java/lite/message_builder.h" #include "google/protobuf/compiler/java/name_resolver.h" #include "google/protobuf/descriptor.pb.h" diff --git a/src/google/protobuf/compiler/java/lite/message_builder.cc b/src/google/protobuf/compiler/java/lite/message_builder.cc index 9ae4081555..c5dac22bb5 100644 --- a/src/google/protobuf/compiler/java/lite/message_builder.cc +++ b/src/google/protobuf/compiler/java/lite/message_builder.cc @@ -20,7 +20,7 @@ #include "google/protobuf/compiler/java/field_common.h" #include "google/protobuf/compiler/java/helpers.h" #include "google/protobuf/compiler/java/lite/enum.h" -#include "google/protobuf/compiler/java/lite/make_field_generators.h" +#include "google/protobuf/compiler/java/lite/make_field_gens.h" #include "google/protobuf/compiler/java/name_resolver.h" #include "google/protobuf/descriptor.pb.h" #include "google/protobuf/io/printer.h" diff --git a/src/google/protobuf/compiler/objectivec/BUILD.bazel b/src/google/protobuf/compiler/objectivec/BUILD.bazel index b608b0b0f5..3152976102 100644 --- a/src/google/protobuf/compiler/objectivec/BUILD.bazel +++ b/src/google/protobuf/compiler/objectivec/BUILD.bazel @@ -73,7 +73,7 @@ cc_library( "message_field.cc", "oneof.cc", "primitive_field.cc", - "text_format_decode_data.cc", + "tf_decode_data.cc", ], hdrs = [ "enum.h", @@ -90,7 +90,7 @@ cc_library( "oneof.h", "options.h", "primitive_field.h", - "text_format_decode_data.h", + "tf_decode_data.h", ], copts = COPTS, strip_include_prefix = "/src", diff --git a/src/google/protobuf/compiler/objectivec/enum.cc b/src/google/protobuf/compiler/objectivec/enum.cc index fae53a2606..c8bfcbc3df 100644 --- a/src/google/protobuf/compiler/objectivec/enum.cc +++ b/src/google/protobuf/compiler/objectivec/enum.cc @@ -17,7 +17,7 @@ #include "google/protobuf/compiler/objectivec/helpers.h" #include "google/protobuf/compiler/objectivec/names.h" #include "google/protobuf/compiler/objectivec/options.h" -#include "google/protobuf/compiler/objectivec/text_format_decode_data.h" +#include "google/protobuf/compiler/objectivec/tf_decode_data.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/io/printer.h" diff --git a/src/google/protobuf/compiler/objectivec/message.cc b/src/google/protobuf/compiler/objectivec/message.cc index c3f2ef6d3a..cde92f60d0 100644 --- a/src/google/protobuf/compiler/objectivec/message.cc +++ b/src/google/protobuf/compiler/objectivec/message.cc @@ -26,7 +26,7 @@ #include "google/protobuf/compiler/objectivec/names.h" #include "google/protobuf/compiler/objectivec/oneof.h" #include "google/protobuf/compiler/objectivec/options.h" -#include "google/protobuf/compiler/objectivec/text_format_decode_data.h" +#include "google/protobuf/compiler/objectivec/tf_decode_data.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/descriptor.pb.h" #include "google/protobuf/io/printer.h" diff --git a/src/google/protobuf/compiler/objectivec/text_format_decode_data_unittest.cc b/src/google/protobuf/compiler/objectivec/text_format_decode_data_unittest.cc index c373128163..d730948934 100644 --- a/src/google/protobuf/compiler/objectivec/text_format_decode_data_unittest.cc +++ b/src/google/protobuf/compiler/objectivec/text_format_decode_data_unittest.cc @@ -5,12 +5,12 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "google/protobuf/compiler/objectivec/text_format_decode_data.h" #include #include #include +#include "google/protobuf/compiler/objectivec/tf_decode_data.h" // Must be included last #include "google/protobuf/port_def.inc" diff --git a/src/google/protobuf/compiler/objectivec/text_format_decode_data.cc b/src/google/protobuf/compiler/objectivec/tf_decode_data.cc similarity index 98% rename from src/google/protobuf/compiler/objectivec/text_format_decode_data.cc rename to src/google/protobuf/compiler/objectivec/tf_decode_data.cc index fe48f8d157..8eade5d17a 100644 --- a/src/google/protobuf/compiler/objectivec/text_format_decode_data.cc +++ b/src/google/protobuf/compiler/objectivec/tf_decode_data.cc @@ -5,7 +5,7 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "google/protobuf/compiler/objectivec/text_format_decode_data.h" +#include "google/protobuf/compiler/objectivec/tf_decode_data.h" #include #include diff --git a/src/google/protobuf/compiler/objectivec/text_format_decode_data.h b/src/google/protobuf/compiler/objectivec/tf_decode_data.h similarity index 88% rename from src/google/protobuf/compiler/objectivec/text_format_decode_data.h rename to src/google/protobuf/compiler/objectivec/tf_decode_data.h index f562d32542..1e7932afa2 100644 --- a/src/google/protobuf/compiler/objectivec/text_format_decode_data.h +++ b/src/google/protobuf/compiler/objectivec/tf_decode_data.h @@ -5,8 +5,8 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#ifndef GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_TEXT_FORMAT_DECODE_DATA_H__ -#define GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_TEXT_FORMAT_DECODE_DATA_H__ +#ifndef GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_TF_DECODE_DATA_H__ +#define GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_TF_DECODE_DATA_H__ #include #include @@ -55,4 +55,4 @@ class PROTOC_EXPORT TextFormatDecodeData { #include "google/protobuf/port_undef.inc" -#endif // GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_TEXT_FORMAT_DECODE_DATA_H__ +#endif // GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_TF_DECODE_DATA_H__ diff --git a/src/google/protobuf/compiler/rust/accessors/BUILD.bazel b/src/google/protobuf/compiler/rust/accessors/BUILD.bazel index d864d62587..d7bf99e34e 100644 --- a/src/google/protobuf/compiler/rust/accessors/BUILD.bazel +++ b/src/google/protobuf/compiler/rust/accessors/BUILD.bazel @@ -20,9 +20,9 @@ cc_library( ], hdrs = [ "accessor_case.h", - "accessor_generator.h", "accessors.h", "default_value.h", + "generator.h", ], copts = COPTS, strip_include_prefix = "/src", diff --git a/src/google/protobuf/compiler/rust/accessors/accessors.cc b/src/google/protobuf/compiler/rust/accessors/accessors.cc index 9aa654577f..30984c9dcf 100644 --- a/src/google/protobuf/compiler/rust/accessors/accessors.cc +++ b/src/google/protobuf/compiler/rust/accessors/accessors.cc @@ -11,7 +11,7 @@ #include "absl/log/absl_log.h" #include "google/protobuf/compiler/rust/accessors/accessor_case.h" -#include "google/protobuf/compiler/rust/accessors/accessor_generator.h" +#include "google/protobuf/compiler/rust/accessors/generator.h" #include "google/protobuf/compiler/rust/context.h" #include "google/protobuf/compiler/rust/rust_field_type.h" #include "google/protobuf/descriptor.h" diff --git a/src/google/protobuf/compiler/rust/accessors/accessor_generator.h b/src/google/protobuf/compiler/rust/accessors/generator.h similarity index 100% rename from src/google/protobuf/compiler/rust/accessors/accessor_generator.h rename to src/google/protobuf/compiler/rust/accessors/generator.h diff --git a/src/google/protobuf/compiler/rust/accessors/map.cc b/src/google/protobuf/compiler/rust/accessors/map.cc index 397d210af9..e38f03da5b 100644 --- a/src/google/protobuf/compiler/rust/accessors/map.cc +++ b/src/google/protobuf/compiler/rust/accessors/map.cc @@ -9,7 +9,7 @@ #include "google/protobuf/compiler/cpp/helpers.h" #include "google/protobuf/compiler/rust/accessors/accessor_case.h" -#include "google/protobuf/compiler/rust/accessors/accessor_generator.h" +#include "google/protobuf/compiler/rust/accessors/generator.h" #include "google/protobuf/compiler/rust/context.h" #include "google/protobuf/compiler/rust/naming.h" #include "google/protobuf/descriptor.h" diff --git a/src/google/protobuf/compiler/rust/accessors/repeated_field.cc b/src/google/protobuf/compiler/rust/accessors/repeated_field.cc index 82445759fd..8f5ee25d45 100644 --- a/src/google/protobuf/compiler/rust/accessors/repeated_field.cc +++ b/src/google/protobuf/compiler/rust/accessors/repeated_field.cc @@ -10,7 +10,7 @@ #include "absl/strings/string_view.h" #include "google/protobuf/compiler/cpp/helpers.h" #include "google/protobuf/compiler/rust/accessors/accessor_case.h" -#include "google/protobuf/compiler/rust/accessors/accessor_generator.h" +#include "google/protobuf/compiler/rust/accessors/generator.h" #include "google/protobuf/compiler/rust/context.h" #include "google/protobuf/compiler/rust/naming.h" #include "google/protobuf/descriptor.h" diff --git a/src/google/protobuf/compiler/rust/accessors/singular_message.cc b/src/google/protobuf/compiler/rust/accessors/singular_message.cc index c5f77c2ca2..01f44fad36 100644 --- a/src/google/protobuf/compiler/rust/accessors/singular_message.cc +++ b/src/google/protobuf/compiler/rust/accessors/singular_message.cc @@ -10,7 +10,7 @@ #include "absl/strings/string_view.h" #include "google/protobuf/compiler/cpp/helpers.h" #include "google/protobuf/compiler/rust/accessors/accessor_case.h" -#include "google/protobuf/compiler/rust/accessors/accessor_generator.h" +#include "google/protobuf/compiler/rust/accessors/generator.h" #include "google/protobuf/compiler/rust/context.h" #include "google/protobuf/compiler/rust/naming.h" #include "google/protobuf/descriptor.h" diff --git a/src/google/protobuf/compiler/rust/accessors/singular_scalar.cc b/src/google/protobuf/compiler/rust/accessors/singular_scalar.cc index 9131b361a7..a3d5c62ddd 100644 --- a/src/google/protobuf/compiler/rust/accessors/singular_scalar.cc +++ b/src/google/protobuf/compiler/rust/accessors/singular_scalar.cc @@ -10,8 +10,8 @@ #include "absl/strings/string_view.h" #include "google/protobuf/compiler/cpp/helpers.h" #include "google/protobuf/compiler/rust/accessors/accessor_case.h" -#include "google/protobuf/compiler/rust/accessors/accessor_generator.h" #include "google/protobuf/compiler/rust/accessors/default_value.h" +#include "google/protobuf/compiler/rust/accessors/generator.h" #include "google/protobuf/compiler/rust/context.h" #include "google/protobuf/compiler/rust/naming.h" #include "google/protobuf/descriptor.h" diff --git a/src/google/protobuf/compiler/rust/accessors/singular_string.cc b/src/google/protobuf/compiler/rust/accessors/singular_string.cc index dd4de8ce7e..0962229bdc 100644 --- a/src/google/protobuf/compiler/rust/accessors/singular_string.cc +++ b/src/google/protobuf/compiler/rust/accessors/singular_string.cc @@ -10,7 +10,7 @@ #include "absl/strings/string_view.h" #include "google/protobuf/compiler/cpp/helpers.h" #include "google/protobuf/compiler/rust/accessors/accessor_case.h" -#include "google/protobuf/compiler/rust/accessors/accessor_generator.h" +#include "google/protobuf/compiler/rust/accessors/generator.h" #include "google/protobuf/compiler/rust/context.h" #include "google/protobuf/compiler/rust/naming.h" #include "google/protobuf/descriptor.h" diff --git a/src/google/protobuf/compiler/rust/accessors/unsupported_field.cc b/src/google/protobuf/compiler/rust/accessors/unsupported_field.cc index a04e778cd0..1ca66f63ef 100644 --- a/src/google/protobuf/compiler/rust/accessors/unsupported_field.cc +++ b/src/google/protobuf/compiler/rust/accessors/unsupported_field.cc @@ -7,7 +7,7 @@ #include "absl/strings/string_view.h" #include "google/protobuf/compiler/rust/accessors/accessor_case.h" -#include "google/protobuf/compiler/rust/accessors/accessor_generator.h" +#include "google/protobuf/compiler/rust/accessors/generator.h" #include "google/protobuf/compiler/rust/context.h" #include "google/protobuf/descriptor.h"