Internal changes

PiperOrigin-RevId: 487599716
2 years ago · 2b011bc759
parent 0e76047f5f
commit 2b011bc759
15 changed files with 23 additions and 34 deletions
--- a/benchmarks/benchmark.cc
+++ b/benchmarks/benchmark.cc
@ -29,8 +29,8 @@

 #include "google/ads/googleads/v11/services/google_ads_service.upbdefs.h"
 #include "google/protobuf/descriptor.pb.h"
-#include "google/protobuf/dynamic_message.h"
 #include "absl/container/flat_hash_set.h"
+#include "google/protobuf/dynamic_message.h"
 #include "benchmarks/descriptor.pb.h"
 #include "benchmarks/descriptor.upb.h"
 #include "benchmarks/descriptor.upbdefs.h"
--- a/lua/upbc.cc
+++ b/lua/upbc.cc
@ -23,14 +23,14 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-#include "google/protobuf/compiler/code_generator.h"
-#include "google/protobuf/compiler/plugin.h"
-#include "google/protobuf/io/printer.h"
 #include "google/protobuf/descriptor.pb.h"
-#include "google/protobuf/descriptor.h"
 #include "absl/strings/str_replace.h"
 #include "absl/strings/string_view.h"
 #include "absl/strings/substitute.h"
+#include "google/protobuf/compiler/code_generator.h"
+#include "google/protobuf/compiler/plugin.h"
+#include "google/protobuf/descriptor.h"
+#include "google/protobuf/io/printer.h"

 namespace protoc = ::google::protobuf::compiler;
 namespace protobuf = ::google::protobuf;
--- a/protos_generator/BUILD
+++ b/protos_generator/BUILD
@ -39,12 +39,7 @@ cc_binary(
    visibility = ["//visibility:public"],
    deps = [
        ":generator",
-        "//:mini_table",
        "//upbc:file_layout",
-        "@com_google_absl//absl/base:core_headers",
-        "@com_google_absl//absl/container:flat_hash_map",
-        "@com_google_absl//absl/container:flat_hash_set",
-        "@com_google_absl//absl/strings",
        "@com_google_protobuf//:protobuf",
        "@com_google_protobuf//src/google/protobuf/compiler:code_generator",
    ],
--- a/protos_generator/gen_accessors.cc
+++ b/protos_generator/gen_accessors.cc
@ -25,10 +25,10 @@

 #include "protos_generator/gen_accessors.h"

-#include "google/protobuf/descriptor.h"
 #include "absl/container/flat_hash_set.h"
 #include "absl/strings/match.h"
 #include "absl/strings/string_view.h"
+#include "google/protobuf/descriptor.h"
 #include "protos_generator/gen_utils.h"
 #include "protos_generator/output.h"
 #include "upbc/file_layout.h"
--- a/protos_generator/gen_utils.h
+++ b/protos_generator/gen_utils.h
@ -28,12 +28,12 @@
 #ifndef UPB_PROTOS_GENERATOR_GEN_UTILS_H_
 #define UPB_PROTOS_GENERATOR_GEN_UTILS_H_

+#include "google/protobuf/descriptor.pb.h"
+#include "absl/container/flat_hash_map.h"
 #include "google/protobuf/compiler/code_generator.h"
 #include "google/protobuf/compiler/plugin.h"
-#include "google/protobuf/descriptor.pb.h"
 #include "google/protobuf/descriptor.h"
 #include "google/protobuf/wire_format.h"
-#include "absl/container/flat_hash_map.h"
 #include "protos_generator/output.h"

 namespace protos_generator {
--- a/protos_generator/output.h
+++ b/protos_generator/output.h
@ -30,12 +30,12 @@

 #include <vector>

-#include "google/protobuf/io/zero_copy_stream.h"
-#include "google/protobuf/descriptor.h"
 #include "absl/base/log_severity.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_replace.h"
 #include "absl/strings/substitute.h"
+#include "google/protobuf/descriptor.h"
+#include "google/protobuf/io/zero_copy_stream.h"

 namespace protos_generator {

--- a/protos_generator/protoc-gen-upb-protos.cc
+++ b/protos_generator/protoc-gen-upb-protos.cc
@ -25,9 +25,9 @@

 #include <memory>

+#include "google/protobuf/descriptor.pb.h"
 #include "google/protobuf/compiler/code_generator.h"
 #include "google/protobuf/compiler/plugin.h"
-#include "google/protobuf/descriptor.pb.h"
 #include "protos_generator/gen_enums.h"
 #include "protos_generator/gen_extensions.h"
 #include "protos_generator/gen_messages.h"
--- a/upb/mini_table/encode_test.cc
+++ b/upb/mini_table/encode_test.cc
@ -25,10 +25,10 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include "google/protobuf/descriptor.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "absl/container/flat_hash_set.h"
+#include "google/protobuf/descriptor.h"
 #include "upb/mini_table/common_internal.h"
 #include "upb/mini_table/decode.h"
 #include "upb/mini_table/encode_internal.hpp"
--- a/upb/util/def_to_proto_test.cc
+++ b/upb/util/def_to_proto_test.cc
@ -29,10 +29,10 @@

 #include "google/protobuf/descriptor.pb.h"
 #include "google/protobuf/descriptor.upbdefs.h"
-#include "google/protobuf/dynamic_message.h"
-#include "google/protobuf/util/message_differencer.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
+#include "google/protobuf/dynamic_message.h"
+#include "google/protobuf/util/message_differencer.h"
 #include "upb/reflection/def.hpp"
 #include "upb/upb.hpp"
 #include "upb/util/def_to_proto_test.upbdefs.h"
--- a/upbc/BUILD
+++ b/upbc/BUILD
@ -142,11 +142,8 @@ cc_binary(
        ":common",
        ":file_layout",
        ":names",
-        "//:mini_table",
        "//:mini_table_internal",
        "//:port",
-        "//:upb",
-        "@com_google_absl//absl/base:core_headers",
        "@com_google_absl//absl/container:flat_hash_map",
        "@com_google_absl//absl/container:flat_hash_set",
        "@com_google_absl//absl/strings",
@ -164,9 +161,6 @@ cc_binary(
    visibility = ["//visibility:public"],
    deps = [
        ":common",
-        "@com_google_absl//absl/base:core_headers",
-        "@com_google_absl//absl/container:flat_hash_map",
-        "@com_google_absl//absl/strings",
        "@com_google_protobuf//:protobuf",
        "@com_google_protobuf//src/google/protobuf/compiler:code_generator",
    ],
--- a/upbc/common.h
+++ b/upbc/common.h
@ -30,10 +30,10 @@

 #include <vector>

-#include "google/protobuf/io/zero_copy_stream.h"
-#include "google/protobuf/descriptor.h"
 #include "absl/strings/str_replace.h"
 #include "absl/strings/substitute.h"
+#include "google/protobuf/descriptor.h"
+#include "google/protobuf/io/zero_copy_stream.h"

 namespace upbc {

--- a/upbc/names.cc
+++ b/upbc/names.cc
@ -29,8 +29,8 @@

 #include <string>

-#include "google/protobuf/descriptor.h"
 #include "absl/strings/match.h"
+#include "google/protobuf/descriptor.h"

 namespace upbc {

--- a/upbc/names.h
+++ b/upbc/names.h
@ -30,8 +30,8 @@

 #include <string>

-#include "google/protobuf/descriptor.h"
 #include "absl/container/flat_hash_map.h"
+#include "google/protobuf/descriptor.h"

 namespace upbc {

--- a/upbc/protoc-gen-upb.cc
+++ b/upbc/protoc-gen-upb.cc
@ -25,14 +25,14 @@

 #include <memory>

-#include "google/protobuf/compiler/code_generator.h"
-#include "google/protobuf/compiler/plugin.h"
 #include "google/protobuf/descriptor.pb.h"
-#include "google/protobuf/descriptor.h"
-#include "google/protobuf/wire_format.h"
 #include "absl/container/flat_hash_map.h"
 #include "absl/container/flat_hash_set.h"
 #include "absl/strings/substitute.h"
+#include "google/protobuf/compiler/code_generator.h"
+#include "google/protobuf/compiler/plugin.h"
+#include "google/protobuf/descriptor.h"
+#include "google/protobuf/wire_format.h"
 #include "upb/mini_table/encode_internal.hpp"
 #include "upbc/common.h"
 #include "upbc/file_layout.h"
--- a/upbc/protoc-gen-upbdefs.cc
+++ b/upbc/protoc-gen-upbdefs.cc
@ -25,10 +25,10 @@

 #include <memory>

+#include "google/protobuf/descriptor.pb.h"
 #include "google/protobuf/compiler/code_generator.h"
 #include "google/protobuf/compiler/plugin.h"
 #include "google/protobuf/descriptor.h"
-#include "google/protobuf/descriptor.pb.h"
 #include "upbc/common.h"

 namespace upbc {