diff --git a/.clang-format b/.clang-format index 7460950e71b..953705e847c 100644 --- a/.clang-format +++ b/.clang-format @@ -3,7 +3,44 @@ Language: Cpp BasedOnStyle: Google DerivePointerAlignment: false PointerAlignment: Left -IncludeBlocks: Preserve +IncludeBlocks: Regroup +IncludeCategories: + # port_platform.h is before almost everything + - Regex: '^' + Priority: -100 + # ruby.h is even more first if it's included + - Regex: '^' + Priority: -200 + # Some platforms (namely msys) need wchar to be included BEFORE + # anything else, especially strsafe.h. + - Regex: '^' + Priority: 5 + # use priority 100+ for grpc headers so they sort last + # 'system' headers - include things that have " in the names to make them + # stand out and get fixed + - Regex: '^(<|")grpc' + Priority: 100 + # similary using include/ to get system headers should stand out and get + # fixed + - Regex: '^"include/' + Priority: 100 + # source headers go last + - Regex: '^"(src|test)/' + Priority: 101 + # not-grpc headers follow + # first, non system headers that are included like <> - these are all + # local carveouts, and get sorted below c++ but before non grpc "" files + - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|benchmark/|google/)' + Priority: 30 + # first C system headers - they have a . in the filename + - Regex: '^<.*\.' + Priority: 10 + # then C++ system headers - no ., the only thing that will match now + - Regex: '^<' + Priority: 20 + # finally other "" includes go between system headers and our headers + - Regex: '^"' + Priority: 40 --- Language: ObjC BasedOnStyle: Google diff --git a/examples/android/binder/java/io/grpc/binder/cpp/example/native.cc b/examples/android/binder/java/io/grpc/binder/cpp/example/native.cc index 3230d2da174..99f49419383 100644 --- a/examples/android/binder/java/io/grpc/binder/cpp/example/native.cc +++ b/examples/android/binder/java/io/grpc/binder/cpp/example/native.cc @@ -14,8 +14,10 @@ #include #include + #include "examples/protos/helloworld.grpc.pb.h" #include "examples/protos/helloworld.pb.h" + #include "src/core/ext/transport/binder/client/channel_create.h" extern "C" JNIEXPORT jstring JNICALL diff --git a/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/native.cc b/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/native.cc index c875b609222..be793806f0c 100644 --- a/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/native.cc +++ b/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/native.cc @@ -17,11 +17,13 @@ #include #include #include -#include #include #include "examples/protos/helloworld.grpc.pb.h" #include "examples/protos/helloworld.pb.h" + +#include + #include "src/core/ext/transport/binder/server/binder_server.h" #include "src/core/ext/transport/binder/server/binder_server_credentials.h" diff --git a/examples/cpp/helloworld/greeter_async_client2.cc b/examples/cpp/helloworld/greeter_async_client2.cc index 407a4414f42..54e75c9c790 100644 --- a/examples/cpp/helloworld/greeter_async_client2.cc +++ b/examples/cpp/helloworld/greeter_async_client2.cc @@ -19,10 +19,10 @@ #include #include #include +#include #include #include -#include #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" diff --git a/examples/cpp/keyvaluestore/client.cc b/examples/cpp/keyvaluestore/client.cc index 57c451cadf3..75c09a0af0f 100644 --- a/examples/cpp/keyvaluestore/client.cc +++ b/examples/cpp/keyvaluestore/client.cc @@ -21,10 +21,10 @@ #include #include -#include - #include "caching_interceptor.h" +#include + #ifdef BAZEL_BUILD #include "examples/protos/keyvaluestore.grpc.pb.h" #else diff --git a/examples/cpp/route_guide/route_guide_callback_client.cc b/examples/cpp/route_guide/route_guide_callback_client.cc index 93eeaecb947..4bab4ae30d7 100644 --- a/examples/cpp/route_guide/route_guide_callback_client.cc +++ b/examples/cpp/route_guide/route_guide_callback_client.cc @@ -25,13 +25,14 @@ #include #include +#include "helper.h" + #include #include #include #include #include #include -#include "helper.h" #ifdef BAZEL_BUILD #include "examples/protos/route_guide.grpc.pb.h" #else diff --git a/examples/cpp/route_guide/route_guide_callback_server.cc b/examples/cpp/route_guide/route_guide_callback_server.cc index cf99d05ffc9..1c9fb5f65b7 100644 --- a/examples/cpp/route_guide/route_guide_callback_server.cc +++ b/examples/cpp/route_guide/route_guide_callback_server.cc @@ -24,12 +24,13 @@ #include #include +#include "helper.h" + #include #include #include #include #include -#include "helper.h" #ifdef BAZEL_BUILD #include "examples/protos/route_guide.grpc.pb.h" #else diff --git a/examples/cpp/route_guide/route_guide_client.cc b/examples/cpp/route_guide/route_guide_client.cc index e30636c28ff..fd29a31e373 100644 --- a/examples/cpp/route_guide/route_guide_client.cc +++ b/examples/cpp/route_guide/route_guide_client.cc @@ -23,12 +23,13 @@ #include #include +#include "helper.h" + #include #include #include #include #include -#include "helper.h" #ifdef BAZEL_BUILD #include "examples/protos/route_guide.grpc.pb.h" #else diff --git a/examples/cpp/route_guide/route_guide_server.cc b/examples/cpp/route_guide/route_guide_server.cc index 58ec2089590..0e29125881f 100644 --- a/examples/cpp/route_guide/route_guide_server.cc +++ b/examples/cpp/route_guide/route_guide_server.cc @@ -23,12 +23,13 @@ #include #include +#include "helper.h" + #include #include #include #include #include -#include "helper.h" #ifdef BAZEL_BUILD #include "examples/protos/route_guide.grpc.pb.h" #else diff --git a/include/grpc/grpc.h b/include/grpc/grpc.h index 5e45b470894..3c7292c248a 100644 --- a/include/grpc/grpc.h +++ b/include/grpc/grpc.h @@ -21,15 +21,15 @@ #include -#include +#include #include #include #include #include #include +#include #include -#include #ifdef __cplusplus extern "C" { diff --git a/include/grpc/grpc_posix.h b/include/grpc/grpc_posix.h index d16af4df592..4f1c8f5487c 100644 --- a/include/grpc/grpc_posix.h +++ b/include/grpc/grpc_posix.h @@ -21,10 +21,10 @@ #include -#include - #include +#include + #ifdef __cplusplus extern "C" { #endif diff --git a/include/grpc/impl/codegen/grpc_types.h b/include/grpc/impl/codegen/grpc_types.h index cb3471cb445..97ca3e4c2c4 100644 --- a/include/grpc/impl/codegen/grpc_types.h +++ b/include/grpc/impl/codegen/grpc_types.h @@ -23,13 +23,13 @@ #include +#include + #include #include #include #include -#include - #ifdef __cplusplus extern "C" { #endif diff --git a/include/grpc/impl/codegen/sync_posix.h b/include/grpc/impl/codegen/sync_posix.h index a6ef4f75f3e..f5cf482c71c 100644 --- a/include/grpc/impl/codegen/sync_posix.h +++ b/include/grpc/impl/codegen/sync_posix.h @@ -23,10 +23,10 @@ #include -#include - #include +#include + #ifdef GRPC_ASAN_ENABLED /* The member |leak_checker| is used to check whether there is a memory leak * caused by upper layer logic that's missing the |gpr_xx_destroy| call diff --git a/include/grpc/support/time.h b/include/grpc/support/time.h index 44aead5eea3..a193dbc8711 100644 --- a/include/grpc/support/time.h +++ b/include/grpc/support/time.h @@ -21,11 +21,11 @@ #include -#include - #include #include +#include + #ifdef __cplusplus extern "C" { #endif diff --git a/include/grpcpp/create_channel_posix.h b/include/grpcpp/create_channel_posix.h index 8c34330d976..e6019d2cbf4 100644 --- a/include/grpcpp/create_channel_posix.h +++ b/include/grpcpp/create_channel_posix.h @@ -19,9 +19,10 @@ #ifndef GRPCPP_CREATE_CHANNEL_POSIX_H #define GRPCPP_CREATE_CHANNEL_POSIX_H +#include + #include -#include #include #include diff --git a/include/grpcpp/grpcpp.h b/include/grpcpp/grpcpp.h index 8912f99f092..9d707e29d7e 100644 --- a/include/grpcpp/grpcpp.h +++ b/include/grpcpp/grpcpp.h @@ -49,7 +49,6 @@ // headers are not private for grpcpp.h and are part of its interface. // IWYU pragma: begin_exports #include - #include #include #include diff --git a/include/grpcpp/impl/codegen/byte_buffer.h b/include/grpcpp/impl/codegen/byte_buffer.h index fb2b20f7f93..d94ac3bc7ba 100644 --- a/include/grpcpp/impl/codegen/byte_buffer.h +++ b/include/grpcpp/impl/codegen/byte_buffer.h @@ -21,16 +21,15 @@ // IWYU pragma: private, include -#include +#include +#include #include #include #include #include #include -#include - namespace grpc { class ServerInterface; diff --git a/include/grpcpp/impl/codegen/interceptor_common.h b/include/grpcpp/impl/codegen/interceptor_common.h index ec52706126f..b084b7cef90 100644 --- a/include/grpcpp/impl/codegen/interceptor_common.h +++ b/include/grpcpp/impl/codegen/interceptor_common.h @@ -24,14 +24,13 @@ #include #include +#include #include #include #include #include #include -#include - namespace grpc { namespace internal { diff --git a/include/grpcpp/impl/codegen/server_context.h b/include/grpcpp/impl/codegen/server_context.h index a1acb6adf5c..a0cd1815e81 100644 --- a/include/grpcpp/impl/codegen/server_context.h +++ b/include/grpcpp/impl/codegen/server_context.h @@ -21,6 +21,8 @@ // IWYU pragma: private, include +#include + #include #include #include @@ -28,8 +30,6 @@ #include #include -#include - #include #include #include diff --git a/include/grpcpp/impl/codegen/slice.h b/include/grpcpp/impl/codegen/slice.h index cb43f1110f9..392986a5649 100644 --- a/include/grpcpp/impl/codegen/slice.h +++ b/include/grpcpp/impl/codegen/slice.h @@ -21,12 +21,11 @@ // IWYU pragma: private, include +#include #include #include #include -#include - namespace grpc { /// A wrapper around \a grpc_slice. diff --git a/include/grpcpp/impl/codegen/sync.h b/include/grpcpp/impl/codegen/sync.h index 2dac2e08e6c..4cb8133c7c3 100644 --- a/include/grpcpp/impl/codegen/sync.h +++ b/include/grpcpp/impl/codegen/sync.h @@ -29,13 +29,12 @@ #include +#include "absl/synchronization/mutex.h" + #include #include - #include -#include "absl/synchronization/mutex.h" - // The core library is not accessible in C++ codegen headers, and vice versa. // Thus, we need to have duplicate headers with similar functionality. // Make sure any change to this file is also reflected in diff --git a/include/grpcpp/security/alts_context.h b/include/grpcpp/security/alts_context.h index bba0fca0579..8d842575d6f 100644 --- a/include/grpcpp/security/alts_context.h +++ b/include/grpcpp/security/alts_context.h @@ -19,12 +19,12 @@ #ifndef GRPCPP_SECURITY_ALTS_CONTEXT_H #define GRPCPP_SECURITY_ALTS_CONTEXT_H -#include -#include - #include #include +#include +#include + struct grpc_gcp_AltsContext; namespace grpc { diff --git a/include/grpcpp/security/alts_util.h b/include/grpcpp/security/alts_util.h index 2b2b07e4bd1..b0ef4b4d9e4 100644 --- a/include/grpcpp/security/alts_util.h +++ b/include/grpcpp/security/alts_util.h @@ -19,13 +19,13 @@ #ifndef GRPCPP_SECURITY_ALTS_UTIL_H #define GRPCPP_SECURITY_ALTS_UTIL_H +#include + #include #include #include #include -#include - struct grpc_gcp_AltsContext; namespace grpc { diff --git a/include/grpcpp/security/authorization_policy_provider.h b/include/grpcpp/security/authorization_policy_provider.h index 9c3c6bec800..b3258b2fa11 100644 --- a/include/grpcpp/security/authorization_policy_provider.h +++ b/include/grpcpp/security/authorization_policy_provider.h @@ -15,11 +15,11 @@ #ifndef GRPCPP_SECURITY_AUTHORIZATION_POLICY_PROVIDER_H #define GRPCPP_SECURITY_AUTHORIZATION_POLICY_PROVIDER_H +#include + #include #include -#include - // TODO(yihuazhang): remove the forward declaration here and include // directly once the insecure builds are cleaned up. typedef struct grpc_authorization_policy_provider diff --git a/include/grpcpp/security/tls_certificate_provider.h b/include/grpcpp/security/tls_certificate_provider.h index a7480cc6191..6569650751e 100644 --- a/include/grpcpp/security/tls_certificate_provider.h +++ b/include/grpcpp/security/tls_certificate_provider.h @@ -17,15 +17,15 @@ #ifndef GRPCPP_SECURITY_TLS_CERTIFICATE_PROVIDER_H #define GRPCPP_SECURITY_TLS_CERTIFICATE_PROVIDER_H +#include +#include + #include #include #include #include #include -#include -#include - // TODO(yihuazhang): remove the forward declaration here and include // directly once the insecure builds are cleaned up. typedef struct grpc_tls_certificate_provider grpc_tls_certificate_provider; diff --git a/include/grpcpp/security/tls_credentials_options.h b/include/grpcpp/security/tls_credentials_options.h index da2b595b553..fb861a50ae4 100644 --- a/include/grpcpp/security/tls_credentials_options.h +++ b/include/grpcpp/security/tls_credentials_options.h @@ -19,15 +19,15 @@ #ifndef GRPCPP_SECURITY_TLS_CREDENTIALS_OPTIONS_H #define GRPCPP_SECURITY_TLS_CREDENTIALS_OPTIONS_H +#include +#include + #include #include #include #include #include -#include -#include - // TODO(yihuazhang): remove the forward declaration here and include // directly once the insecure builds are cleaned up. typedef struct grpc_tls_server_authorization_check_arg diff --git a/include/grpcpp/server.h b/include/grpcpp/server.h index 4c215084b53..dce87448c9e 100644 --- a/include/grpcpp/server.h +++ b/include/grpcpp/server.h @@ -19,12 +19,12 @@ #ifndef GRPCPP_SERVER_H #define GRPCPP_SERVER_H +#include + #include #include #include -#include - #include #include #include diff --git a/include/grpcpp/server_builder.h b/include/grpcpp/server_builder.h index 99d2ca3151f..ab639122254 100644 --- a/include/grpcpp/server_builder.h +++ b/include/grpcpp/server_builder.h @@ -19,13 +19,13 @@ #ifndef GRPCPP_SERVER_BUILDER_H #define GRPCPP_SERVER_BUILDER_H +#include + #include #include #include #include -#include - #include #include #include diff --git a/include/grpcpp/server_posix.h b/include/grpcpp/server_posix.h index ef3ee01a5c6..2e938624d2a 100644 --- a/include/grpcpp/server_posix.h +++ b/include/grpcpp/server_posix.h @@ -19,9 +19,10 @@ #ifndef GRPCPP_SERVER_POSIX_H #define GRPCPP_SERVER_POSIX_H +#include + #include -#include #include namespace grpc { diff --git a/include/grpcpp/test/client_context_test_peer.h b/include/grpcpp/test/client_context_test_peer.h index 4631873bcc8..0ce9643933e 100644 --- a/include/grpcpp/test/client_context_test_peer.h +++ b/include/grpcpp/test/client_context_test_peer.h @@ -19,10 +19,10 @@ #ifndef GRPCPP_TEST_CLIENT_CONTEXT_TEST_PEER_H #define GRPCPP_TEST_CLIENT_CONTEXT_TEST_PEER_H -#include - #include +#include + namespace grpc { namespace testing { diff --git a/include/grpcpp/test/mock_stream.h b/include/grpcpp/test/mock_stream.h index 9e12af9b2d7..f210b41ac6f 100644 --- a/include/grpcpp/test/mock_stream.h +++ b/include/grpcpp/test/mock_stream.h @@ -22,6 +22,7 @@ #include #include + #include #include #include diff --git a/src/compiler/config.h b/src/compiler/config.h index f25f394c9d5..49c78755b50 100644 --- a/src/compiler/config.h +++ b/src/compiler/config.h @@ -19,10 +19,10 @@ #ifndef SRC_COMPILER_CONFIG_H #define SRC_COMPILER_CONFIG_H -#include "src/compiler/config_protobuf.h" - #include +#include "src/compiler/config_protobuf.h" + #ifdef GRPC_CUSTOM_STRING #warning GRPC_CUSTOM_STRING is no longer supported. Please use std::string. #endif diff --git a/src/compiler/cpp_generator.cc b/src/compiler/cpp_generator.cc index 37178d9093d..f5283280d51 100644 --- a/src/compiler/cpp_generator.cc +++ b/src/compiler/cpp_generator.cc @@ -16,10 +16,9 @@ * */ -#include - #include "src/compiler/cpp_generator.h" +#include #include namespace grpc_cpp_generator { diff --git a/src/compiler/cpp_plugin.h b/src/compiler/cpp_plugin.h index a3a0f339b92..3d6f19e44cb 100644 --- a/src/compiler/cpp_plugin.h +++ b/src/compiler/cpp_plugin.h @@ -23,7 +23,6 @@ #include #include "src/compiler/config.h" - #include "src/compiler/cpp_generator.h" #include "src/compiler/generator_helpers.h" #include "src/compiler/protobuf_plugin.h" diff --git a/src/compiler/csharp_generator.cc b/src/compiler/csharp_generator.cc index 21968c665f0..b42c07cd2a2 100644 --- a/src/compiler/csharp_generator.cc +++ b/src/compiler/csharp_generator.cc @@ -16,13 +16,14 @@ * */ +#include "src/compiler/csharp_generator.h" + #include #include #include #include #include "src/compiler/config.h" -#include "src/compiler/csharp_generator.h" #include "src/compiler/csharp_generator_helpers.h" using grpc::protobuf::Descriptor; diff --git a/src/compiler/node_generator.cc b/src/compiler/node_generator.cc index 465ac7e477d..8c9f0263087 100644 --- a/src/compiler/node_generator.cc +++ b/src/compiler/node_generator.cc @@ -16,11 +16,12 @@ * */ +#include "src/compiler/node_generator.h" + #include #include "src/compiler/config.h" #include "src/compiler/generator_helpers.h" -#include "src/compiler/node_generator.h" #include "src/compiler/node_generator_helpers.h" using grpc::protobuf::Descriptor; diff --git a/src/compiler/objective_c_generator.cc b/src/compiler/objective_c_generator.cc index c8f1c43c6c0..cd05ae78c4e 100644 --- a/src/compiler/objective_c_generator.cc +++ b/src/compiler/objective_c_generator.cc @@ -16,16 +16,17 @@ * */ +#include "src/compiler/objective_c_generator.h" + #include #include #include +#include + #include "src/compiler/config.h" -#include "src/compiler/objective_c_generator.h" #include "src/compiler/objective_c_generator_helpers.h" -#include - using ::google::protobuf::compiler::objectivec::ClassName; using ::grpc::protobuf::FileDescriptor; using ::grpc::protobuf::MethodDescriptor; diff --git a/src/compiler/objective_c_generator_helpers.h b/src/compiler/objective_c_generator_helpers.h index f9320f06eb0..4260411be8e 100644 --- a/src/compiler/objective_c_generator_helpers.h +++ b/src/compiler/objective_c_generator_helpers.h @@ -20,11 +20,12 @@ #define GRPC_INTERNAL_COMPILER_OBJECTIVE_C_GENERATOR_HELPERS_H #include -#include "src/compiler/config.h" -#include "src/compiler/generator_helpers.h" #include +#include "src/compiler/config.h" +#include "src/compiler/generator_helpers.h" + namespace grpc_objective_c_generator { using ::grpc::protobuf::FileDescriptor; diff --git a/src/compiler/objective_c_plugin.cc b/src/compiler/objective_c_plugin.cc index 7f4a0d3be33..8cc3fdfe172 100644 --- a/src/compiler/objective_c_plugin.cc +++ b/src/compiler/objective_c_plugin.cc @@ -20,12 +20,12 @@ #include +#include + #include "src/compiler/config.h" #include "src/compiler/objective_c_generator.h" #include "src/compiler/objective_c_generator_helpers.h" -#include - using ::google::protobuf::compiler::objectivec:: IsProtobufLibraryBundledProtoFile; using ::google::protobuf::compiler::objectivec::ProtobufLibraryFrameworkName; diff --git a/src/compiler/php_generator.cc b/src/compiler/php_generator.cc index 28bbebd1041..78d95419712 100644 --- a/src/compiler/php_generator.cc +++ b/src/compiler/php_generator.cc @@ -19,6 +19,7 @@ #include #include + #include "src/compiler/config.h" #include "src/compiler/generator_helpers.h" #include "src/compiler/php_generator_helpers.h" diff --git a/src/compiler/protobuf_plugin.h b/src/compiler/protobuf_plugin.h index 951ff5ebd8c..0a7aa4141c2 100644 --- a/src/compiler/protobuf_plugin.h +++ b/src/compiler/protobuf_plugin.h @@ -19,14 +19,14 @@ #ifndef GRPC_INTERNAL_COMPILER_PROTOBUF_PLUGIN_H #define GRPC_INTERNAL_COMPILER_PROTOBUF_PLUGIN_H +#include + #include "src/compiler/config.h" #include "src/compiler/cpp_generator_helpers.h" #include "src/compiler/python_generator_helpers.h" #include "src/compiler/python_private_generator.h" #include "src/compiler/schema_interface.h" -#include - // Get leading or trailing comments in a string. template inline std::string GetCommentsHelper(const DescriptorType* desc, bool leading, diff --git a/src/compiler/python_generator.cc b/src/compiler/python_generator.cc index 40e79b54530..753fe1c8887 100644 --- a/src/compiler/python_generator.cc +++ b/src/compiler/python_generator.cc @@ -16,6 +16,8 @@ * */ +#include "src/compiler/python_generator.h" + #include #include #include @@ -33,7 +35,6 @@ #include "src/compiler/config.h" #include "src/compiler/generator_helpers.h" #include "src/compiler/protobuf_plugin.h" -#include "src/compiler/python_generator.h" #include "src/compiler/python_generator_helpers.h" #include "src/compiler/python_private_generator.h" diff --git a/src/compiler/ruby_generator.cc b/src/compiler/ruby_generator.cc index e045c963865..c553e1c34bb 100644 --- a/src/compiler/ruby_generator.cc +++ b/src/compiler/ruby_generator.cc @@ -16,12 +16,13 @@ * */ +#include "src/compiler/ruby_generator.h" + #include #include #include #include "src/compiler/config.h" -#include "src/compiler/ruby_generator.h" #include "src/compiler/ruby_generator_helpers-inl.h" #include "src/compiler/ruby_generator_map-inl.h" #include "src/compiler/ruby_generator_string-inl.h" diff --git a/src/compiler/ruby_generator_map-inl.h b/src/compiler/ruby_generator_map-inl.h index 5f85abc3931..89515523523 100644 --- a/src/compiler/ruby_generator_map-inl.h +++ b/src/compiler/ruby_generator_map-inl.h @@ -19,14 +19,14 @@ #ifndef GRPC_INTERNAL_COMPILER_RUBY_GENERATOR_MAP_INL_H #define GRPC_INTERNAL_COMPILER_RUBY_GENERATOR_MAP_INL_H -#include "src/compiler/config.h" - #include #include #include #include // NOLINT #include +#include "src/compiler/config.h" + using std::initializer_list; using std::map; using std::vector; diff --git a/src/compiler/ruby_generator_string-inl.h b/src/compiler/ruby_generator_string-inl.h index 968f795cbb5..feaa4955722 100644 --- a/src/compiler/ruby_generator_string-inl.h +++ b/src/compiler/ruby_generator_string-inl.h @@ -19,12 +19,12 @@ #ifndef GRPC_INTERNAL_COMPILER_RUBY_GENERATOR_STRING_INL_H #define GRPC_INTERNAL_COMPILER_RUBY_GENERATOR_STRING_INL_H -#include "src/compiler/config.h" - #include #include #include +#include "src/compiler/config.h" + using std::getline; using std::transform; diff --git a/src/compiler/schema_interface.h b/src/compiler/schema_interface.h index f1a255ace1f..2e2bdd32d83 100644 --- a/src/compiler/schema_interface.h +++ b/src/compiler/schema_interface.h @@ -19,12 +19,12 @@ #ifndef GRPC_INTERNAL_COMPILER_SCHEMA_INTERFACE_H #define GRPC_INTERNAL_COMPILER_SCHEMA_INTERFACE_H -#include "src/compiler/config.h" - #include #include #include +#include "src/compiler/config.h" + #ifdef GRPC_CUSTOM_STRING #warning GRPC_CUSTOM_STRING is no longer supported. Please use std::string. #endif diff --git a/src/core/ext/filters/census/grpc_context.cc b/src/core/ext/filters/census/grpc_context.cc index 599a798ddaa..6659f701c27 100644 --- a/src/core/ext/filters/census/grpc_context.cc +++ b/src/core/ext/filters/census/grpc_context.cc @@ -20,6 +20,7 @@ #include #include + #include "src/core/lib/surface/api_trace.h" #include "src/core/lib/surface/call.h" diff --git a/src/core/ext/filters/client_channel/backend_metric.cc b/src/core/ext/filters/client_channel/backend_metric.cc index 441657efa50..964339e57a4 100644 --- a/src/core/ext/filters/client_channel/backend_metric.cc +++ b/src/core/ext/filters/client_channel/backend_metric.cc @@ -19,7 +19,6 @@ #include "src/core/ext/filters/client_channel/backend_metric.h" #include "absl/strings/string_view.h" - #include "udpa/data/orca/v1/orca_load_report.upb.h" #include "upb/upb.hpp" diff --git a/src/core/ext/filters/client_channel/backup_poller.h b/src/core/ext/filters/client_channel/backup_poller.h index b412081b960..ae47353a354 100644 --- a/src/core/ext/filters/client_channel/backup_poller.h +++ b/src/core/ext/filters/client_channel/backup_poller.h @@ -22,6 +22,7 @@ #include #include + #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/gprpp/global_config.h" diff --git a/src/core/ext/filters/client_channel/channel_connectivity.cc b/src/core/ext/filters/client_channel/channel_connectivity.cc index e5ec5c5fe09..a656294970b 100644 --- a/src/core/ext/filters/client_channel/channel_connectivity.cc +++ b/src/core/ext/filters/client_channel/channel_connectivity.cc @@ -16,13 +16,12 @@ #include -#include "src/core/lib/surface/channel.h" - #include #include "src/core/ext/filters/client_channel/client_channel.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/surface/api_trace.h" +#include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/completion_queue.h" grpc_connectivity_state grpc_channel_check_connectivity_state( diff --git a/src/core/ext/filters/client_channel/client_channel.cc b/src/core/ext/filters/client_channel/client_channel.cc index f8109e2b495..e112e21143c 100644 --- a/src/core/ext/filters/client_channel/client_channel.cc +++ b/src/core/ext/filters/client_channel/client_channel.cc @@ -26,19 +26,18 @@ #include +#include "absl/container/inlined_vector.h" #include "absl/strings/numbers.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" #include "absl/strings/string_view.h" +#include "absl/types/optional.h" #include #include #include #include -#include "absl/container/inlined_vector.h" -#include "absl/types/optional.h" - #include "src/core/ext/filters/client_channel/backend_metric.h" #include "src/core/ext/filters/client_channel/backup_poller.h" #include "src/core/ext/filters/client_channel/config_selector.h" diff --git a/src/core/ext/filters/client_channel/client_channel_channelz.cc b/src/core/ext/filters/client_channel/client_channel_channelz.cc index 6054cd2611b..d543aa416a6 100644 --- a/src/core/ext/filters/client_channel/client_channel_channelz.cc +++ b/src/core/ext/filters/client_channel/client_channel_channelz.cc @@ -18,15 +18,16 @@ #include -#include "src/core/ext/filters/client_channel/client_channel.h" #include "src/core/ext/filters/client_channel/client_channel_channelz.h" + +#include + +#include "src/core/ext/filters/client_channel/client_channel.h" #include "src/core/lib/channel/channelz_registry.h" #include "src/core/lib/gpr/useful.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/transport/connectivity_state.h" -#include - namespace grpc_core { namespace channelz { diff --git a/src/core/ext/filters/client_channel/client_channel_factory.cc b/src/core/ext/filters/client_channel/client_channel_factory.cc index c0d853ebe5f..caaf963a546 100644 --- a/src/core/ext/filters/client_channel/client_channel_factory.cc +++ b/src/core/ext/filters/client_channel/client_channel_factory.cc @@ -19,6 +19,7 @@ #include #include "src/core/ext/filters/client_channel/client_channel_factory.h" + #include "src/core/lib/channel/channel_args.h" // Channel arg key for client channel factory. diff --git a/src/core/ext/filters/client_channel/config_selector.cc b/src/core/ext/filters/client_channel/config_selector.cc index 0c2a08e5eb1..c631adba758 100644 --- a/src/core/ext/filters/client_channel/config_selector.cc +++ b/src/core/ext/filters/client_channel/config_selector.cc @@ -17,6 +17,7 @@ #include #include "src/core/ext/filters/client_channel/config_selector.h" + #include "src/core/lib/channel/channel_args.h" namespace grpc_core { diff --git a/src/core/ext/filters/client_channel/health/health_check_client.cc b/src/core/ext/filters/client_channel/health/health_check_client.cc index e3cbde7a3d1..d8f44552e0a 100644 --- a/src/core/ext/filters/client_channel/health/health_check_client.cc +++ b/src/core/ext/filters/client_channel/health/health_check_client.cc @@ -18,11 +18,11 @@ #include +#include "src/core/ext/filters/client_channel/health/health_check_client.h" + #include #include -#include "src/core/ext/filters/client_channel/health/health_check_client.h" - #include "upb/upb.hpp" #include "src/core/lib/debug/trace.h" diff --git a/src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc b/src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc index 0edf61db1bb..a307ce6fdc4 100644 --- a/src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc +++ b/src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc @@ -16,10 +16,10 @@ #include -#include - #include "src/core/ext/filters/client_channel/lb_policy/child_policy_handler.h" +#include + #include "absl/strings/str_cat.h" #include "src/core/ext/filters/client_channel/lb_policy_registry.h" diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc index 4283c60dc4a..95ec2088c99 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc @@ -53,8 +53,7 @@ #include -#include "src/core/lib/iomgr/sockaddr.h" -#include "src/core/lib/iomgr/socket_utils.h" +#include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h" #include #include @@ -65,7 +64,6 @@ #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" #include "absl/strings/strip.h" - #include "upb/upb.hpp" #include @@ -77,7 +75,6 @@ #include "src/core/ext/filters/client_channel/client_channel.h" #include "src/core/ext/filters/client_channel/lb_policy/child_policy_handler.h" #include "src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h" -#include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h" #include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.h" #include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h" #include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h" @@ -97,6 +94,7 @@ #include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/sockaddr.h" +#include "src/core/lib/iomgr/socket_utils.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_string_helpers.h" diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc index 07c5fd6fe9e..b8b4889ee47 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc @@ -18,10 +18,10 @@ #include -#include - #include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h" +#include + namespace grpc_core { grpc_channel_args* ModifyGrpclbBalancerChannelArgs(grpc_channel_args* args) { diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc index 837cc09bb6f..a4a67ea15d2 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc @@ -18,8 +18,6 @@ #include -#include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h" - #include #include "absl/container/inlined_vector.h" @@ -30,6 +28,7 @@ #include "src/core/ext/filters/client_channel/client_channel.h" #include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.h" +#include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h" #include "src/core/ext/filters/client_channel/server_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc index d4104ec53bc..e7b5d288651 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc @@ -22,11 +22,11 @@ #include +#include "absl/memory/memory.h" + #include #include -#include "absl/memory/memory.h" - #include "src/core/lib/gprpp/sync.h" namespace grpc_core { diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h index c369827d32f..a1d77bd2d6b 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h @@ -21,10 +21,10 @@ #include -#include - #include "absl/container/inlined_vector.h" +#include + #include "src/core/lib/gprpp/memory.h" #include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/gprpp/sync.h" diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc index 2ba01c1e835..6213a5b8c59 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc @@ -19,13 +19,14 @@ #include #include "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h" -#include "src/core/lib/gpr/useful.h" #include "google/protobuf/duration.upb.h" #include "google/protobuf/timestamp.upb.h" #include +#include "src/core/lib/gpr/useful.h" + namespace grpc_core { bool GrpcLbServer::operator==(const GrpcLbServer& other) const { diff --git a/src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc b/src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc index 8d033f2398a..cb291a3c92f 100644 --- a/src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc +++ b/src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc @@ -25,6 +25,7 @@ #include "xxhash.h" #include + #include "src/core/ext/filters/client_channel/lb_policy/subchannel_list.h" #include "src/core/ext/filters/client_channel/lb_policy_registry.h" #include "src/core/ext/filters/client_channel/subchannel.h" diff --git a/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h b/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h index b894c592c66..1593f163537 100644 --- a/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h +++ b/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h @@ -23,10 +23,10 @@ #include -#include - #include "absl/container/inlined_vector.h" +#include + #include "src/core/ext/filters/client_channel/lb_policy_registry.h" #include "src/core/ext/filters/client_channel/server_address.h" // TODO(roth): Should not need the include of subchannel.h here, since diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc index 1e4eb4fe72e..2e0de37b96d 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc @@ -24,14 +24,14 @@ #include #include +#include + #include "absl/container/inlined_vector.h" #include "absl/strings/str_cat.h" #include #include -#include - #include "src/core/ext/filters/client_channel/http_connect_handshaker.h" #include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.h" #include "src/core/ext/filters/client_channel/lb_policy_registry.h" diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h index 08069232b94..01fe1796613 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h @@ -22,6 +22,7 @@ #include #include + #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/work_serializer.h" diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc index 31de6799e1f..e25bd55b225 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc @@ -20,18 +20,19 @@ #include "src/core/lib/iomgr/port.h" #if GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER) -#include #include #include -#include "absl/strings/str_cat.h" +#include -#include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h" +#include "absl/strings/str_cat.h" #include #include #include #include + +#include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h" #include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/gpr/string.h" diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc index 0b4675fad5b..07a1b5304d9 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc @@ -20,16 +20,20 @@ #include "src/core/lib/iomgr/port.h" #if GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER) -#include "absl/strings/str_format.h" +#include #include +#include "absl/strings/str_format.h" + #include #include #include #include #include -#include + +#include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h" +#include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gprpp/memory.h" @@ -40,9 +44,6 @@ #include "src/core/lib/iomgr/work_serializer.h" #include "src/core/lib/slice/slice_internal.h" -#include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h" -#include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h" - /* TODO(apolcyn): remove this hack after fixing upstream. * Our grpc/c-ares code on Windows uses the ares_set_socket_functions API, * which uses "struct iovec" type, which on Windows is defined inside of diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc index 82dbb00e7ab..d64d32c1f0b 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc @@ -20,24 +20,23 @@ #if GRPC_ARES == 1 -#include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h" -#include "src/core/lib/iomgr/sockaddr.h" - #include #include +#include +#include + #include "absl/container/inlined_vector.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" -#include #include #include #include #include -#include #include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h" +#include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/gpr/string.h" @@ -46,6 +45,7 @@ #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/nameser.h" +#include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/transport/authority_override.h" diff --git a/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc b/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc index a2e1640ec19..b1ef2075dc1 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc @@ -19,6 +19,7 @@ #include #include + #include #include diff --git a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc index 7978d59e8b6..be447c346a0 100644 --- a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc @@ -19,6 +19,8 @@ #include +#include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h" + #include #include #include @@ -41,8 +43,6 @@ #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_string_helpers.h" -#include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h" - namespace grpc_core { // This cannot be in an anonymous namespace, because it is a friend of diff --git a/src/core/ext/filters/fault_injection/service_config_parser.cc b/src/core/ext/filters/fault_injection/service_config_parser.cc index e8c23e1903f..f6cce29071f 100644 --- a/src/core/ext/filters/fault_injection/service_config_parser.cc +++ b/src/core/ext/filters/fault_injection/service_config_parser.cc @@ -22,6 +22,7 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" + #include "src/core/ext/filters/client_channel/service_config.h" #include "src/core/ext/filters/fault_injection/fault_injection_filter.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/ext/filters/http/client/http_client_filter.cc b/src/core/ext/filters/http/client/http_client_filter.cc index 96434dd3648..a671d318720 100644 --- a/src/core/ext/filters/http/client/http_client_filter.cc +++ b/src/core/ext/filters/http/client/http_client_filter.cc @@ -17,6 +17,8 @@ #include +#include "src/core/ext/filters/http/client/http_client_filter.h" + #include #include @@ -30,7 +32,6 @@ #include #include -#include "src/core/ext/filters/http/client/http_client_filter.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gprpp/manual_constructor.h" #include "src/core/lib/profiling/timers.h" diff --git a/src/core/ext/filters/http/client_authority_filter.cc b/src/core/ext/filters/http/client_authority_filter.cc index f44ef853b4b..c1764ec5902 100644 --- a/src/core/ext/filters/http/client_authority_filter.cc +++ b/src/core/ext/filters/http/client_authority_filter.cc @@ -18,6 +18,8 @@ #include +#include "src/core/ext/filters/http/client_authority_filter.h" + #include #include #include @@ -26,7 +28,6 @@ #include #include -#include "src/core/ext/filters/http/client_authority_filter.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/slice/slice_internal.h" diff --git a/src/core/ext/filters/http/message_compress/message_compress_filter.cc b/src/core/ext/filters/http/message_compress/message_compress_filter.cc index 0fc85b1ea21..8359b1fc45d 100644 --- a/src/core/ext/filters/http/message_compress/message_compress_filter.cc +++ b/src/core/ext/filters/http/message_compress/message_compress_filter.cc @@ -18,6 +18,8 @@ #include +#include "src/core/ext/filters/http/message_compress/message_compress_filter.h" + #include #include @@ -28,7 +30,6 @@ #include #include -#include "src/core/ext/filters/http/message_compress/message_compress_filter.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/compression/algorithm_metadata.h" #include "src/core/lib/compression/compression_args.h" diff --git a/src/core/ext/filters/http/message_compress/message_decompress_filter.cc b/src/core/ext/filters/http/message_compress/message_decompress_filter.cc index 426dd9039d7..b1c0d77d995 100644 --- a/src/core/ext/filters/http/message_compress/message_decompress_filter.cc +++ b/src/core/ext/filters/http/message_compress/message_decompress_filter.cc @@ -24,13 +24,13 @@ #include #include "absl/strings/str_cat.h" +#include "absl/strings/str_format.h" #include #include #include #include -#include "absl/strings/str_format.h" #include "src/core/ext/filters/message_size/message_size_filter.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/compression/algorithm_metadata.h" diff --git a/src/core/ext/filters/http/server/http_server_filter.cc b/src/core/ext/filters/http/server/http_server_filter.cc index 9c8573cd2a0..e5996749405 100644 --- a/src/core/ext/filters/http/server/http_server_filter.cc +++ b/src/core/ext/filters/http/server/http_server_filter.cc @@ -20,9 +20,11 @@ #include "src/core/ext/filters/http/server/http_server_filter.h" +#include + #include #include -#include + #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/manual_constructor.h" #include "src/core/lib/profiling/timers.h" diff --git a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc index 2faf42dd8ee..2427bc18699 100644 --- a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc +++ b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc @@ -18,6 +18,8 @@ #include +#include "src/core/ext/filters/load_reporting/server_load_reporting_filter.h" + #include #include @@ -31,7 +33,6 @@ #include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h" #include "src/core/ext/filters/load_reporting/registered_opencensus_objects.h" -#include "src/core/ext/filters/load_reporting/server_load_reporting_filter.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/context.h" diff --git a/src/core/ext/transport/binder/client/channel_create.cc b/src/core/ext/transport/binder/client/channel_create.cc index 7078743c728..cfbe336d636 100644 --- a/src/core/ext/transport/binder/client/channel_create.cc +++ b/src/core/ext/transport/binder/client/channel_create.cc @@ -29,17 +29,20 @@ #ifdef GPR_SUPPORT_BINDER_TRANSPORT +#include + #include #include #include #include -#include -#include -#include #include "absl/memory/memory.h" #include "absl/time/clock.h" #include "absl/time/time.h" + +#include +#include + #include "src/core/ext/transport/binder/client/channel_create_impl.h" #include "src/core/ext/transport/binder/client/jni_utils.h" #include "src/core/ext/transport/binder/transport/binder_transport.h" diff --git a/src/core/ext/transport/binder/client/channel_create.h b/src/core/ext/transport/binder/client/channel_create.h index 55ec0416fbf..e53ccc452fe 100644 --- a/src/core/ext/transport/binder/client/channel_create.h +++ b/src/core/ext/transport/binder/client/channel_create.h @@ -19,14 +19,16 @@ #ifdef GPR_ANDROID -#include #include -#include -#include + #include #include "absl/strings/string_view.h" +#include +#include +#include + namespace grpc { namespace experimental { diff --git a/src/core/ext/transport/binder/server/binder_server.cc b/src/core/ext/transport/binder/server/binder_server.cc index 6d783a08e40..dae27d31a1e 100644 --- a/src/core/ext/transport/binder/server/binder_server.cc +++ b/src/core/ext/transport/binder/server/binder_server.cc @@ -14,13 +14,16 @@ #include -#include +#include "src/core/ext/transport/binder/server/binder_server.h" + #include #include #include #include "absl/memory/memory.h" -#include "src/core/ext/transport/binder/server/binder_server.h" + +#include + #include "src/core/ext/transport/binder/transport/binder_transport.h" #include "src/core/ext/transport/binder/wire_format/binder_android.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/ext/transport/binder/server/binder_server.h b/src/core/ext/transport/binder/server/binder_server.h index c02429f3d10..66cbb81b716 100644 --- a/src/core/ext/transport/binder/server/binder_server.h +++ b/src/core/ext/transport/binder/server/binder_server.h @@ -21,6 +21,7 @@ #include "absl/container/flat_hash_map.h" #include "absl/status/status.h" + #include "src/core/ext/transport/binder/transport/binder_transport.h" #include "src/core/ext/transport/binder/wire_format/binder.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/ext/transport/binder/transport/binder_transport.cc b/src/core/ext/transport/binder/transport/binder_transport.cc index 8944d72220e..ce3aca16761 100644 --- a/src/core/ext/transport/binder/transport/binder_transport.cc +++ b/src/core/ext/transport/binder/transport/binder_transport.cc @@ -12,13 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include +#include #include "src/core/ext/transport/binder/transport/binder_transport.h" -#include -#include - #include #include #include @@ -27,6 +24,9 @@ #include "absl/memory/memory.h" #include "absl/strings/str_cat.h" #include "absl/strings/substitute.h" + +#include + #include "src/core/ext/transport/binder/transport/binder_stream.h" #include "src/core/ext/transport/binder/utils/transport_stream_receiver.h" #include "src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h" diff --git a/src/core/ext/transport/binder/transport/binder_transport.h b/src/core/ext/transport/binder/transport/binder_transport.h index c5813a494ec..fd842d0ff72 100644 --- a/src/core/ext/transport/binder/transport/binder_transport.h +++ b/src/core/ext/transport/binder/transport/binder_transport.h @@ -17,13 +17,13 @@ #include -#include - #include #include #include #include +#include + #include "src/core/ext/transport/binder/utils/transport_stream_receiver.h" #include "src/core/ext/transport/binder/wire_format/binder.h" #include "src/core/ext/transport/binder/wire_format/wire_reader.h" diff --git a/src/core/ext/transport/binder/utils/transport_stream_receiver.h b/src/core/ext/transport/binder/utils/transport_stream_receiver.h index 53b7d1dccaf..3e209bf36d5 100644 --- a/src/core/ext/transport/binder/utils/transport_stream_receiver.h +++ b/src/core/ext/transport/binder/utils/transport_stream_receiver.h @@ -22,6 +22,7 @@ #include #include "absl/status/statusor.h" + #include "src/core/ext/transport/binder/wire_format/transaction.h" namespace grpc_binder { diff --git a/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc b/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc index 91f60276c99..14e10112549 100644 --- a/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc +++ b/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc @@ -16,12 +16,12 @@ #include "src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h" -#include - #include #include #include +#include + namespace grpc_binder { const absl::string_view diff --git a/src/core/ext/transport/binder/wire_format/binder.h b/src/core/ext/transport/binder/wire_format/binder.h index 08d40707f3c..86907f46912 100644 --- a/src/core/ext/transport/binder/wire_format/binder.h +++ b/src/core/ext/transport/binder/wire_format/binder.h @@ -24,6 +24,7 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" + #include "src/core/ext/transport/binder/wire_format/binder_constants.h" #include "src/core/lib/gprpp/orphanable.h" diff --git a/src/core/ext/transport/binder/wire_format/binder_android.cc b/src/core/ext/transport/binder/wire_format/binder_android.cc index 755c8cad585..80d6b6b3a54 100644 --- a/src/core/ext/transport/binder/wire_format/binder_android.cc +++ b/src/core/ext/transport/binder/wire_format/binder_android.cc @@ -16,13 +16,14 @@ #ifdef GPR_SUPPORT_BINDER_TRANSPORT -#include "src/core/ext/transport/binder/wire_format/binder_android.h" - -#include #include #include "absl/memory/memory.h" #include "absl/strings/str_cat.h" + +#include + +#include "src/core/ext/transport/binder/wire_format/binder_android.h" #include "src/core/lib/gprpp/sync.h" // TODO(mingcl): This function is introduced at API level 32 and is not diff --git a/src/core/ext/transport/binder/wire_format/binder_android.h b/src/core/ext/transport/binder/wire_format/binder_android.h index 0ad081144b4..4153aefcdfe 100644 --- a/src/core/ext/transport/binder/wire_format/binder_android.h +++ b/src/core/ext/transport/binder/wire_format/binder_android.h @@ -28,6 +28,7 @@ #include #include "absl/memory/memory.h" + #include "src/core/ext/transport/binder/wire_format/binder.h" #include "src/core/ext/transport/binder/wire_format/wire_reader.h" diff --git a/src/core/ext/transport/binder/wire_format/transaction.h b/src/core/ext/transport/binder/wire_format/transaction.h index 2a976b6e084..48eed73d37b 100644 --- a/src/core/ext/transport/binder/wire_format/transaction.h +++ b/src/core/ext/transport/binder/wire_format/transaction.h @@ -17,13 +17,13 @@ #include -#include - #include #include #include "absl/strings/string_view.h" +#include + namespace grpc_binder { ABSL_CONST_INIT extern const int kFlagPrefix; diff --git a/src/core/ext/transport/binder/wire_format/wire_reader_impl.cc b/src/core/ext/transport/binder/wire_format/wire_reader_impl.cc index 1ded5f0d750..9a41d032e04 100644 --- a/src/core/ext/transport/binder/wire_format/wire_reader_impl.cc +++ b/src/core/ext/transport/binder/wire_format/wire_reader_impl.cc @@ -16,8 +16,6 @@ #include "src/core/ext/transport/binder/wire_format/wire_reader_impl.h" -#include - #include #include #include @@ -26,6 +24,9 @@ #include "absl/memory/memory.h" #include "absl/status/statusor.h" + +#include + #include "src/core/ext/transport/binder/utils/transport_stream_receiver.h" #include "src/core/ext/transport/binder/wire_format/binder.h" #include "src/core/ext/transport/binder/wire_format/wire_writer.h" diff --git a/src/core/ext/transport/binder/wire_format/wire_reader_impl.h b/src/core/ext/transport/binder/wire_format/wire_reader_impl.h index ebbf1817822..89c4132f8f1 100644 --- a/src/core/ext/transport/binder/wire_format/wire_reader_impl.h +++ b/src/core/ext/transport/binder/wire_format/wire_reader_impl.h @@ -22,6 +22,7 @@ #include "absl/container/flat_hash_map.h" #include "absl/synchronization/notification.h" + #include "src/core/ext/transport/binder/utils/transport_stream_receiver.h" #include "src/core/ext/transport/binder/wire_format/binder.h" #include "src/core/ext/transport/binder/wire_format/wire_reader.h" diff --git a/src/core/ext/transport/binder/wire_format/wire_writer.cc b/src/core/ext/transport/binder/wire_format/wire_writer.cc index 830e6ac817e..defb702aef2 100644 --- a/src/core/ext/transport/binder/wire_format/wire_writer.cc +++ b/src/core/ext/transport/binder/wire_format/wire_writer.cc @@ -16,10 +16,10 @@ #include "src/core/ext/transport/binder/wire_format/wire_writer.h" -#include - #include +#include + #define RETURN_IF_ERROR(expr) \ do { \ const absl::Status status = (expr); \ diff --git a/src/core/ext/transport/binder/wire_format/wire_writer.h b/src/core/ext/transport/binder/wire_format/wire_writer.h index 74ddcfb6a87..578d0ae414c 100644 --- a/src/core/ext/transport/binder/wire_format/wire_writer.h +++ b/src/core/ext/transport/binder/wire_format/wire_writer.h @@ -17,11 +17,11 @@ #include -#include - #include #include +#include + #include "src/core/ext/transport/binder/wire_format/binder.h" #include "src/core/ext/transport/binder/wire_format/transaction.h" #include "src/core/lib/gprpp/sync.h" diff --git a/src/core/ext/transport/chttp2/alpn/alpn.cc b/src/core/ext/transport/chttp2/alpn/alpn.cc index 1fdab76dbf0..33f762760a8 100644 --- a/src/core/ext/transport/chttp2/alpn/alpn.cc +++ b/src/core/ext/transport/chttp2/alpn/alpn.cc @@ -18,9 +18,10 @@ #include -#include #include "src/core/ext/transport/chttp2/alpn/alpn.h" +#include + #include "src/core/lib/gpr/useful.h" /* in order of preference */ diff --git a/src/core/ext/transport/chttp2/client/chttp2_connector.cc b/src/core/ext/transport/chttp2/client/chttp2_connector.cc index aac37820b66..9e0ebc45c4d 100644 --- a/src/core/ext/transport/chttp2/client/chttp2_connector.cc +++ b/src/core/ext/transport/chttp2/client/chttp2_connector.cc @@ -20,10 +20,9 @@ #include "src/core/ext/transport/chttp2/client/chttp2_connector.h" -#include - #include +#include #include #include #include diff --git a/src/core/ext/transport/chttp2/client/insecure/channel_create.cc b/src/core/ext/transport/chttp2/client/insecure/channel_create.cc index 910932429a4..40b3f6de220 100644 --- a/src/core/ext/transport/chttp2/client/insecure/channel_create.cc +++ b/src/core/ext/transport/chttp2/client/insecure/channel_create.cc @@ -18,10 +18,9 @@ #include -#include - #include +#include #include #include diff --git a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc index 191f7981f6d..e6fccf66964 100644 --- a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc +++ b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc @@ -18,10 +18,9 @@ #include -#include - #include +#include #include #include diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc index 5021d86e4ff..ed5f2146244 100644 --- a/src/core/ext/transport/chttp2/server/chttp2_server.cc +++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc @@ -23,6 +23,7 @@ #include #include #include + #include #include "absl/strings/match.h" diff --git a/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc b/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc index e00bc927cf1..56588a37aaf 100644 --- a/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc +++ b/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc @@ -19,7 +19,6 @@ #include #include - #include #include "src/core/ext/transport/chttp2/server/chttp2_server.h" diff --git a/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc b/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc index f0a0eed9193..ea308d2fbaa 100644 --- a/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc +++ b/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc @@ -27,7 +27,6 @@ #include #include "src/core/ext/transport/chttp2/server/chttp2_server.h" - #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/handshaker.h" diff --git a/src/core/ext/transport/chttp2/transport/bin_decoder.cc b/src/core/ext/transport/chttp2/transport/bin_decoder.cc index f8d5778d4ea..4be4cc2579b 100644 --- a/src/core/ext/transport/chttp2/transport/bin_decoder.cc +++ b/src/core/ext/transport/chttp2/transport/bin_decoder.cc @@ -18,9 +18,11 @@ #include +#include "src/core/ext/transport/chttp2/transport/bin_decoder.h" + #include #include -#include "src/core/ext/transport/chttp2/transport/bin_decoder.h" + #include "src/core/lib/gpr/string.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_string_helpers.h" diff --git a/src/core/ext/transport/chttp2/transport/bin_decoder.h b/src/core/ext/transport/chttp2/transport/bin_decoder.h index 1cbca033a1f..a2d614207f9 100644 --- a/src/core/ext/transport/chttp2/transport/bin_decoder.h +++ b/src/core/ext/transport/chttp2/transport/bin_decoder.h @@ -21,9 +21,10 @@ #include -#include #include +#include + struct grpc_base64_decode_context { /* input/output: */ const uint8_t* input_cur; diff --git a/src/core/ext/transport/chttp2/transport/bin_encoder.cc b/src/core/ext/transport/chttp2/transport/bin_encoder.cc index ba39bbdbe33..cd92f726aa4 100644 --- a/src/core/ext/transport/chttp2/transport/bin_encoder.cc +++ b/src/core/ext/transport/chttp2/transport/bin_encoder.cc @@ -23,6 +23,7 @@ #include #include + #include "src/core/ext/transport/chttp2/transport/huffsyms.h" static const char alphabet[] = diff --git a/src/core/ext/transport/chttp2/transport/chttp2_slice_allocator.cc b/src/core/ext/transport/chttp2/transport/chttp2_slice_allocator.cc index f0759def0eb..05742ce2f1d 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_slice_allocator.cc +++ b/src/core/ext/transport/chttp2/transport/chttp2_slice_allocator.cc @@ -13,14 +13,15 @@ // limitations under the License. #include -#include +#include "src/core/ext/transport/chttp2/transport/chttp2_slice_allocator.h" #include #include "absl/memory/memory.h" #include "absl/status/status.h" -#include "src/core/ext/transport/chttp2/transport/chttp2_slice_allocator.h" +#include + #include "src/core/lib/iomgr/resource_quota.h" namespace grpc_event_engine { diff --git a/src/core/ext/transport/chttp2/transport/chttp2_slice_allocator.h b/src/core/ext/transport/chttp2/transport/chttp2_slice_allocator.h index 2b41533f8ad..01b7d7736ec 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_slice_allocator.h +++ b/src/core/ext/transport/chttp2/transport/chttp2_slice_allocator.h @@ -16,12 +16,12 @@ #include -#include - #include #include "absl/status/status.h" +#include + #include "src/core/lib/iomgr/resource_quota.h" namespace grpc_event_engine { diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc index b3edb8cc052..80b1d31eb7b 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc @@ -18,18 +18,18 @@ #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" +#include +#include +#include +#include +#include + #include "absl/strings/str_format.h" #include #include #include -#include #include -#include -#include -#include -#include -#include #include "src/core/ext/transport/chttp2/transport/context_list.h" #include "src/core/ext/transport/chttp2/transport/frame_data.h" diff --git a/src/core/ext/transport/chttp2/transport/context_list.h b/src/core/ext/transport/chttp2/transport/context_list.h index 54ec87c67ff..0e39ff1155d 100644 --- a/src/core/ext/transport/chttp2/transport/context_list.h +++ b/src/core/ext/transport/chttp2/transport/context_list.h @@ -21,9 +21,8 @@ #include -#include "src/core/lib/iomgr/buffer_list.h" - #include "src/core/ext/transport/chttp2/transport/internal.h" +#include "src/core/lib/iomgr/buffer_list.h" namespace grpc_core { /** A list of RPC Contexts */ diff --git a/src/core/ext/transport/chttp2/transport/frame_data.cc b/src/core/ext/transport/chttp2/transport/frame_data.cc index 0787968a871..b17913e1481 100644 --- a/src/core/ext/transport/chttp2/transport/frame_data.cc +++ b/src/core/ext/transport/chttp2/transport/frame_data.cc @@ -26,6 +26,7 @@ #include #include + #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gprpp/memory.h" diff --git a/src/core/ext/transport/chttp2/transport/frame_data.h b/src/core/ext/transport/chttp2/transport/frame_data.h index 5aa4a3e7e80..6690e5f3098 100644 --- a/src/core/ext/transport/chttp2/transport/frame_data.h +++ b/src/core/ext/transport/chttp2/transport/frame_data.h @@ -25,6 +25,7 @@ #include #include + #include "src/core/ext/transport/chttp2/transport/frame.h" #include "src/core/lib/transport/byte_stream.h" #include "src/core/lib/transport/transport.h" diff --git a/src/core/ext/transport/chttp2/transport/frame_goaway.cc b/src/core/ext/transport/chttp2/transport/frame_goaway.cc index ebd499a4a5a..d232c7b2dbb 100644 --- a/src/core/ext/transport/chttp2/transport/frame_goaway.cc +++ b/src/core/ext/transport/chttp2/transport/frame_goaway.cc @@ -19,7 +19,6 @@ #include #include "src/core/ext/transport/chttp2/transport/frame_goaway.h" -#include "src/core/ext/transport/chttp2/transport/internal.h" #include @@ -28,6 +27,8 @@ #include #include +#include "src/core/ext/transport/chttp2/transport/internal.h" + void grpc_chttp2_goaway_parser_init(grpc_chttp2_goaway_parser* p) { p->debug_data = nullptr; } diff --git a/src/core/ext/transport/chttp2/transport/frame_goaway.h b/src/core/ext/transport/chttp2/transport/frame_goaway.h index 674f7423091..2ceb6202424 100644 --- a/src/core/ext/transport/chttp2/transport/frame_goaway.h +++ b/src/core/ext/transport/chttp2/transport/frame_goaway.h @@ -23,6 +23,7 @@ #include #include + #include "src/core/ext/transport/chttp2/transport/frame.h" typedef enum { diff --git a/src/core/ext/transport/chttp2/transport/frame_ping.cc b/src/core/ext/transport/chttp2/transport/frame_ping.cc index 9da4a72af99..d3bcb49412c 100644 --- a/src/core/ext/transport/chttp2/transport/frame_ping.cc +++ b/src/core/ext/transport/chttp2/transport/frame_ping.cc @@ -19,7 +19,6 @@ #include #include "src/core/ext/transport/chttp2/transport/frame_ping.h" -#include "src/core/ext/transport/chttp2/transport/internal.h" #include @@ -28,6 +27,8 @@ #include #include +#include "src/core/ext/transport/chttp2/transport/internal.h" + static bool g_disable_ping_ack = false; grpc_slice grpc_chttp2_ping_create(uint8_t ack, uint64_t opaque_8bytes) { diff --git a/src/core/ext/transport/chttp2/transport/frame_ping.h b/src/core/ext/transport/chttp2/transport/frame_ping.h index 6b5318e9dbb..c878cff851b 100644 --- a/src/core/ext/transport/chttp2/transport/frame_ping.h +++ b/src/core/ext/transport/chttp2/transport/frame_ping.h @@ -22,6 +22,7 @@ #include #include + #include "src/core/ext/transport/chttp2/transport/frame.h" struct grpc_chttp2_ping_parser { diff --git a/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc b/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc index 03a7c61d569..de317dfdbbe 100644 --- a/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc +++ b/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc @@ -19,7 +19,6 @@ #include #include "src/core/ext/transport/chttp2/transport/frame_rst_stream.h" -#include "src/core/ext/transport/chttp2/transport/internal.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" @@ -28,6 +27,7 @@ #include #include "src/core/ext/transport/chttp2/transport/frame.h" +#include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/lib/gprpp/memory.h" #include "src/core/lib/transport/http2_errors.h" diff --git a/src/core/ext/transport/chttp2/transport/frame_rst_stream.h b/src/core/ext/transport/chttp2/transport/frame_rst_stream.h index 865e74d9f8e..6581317617e 100644 --- a/src/core/ext/transport/chttp2/transport/frame_rst_stream.h +++ b/src/core/ext/transport/chttp2/transport/frame_rst_stream.h @@ -22,6 +22,7 @@ #include #include + #include "src/core/ext/transport/chttp2/transport/frame.h" #include "src/core/lib/transport/transport.h" diff --git a/src/core/ext/transport/chttp2/transport/frame_settings.cc b/src/core/ext/transport/chttp2/transport/frame_settings.cc index d38ddbdd39d..ab886622ab7 100644 --- a/src/core/ext/transport/chttp2/transport/frame_settings.cc +++ b/src/core/ext/transport/chttp2/transport/frame_settings.cc @@ -19,7 +19,6 @@ #include #include "src/core/ext/transport/chttp2/transport/frame_settings.h" -#include "src/core/ext/transport/chttp2/transport/internal.h" #include @@ -30,6 +29,7 @@ #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/ext/transport/chttp2/transport/frame.h" +#include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/transport/http2_errors.h" diff --git a/src/core/ext/transport/chttp2/transport/frame_settings.h b/src/core/ext/transport/chttp2/transport/frame_settings.h index 7268277aba5..9ec116b7280 100644 --- a/src/core/ext/transport/chttp2/transport/frame_settings.h +++ b/src/core/ext/transport/chttp2/transport/frame_settings.h @@ -22,6 +22,7 @@ #include #include + #include "src/core/ext/transport/chttp2/transport/frame.h" #include "src/core/ext/transport/chttp2/transport/http2_settings.h" diff --git a/src/core/ext/transport/chttp2/transport/frame_window_update.cc b/src/core/ext/transport/chttp2/transport/frame_window_update.cc index 136119611bb..335b1c39e99 100644 --- a/src/core/ext/transport/chttp2/transport/frame_window_update.cc +++ b/src/core/ext/transport/chttp2/transport/frame_window_update.cc @@ -19,7 +19,6 @@ #include #include "src/core/ext/transport/chttp2/transport/frame_window_update.h" -#include "src/core/ext/transport/chttp2/transport/internal.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" @@ -27,6 +26,8 @@ #include #include +#include "src/core/ext/transport/chttp2/transport/internal.h" + grpc_slice grpc_chttp2_window_update_create( uint32_t id, uint32_t window_delta, grpc_transport_one_way_stats* stats) { static const size_t frame_size = 13; diff --git a/src/core/ext/transport/chttp2/transport/frame_window_update.h b/src/core/ext/transport/chttp2/transport/frame_window_update.h index 5a07b9e5921..ea414d7a8d7 100644 --- a/src/core/ext/transport/chttp2/transport/frame_window_update.h +++ b/src/core/ext/transport/chttp2/transport/frame_window_update.h @@ -22,6 +22,7 @@ #include #include + #include "src/core/ext/transport/chttp2/transport/frame.h" #include "src/core/lib/transport/transport.h" diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc index ed7e5477367..e45508885a4 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc @@ -27,7 +27,6 @@ * TODO(murgatroid99): Remove this */ #include - #include #include diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder.h b/src/core/ext/transport/chttp2/transport/hpack_encoder.h index 6bde2d6fcbe..b2b4ee32116 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_encoder.h +++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.h @@ -23,6 +23,7 @@ #include #include + #include "src/core/ext/transport/chttp2/transport/frame.h" #include "src/core/ext/transport/chttp2/transport/hpack_encoder_index.h" #include "src/core/ext/transport/chttp2/transport/hpack_encoder_table.h" diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder_table.cc b/src/core/ext/transport/chttp2/transport/hpack_encoder_table.cc index eb08574233f..bfe152a91f5 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_encoder_table.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_encoder_table.cc @@ -14,10 +14,10 @@ #include -#include - #include "src/core/ext/transport/chttp2/transport/hpack_encoder_table.h" +#include + namespace grpc_core { uint32_t HPackEncoderTable::AllocateIndex(size_t element_size) { diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder_table.h b/src/core/ext/transport/chttp2/transport/hpack_encoder_table.h index 6d43ce06479..ca66923fc00 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_encoder_table.h +++ b/src/core/ext/transport/chttp2/transport/hpack_encoder_table.h @@ -18,6 +18,7 @@ #include #include "absl/container/inlined_vector.h" + #include "src/core/ext/transport/chttp2/transport/hpack_constants.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.cc b/src/core/ext/transport/chttp2/transport/hpack_parser.cc index d727b6cf2dd..ee2f3d5453c 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parser.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_parser.cc @@ -19,7 +19,6 @@ #include #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" -#include "src/core/ext/transport/chttp2/transport/internal.h" #include #include @@ -32,6 +31,7 @@ #include #include "src/core/ext/transport/chttp2/transport/bin_encoder.h" +#include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/lib/debug/stats.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gprpp/match.h" diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser_table.h b/src/core/ext/transport/chttp2/transport/hpack_parser_table.h index 0cf09dc930a..c1bdf6b831a 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parser_table.h +++ b/src/core/ext/transport/chttp2/transport/hpack_parser_table.h @@ -22,6 +22,7 @@ #include #include + #include "src/core/ext/transport/chttp2/transport/hpack_constants.h" #include "src/core/lib/gprpp/memory.h" #include "src/core/lib/iomgr/error.h" diff --git a/src/core/ext/transport/chttp2/transport/hpack_utils.cc b/src/core/ext/transport/chttp2/transport/hpack_utils.cc index c4511cedc29..fb1d2cb21b5 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_utils.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_utils.cc @@ -15,6 +15,7 @@ #include #include "src/core/ext/transport/chttp2/transport/hpack_utils.h" + #include "src/core/lib/surface/validate_metadata.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/transport/incoming_metadata.cc b/src/core/ext/transport/chttp2/transport/incoming_metadata.cc index 361b7b7ee0b..c803d79d3fe 100644 --- a/src/core/ext/transport/chttp2/transport/incoming_metadata.cc +++ b/src/core/ext/transport/chttp2/transport/incoming_metadata.cc @@ -22,11 +22,11 @@ #include -#include "src/core/ext/transport/chttp2/transport/internal.h" - #include #include +#include "src/core/ext/transport/chttp2/transport/internal.h" + grpc_error_handle grpc_chttp2_incoming_metadata_buffer_add( grpc_chttp2_incoming_metadata_buffer* buffer, grpc_mdelem elem) { buffer->size += GRPC_MDELEM_LENGTH(elem); diff --git a/src/core/ext/transport/chttp2/transport/parsing.cc b/src/core/ext/transport/chttp2/transport/parsing.cc index 2b9fb6bba95..02587458fa6 100644 --- a/src/core/ext/transport/chttp2/transport/parsing.cc +++ b/src/core/ext/transport/chttp2/transport/parsing.cc @@ -18,8 +18,6 @@ #include -#include "src/core/ext/transport/chttp2/transport/internal.h" - #include #include "absl/strings/str_cat.h" @@ -28,6 +26,7 @@ #include #include +#include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/lib/profiling/timers.h" #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/lib/slice/slice_utils.h" diff --git a/src/core/ext/transport/chttp2/transport/popularity_count.h b/src/core/ext/transport/chttp2/transport/popularity_count.h index 1a255bbc924..1e2c28e0a3e 100644 --- a/src/core/ext/transport/chttp2/transport/popularity_count.h +++ b/src/core/ext/transport/chttp2/transport/popularity_count.h @@ -17,8 +17,6 @@ #include -#include - namespace grpc_core { // filter tables for elems: this tables provides an approximate diff --git a/src/core/ext/transport/chttp2/transport/stream_lists.cc b/src/core/ext/transport/chttp2/transport/stream_lists.cc index db79899dedc..9c3c3e69220 100644 --- a/src/core/ext/transport/chttp2/transport/stream_lists.cc +++ b/src/core/ext/transport/chttp2/transport/stream_lists.cc @@ -18,11 +18,11 @@ #include +#include + #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/ext/transport/chttp2/transport/internal.h" -#include - static const char* stream_list_id_string(grpc_chttp2_stream_list_id id) { switch (id) { case GRPC_CHTTP2_LIST_WRITABLE: diff --git a/src/core/ext/transport/chttp2/transport/writing.cc b/src/core/ext/transport/chttp2/transport/writing.cc index d5e7248c6b0..ccd694454bf 100644 --- a/src/core/ext/transport/chttp2/transport/writing.cc +++ b/src/core/ext/transport/chttp2/transport/writing.cc @@ -18,14 +18,13 @@ #include -#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" -#include "src/core/ext/transport/chttp2/transport/context_list.h" -#include "src/core/ext/transport/chttp2/transport/internal.h" - #include #include +#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" +#include "src/core/ext/transport/chttp2/transport/context_list.h" +#include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/lib/compression/stream_compression.h" #include "src/core/lib/debug/stats.h" #include "src/core/lib/profiling/timers.h" diff --git a/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc b/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc index 59493221454..b379a4d284c 100644 --- a/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc +++ b/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc @@ -18,13 +18,14 @@ #include +#include "src/core/ext/transport/cronet/client/secure/cronet_channel_create.h" + #include #include #include #include -#include "src/core/ext/transport/cronet/client/secure/cronet_channel_create.h" #include "src/core/ext/transport/cronet/transport/cronet_transport.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/transport/transport_impl.h" diff --git a/src/core/ext/transport/cronet/transport/cronet_api_phony.cc b/src/core/ext/transport/cronet/transport/cronet_api_phony.cc index 3063d06f6d1..0499112b9c2 100644 --- a/src/core/ext/transport/cronet/transport/cronet_api_phony.cc +++ b/src/core/ext/transport/cronet/transport/cronet_api_phony.cc @@ -23,10 +23,10 @@ library, so we can build it in all environments */ #include -#include - #include "third_party/objective_c/Cronet/bidirectional_stream_c.h" +#include + #ifdef GRPC_COMPILE_WITH_CRONET /* link with the real CRONET library in the build system */ #else diff --git a/src/core/ext/transport/cronet/transport/cronet_transport.cc b/src/core/ext/transport/cronet/transport/cronet_transport.cc index 061b2e0916f..762bd7dff89 100644 --- a/src/core/ext/transport/cronet/transport/cronet_transport.cc +++ b/src/core/ext/transport/cronet/transport/cronet_transport.cc @@ -18,12 +18,15 @@ #include +#include "src/core/ext/transport/cronet/transport/cronet_transport.h" + #include #include #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" +#include "third_party/objective_c/Cronet/bidirectional_stream_c.h" #include #include @@ -33,7 +36,6 @@ #include "src/core/ext/transport/chttp2/transport/bin_encoder.h" #include "src/core/ext/transport/chttp2/transport/incoming_metadata.h" #include "src/core/ext/transport/cronet/transport/cronet_status.h" -#include "src/core/ext/transport/cronet/transport/cronet_transport.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gprpp/manual_constructor.h" @@ -48,8 +50,6 @@ #include "src/core/lib/transport/timeout_encoding.h" #include "src/core/lib/transport/transport_impl.h" -#include "third_party/objective_c/Cronet/bidirectional_stream_c.h" - #define GRPC_HEADER_SIZE_IN_BYTES 5 #define GRPC_FLUSH_READ_SIZE 4096 diff --git a/src/core/ext/transport/inproc/inproc_transport.cc b/src/core/ext/transport/inproc/inproc_transport.cc index ef43bdadb30..bbe62e5692d 100644 --- a/src/core/ext/transport/inproc/inproc_transport.cc +++ b/src/core/ext/transport/inproc/inproc_transport.cc @@ -18,12 +18,15 @@ #include +#include "src/core/ext/transport/inproc/inproc_transport.h" + +#include + #include #include #include #include -#include -#include "src/core/ext/transport/inproc/inproc_transport.h" + #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/manual_constructor.h" #include "src/core/lib/slice/slice_internal.h" diff --git a/src/core/ext/xds/certificate_provider_registry.cc b/src/core/ext/xds/certificate_provider_registry.cc index 0d7950d5686..2b1780c1568 100644 --- a/src/core/ext/xds/certificate_provider_registry.cc +++ b/src/core/ext/xds/certificate_provider_registry.cc @@ -18,10 +18,10 @@ #include -#include "absl/container/inlined_vector.h" - #include "src/core/ext/xds/certificate_provider_registry.h" +#include "absl/container/inlined_vector.h" + namespace grpc_core { namespace { diff --git a/src/core/ext/xds/xds_api.cc b/src/core/ext/xds/xds_api.cc index 67bf1ed69f3..1c3148eb486 100644 --- a/src/core/ext/xds/xds_api.cc +++ b/src/core/ext/xds/xds_api.cc @@ -18,6 +18,8 @@ #include +#include "src/core/ext/xds/xds_api.h" + #include #include #include @@ -89,7 +91,6 @@ #include #include -#include "src/core/ext/xds/xds_api.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/gpr/env.h" #include "src/core/lib/gpr/string.h" diff --git a/src/core/ext/xds/xds_api.h b/src/core/ext/xds/xds_api.h index d3fd9c14b6e..46aa42117ae 100644 --- a/src/core/ext/xds/xds_api.h +++ b/src/core/ext/xds/xds_api.h @@ -27,13 +27,12 @@ #include "absl/container/inlined_vector.h" #include "absl/types/optional.h" +#include "envoy/admin/v3/config_dump.upb.h" #include "re2/re2.h" - #include "upb/def.hpp" #include -#include "envoy/admin/v3/config_dump.upb.h" #include "src/core/ext/filters/client_channel/server_address.h" #include "src/core/ext/xds/xds_bootstrap.h" #include "src/core/ext/xds/xds_client_stats.h" diff --git a/src/core/ext/xds/xds_bootstrap.cc b/src/core/ext/xds/xds_bootstrap.cc index d64ab35cc92..3d227f54361 100644 --- a/src/core/ext/xds/xds_bootstrap.cc +++ b/src/core/ext/xds/xds_bootstrap.cc @@ -18,11 +18,11 @@ #include "src/core/ext/xds/xds_bootstrap.h" -#include - #include #include +#include + #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" diff --git a/src/core/ext/xds/xds_client.cc b/src/core/ext/xds/xds_client.cc index 4715a231d69..5e1d2b073f8 100644 --- a/src/core/ext/xds/xds_client.cc +++ b/src/core/ext/xds/xds_client.cc @@ -16,6 +16,8 @@ #include +#include "src/core/ext/xds/xds_client.h" + #include #include #include @@ -35,7 +37,6 @@ #include "src/core/ext/xds/xds_api.h" #include "src/core/ext/xds/xds_bootstrap.h" #include "src/core/ext/xds/xds_channel_args.h" -#include "src/core/ext/xds/xds_client.h" #include "src/core/ext/xds/xds_client_stats.h" #include "src/core/ext/xds/xds_http_filters.h" #include "src/core/lib/address_utils/sockaddr_utils.h" diff --git a/src/core/ext/xds/xds_http_fault_filter.cc b/src/core/ext/xds/xds_http_fault_filter.cc index 64b7a2b47af..b545b99bb0b 100644 --- a/src/core/ext/xds/xds_http_fault_filter.cc +++ b/src/core/ext/xds/xds_http_fault_filter.cc @@ -18,8 +18,6 @@ #include "src/core/ext/xds/xds_http_fault_filter.h" -#include - #include #include "absl/status/statusor.h" @@ -33,6 +31,10 @@ #include "google/protobuf/any.upb.h" #include "google/protobuf/duration.upb.h" #include "google/protobuf/wrappers.upb.h" +#include "upb/def.h" + +#include + #include "src/core/ext/filters/fault_injection/fault_injection_filter.h" #include "src/core/ext/xds/xds_http_filters.h" #include "src/core/lib/channel/channel_args.h" @@ -40,7 +42,6 @@ #include "src/core/lib/channel/status_util.h" #include "src/core/lib/json/json.h" #include "src/core/lib/transport/status_conversion.h" -#include "upb/def.h" namespace grpc_core { diff --git a/src/core/ext/xds/xds_http_fault_filter.h b/src/core/ext/xds/xds_http_fault_filter.h index 60c49524328..8ba4054e527 100644 --- a/src/core/ext/xds/xds_http_fault_filter.h +++ b/src/core/ext/xds/xds_http_fault_filter.h @@ -19,11 +19,12 @@ #include +#include "absl/status/statusor.h" +#include "upb/def.h" + #include -#include "absl/status/statusor.h" #include "src/core/ext/xds/xds_http_filters.h" -#include "upb/def.h" namespace grpc_core { diff --git a/src/core/ext/xds/xds_http_filters.cc b/src/core/ext/xds/xds_http_filters.cc index 4cf95eb2bdb..4f79336cf3c 100644 --- a/src/core/ext/xds/xds_http_filters.cc +++ b/src/core/ext/xds/xds_http_filters.cc @@ -20,6 +20,7 @@ #include "envoy/extensions/filters/http/router/v3/router.upb.h" #include "envoy/extensions/filters/http/router/v3/router.upbdefs.h" + #include "src/core/ext/xds/xds_http_fault_filter.h" namespace grpc_core { diff --git a/src/core/lib/channel/channel_args.cc b/src/core/lib/channel/channel_args.cc index a383e5a05a5..a1da9c32049 100644 --- a/src/core/lib/channel/channel_args.cc +++ b/src/core/lib/channel/channel_args.cc @@ -18,6 +18,8 @@ #include +#include "src/core/lib/channel/channel_args.h" + #include #include @@ -33,7 +35,6 @@ #include #include -#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" diff --git a/src/core/lib/channel/channel_stack.cc b/src/core/lib/channel/channel_stack.cc index 122d7a916fb..a7f890e26d7 100644 --- a/src/core/lib/channel/channel_stack.cc +++ b/src/core/lib/channel/channel_stack.cc @@ -18,14 +18,16 @@ #include -#include -#include #include "src/core/lib/channel/channel_stack.h" -#include "src/core/lib/gpr/alloc.h" #include #include +#include +#include + +#include "src/core/lib/gpr/alloc.h" + grpc_core::TraceFlag grpc_trace_channel(false, "channel"); /* Memory layouts. diff --git a/src/core/lib/channel/channel_trace.cc b/src/core/lib/channel/channel_trace.cc index 5fc0f9a0225..50f7e194bbf 100644 --- a/src/core/lib/channel/channel_trace.cc +++ b/src/core/lib/channel/channel_trace.cc @@ -20,13 +20,14 @@ #include "src/core/lib/channel/channel_trace.h" +#include +#include +#include + #include #include #include #include -#include -#include -#include #include "src/core/lib/channel/status_util.h" #include "src/core/lib/gpr/string.h" diff --git a/src/core/lib/channel/channel_trace.h b/src/core/lib/channel/channel_trace.h index 126abc7eb9d..663f29e7113 100644 --- a/src/core/lib/channel/channel_trace.h +++ b/src/core/lib/channel/channel_trace.h @@ -22,6 +22,7 @@ #include #include + #include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/error.h" diff --git a/src/core/lib/channel/channelz_registry.cc b/src/core/lib/channel/channelz_registry.cc index c76b5b43795..d801600e79c 100644 --- a/src/core/lib/channel/channelz_registry.cc +++ b/src/core/lib/channel/channelz_registry.cc @@ -18,23 +18,24 @@ #include +#include "src/core/lib/channel/channelz_registry.h" + #include #include #include "absl/container/inlined_vector.h" +#include +#include +#include +#include + #include "src/core/lib/channel/channel_trace.h" #include "src/core/lib/channel/channelz.h" -#include "src/core/lib/channel/channelz_registry.h" #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/memory.h" #include "src/core/lib/gprpp/sync.h" -#include -#include -#include -#include - namespace grpc_core { namespace channelz { namespace { diff --git a/src/core/lib/channel/connected_channel.cc b/src/core/lib/channel/connected_channel.cc index 12b3d786097..2d4eace2623 100644 --- a/src/core/lib/channel/connected_channel.cc +++ b/src/core/lib/channel/connected_channel.cc @@ -28,6 +28,7 @@ #include #include #include + #include "src/core/lib/gpr/string.h" #include "src/core/lib/profiling/timers.h" #include "src/core/lib/transport/transport.h" diff --git a/src/core/lib/channel/handshaker.cc b/src/core/lib/channel/handshaker.cc index 632d2864e31..7ebed4b92bb 100644 --- a/src/core/lib/channel/handshaker.cc +++ b/src/core/lib/channel/handshaker.cc @@ -18,6 +18,8 @@ #include +#include "src/core/lib/channel/handshaker.h" + #include #include "absl/strings/str_format.h" @@ -28,7 +30,6 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/channel/handshaker.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/slice/slice_internal.h" diff --git a/src/core/lib/channel/handshaker.h b/src/core/lib/channel/handshaker.h index b6b69da57d9..ad2606d2e94 100644 --- a/src/core/lib/channel/handshaker.h +++ b/src/core/lib/channel/handshaker.h @@ -23,9 +23,8 @@ #include "absl/container/inlined_vector.h" -#include - #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/ref_counted.h" diff --git a/src/core/lib/channel/handshaker_registry.cc b/src/core/lib/channel/handshaker_registry.cc index c2a837396f2..e8fadb14208 100644 --- a/src/core/lib/channel/handshaker_registry.cc +++ b/src/core/lib/channel/handshaker_registry.cc @@ -18,17 +18,19 @@ #include -#include "absl/container/inlined_vector.h" - #include "src/core/lib/channel/handshaker_registry.h" -#include "src/core/lib/gpr/alloc.h" -#include "src/core/lib/gprpp/memory.h" #include + #include +#include "absl/container/inlined_vector.h" + #include +#include "src/core/lib/gpr/alloc.h" +#include "src/core/lib/gprpp/memory.h" + // // grpc_handshaker_factory_list // diff --git a/src/core/lib/channel/status_util.h b/src/core/lib/channel/status_util.h index bab65375f05..b9245f234e2 100644 --- a/src/core/lib/channel/status_util.h +++ b/src/core/lib/channel/status_util.h @@ -21,11 +21,11 @@ #include -#include - #include #include +#include + /// If \a status_str is a valid status string, sets \a status to the /// corresponding status value and returns true. bool grpc_status_code_from_string(const char* status_str, diff --git a/src/core/lib/compression/algorithm_metadata.h b/src/core/lib/compression/algorithm_metadata.h index d58d2f541a0..d053d121e59 100644 --- a/src/core/lib/compression/algorithm_metadata.h +++ b/src/core/lib/compression/algorithm_metadata.h @@ -22,6 +22,7 @@ #include #include + #include "src/core/lib/compression/compression_internal.h" #include "src/core/lib/transport/metadata.h" diff --git a/src/core/lib/compression/compression_args.cc b/src/core/lib/compression/compression_args.cc index 03e1a8881b6..90aa578d4a1 100644 --- a/src/core/lib/compression/compression_args.cc +++ b/src/core/lib/compression/compression_args.cc @@ -18,6 +18,8 @@ #include +#include "src/core/lib/compression/compression_args.h" + #include #include @@ -28,7 +30,6 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/compression/compression_args.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" diff --git a/src/core/lib/compression/compression_internal.cc b/src/core/lib/compression/compression_internal.cc index 8f40f5ef46e..cce8ddce08f 100644 --- a/src/core/lib/compression/compression_internal.cc +++ b/src/core/lib/compression/compression_internal.cc @@ -18,13 +18,14 @@ #include +#include "src/core/lib/compression/compression_internal.h" + #include #include #include #include "src/core/lib/compression/algorithm_metadata.h" -#include "src/core/lib/compression/compression_internal.h" #include "src/core/lib/gpr/useful.h" #include "src/core/lib/slice/slice_utils.h" #include "src/core/lib/surface/api_trace.h" diff --git a/src/core/lib/compression/message_compress.cc b/src/core/lib/compression/message_compress.cc index 7c2a70bad4e..797d5edfe87 100644 --- a/src/core/lib/compression/message_compress.cc +++ b/src/core/lib/compression/message_compress.cc @@ -22,11 +22,11 @@ #include +#include + #include #include -#include - #include "src/core/lib/slice/slice_internal.h" #define OUTPUT_BLOCK_SIZE 1024 diff --git a/src/core/lib/compression/stream_compression.cc b/src/core/lib/compression/stream_compression.cc index e0857988643..d827aeb938c 100644 --- a/src/core/lib/compression/stream_compression.cc +++ b/src/core/lib/compression/stream_compression.cc @@ -18,9 +18,10 @@ #include +#include "src/core/lib/compression/stream_compression.h" + #include -#include "src/core/lib/compression/stream_compression.h" #include "src/core/lib/compression/stream_compression_gzip.h" #include "src/core/lib/slice/slice_utils.h" diff --git a/src/core/lib/compression/stream_compression.h b/src/core/lib/compression/stream_compression.h index 10ae15658c2..cfa1bf00d9e 100644 --- a/src/core/lib/compression/stream_compression.h +++ b/src/core/lib/compression/stream_compression.h @@ -23,9 +23,10 @@ #include -#include #include +#include + #include "src/core/lib/transport/static_metadata.h" typedef struct grpc_stream_compression_vtable grpc_stream_compression_vtable; diff --git a/src/core/lib/compression/stream_compression_gzip.cc b/src/core/lib/compression/stream_compression_gzip.cc index 452b22b7628..92a44eab64f 100644 --- a/src/core/lib/compression/stream_compression_gzip.cc +++ b/src/core/lib/compression/stream_compression_gzip.cc @@ -18,10 +18,11 @@ #include +#include "src/core/lib/compression/stream_compression_gzip.h" + #include #include -#include "src/core/lib/compression/stream_compression_gzip.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice_internal.h" diff --git a/src/core/lib/compression/stream_compression_identity.cc b/src/core/lib/compression/stream_compression_identity.cc index 78486f09f05..adef4c44cd8 100644 --- a/src/core/lib/compression/stream_compression_identity.cc +++ b/src/core/lib/compression/stream_compression_identity.cc @@ -18,10 +18,11 @@ #include +#include "src/core/lib/compression/stream_compression_identity.h" + #include #include -#include "src/core/lib/compression/stream_compression_identity.h" #include "src/core/lib/slice/slice_internal.h" #define OUTPUT_BLOCK_SIZE (1024) diff --git a/src/core/lib/debug/stats.h b/src/core/lib/debug/stats.h index be17ac5297e..cafaa644934 100644 --- a/src/core/lib/debug/stats.h +++ b/src/core/lib/debug/stats.h @@ -24,6 +24,7 @@ #include #include + #include "src/core/lib/debug/stats_data.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/lib/debug/stats_data.cc b/src/core/lib/debug/stats_data.cc index ceacc571603..31bd7420da2 100644 --- a/src/core/lib/debug/stats_data.cc +++ b/src/core/lib/debug/stats_data.cc @@ -20,8 +20,9 @@ #include -#include "src/core/lib/debug/stats.h" #include "src/core/lib/debug/stats_data.h" + +#include "src/core/lib/debug/stats.h" #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/lib/debug/stats_data.h b/src/core/lib/debug/stats_data.h index c1356c44cd0..61c3d103f48 100644 --- a/src/core/lib/debug/stats_data.h +++ b/src/core/lib/debug/stats_data.h @@ -24,6 +24,7 @@ #include #include + #include "src/core/lib/iomgr/exec_ctx.h" typedef enum { diff --git a/src/core/lib/debug/trace.cc b/src/core/lib/debug/trace.cc index 84c0a3805d3..87b61446386 100644 --- a/src/core/lib/debug/trace.cc +++ b/src/core/lib/debug/trace.cc @@ -21,6 +21,7 @@ #include "src/core/lib/debug/trace.h" #include + #include #include diff --git a/src/core/lib/debug/trace.h b/src/core/lib/debug/trace.h index ac7b40e58a5..d788541b577 100644 --- a/src/core/lib/debug/trace.h +++ b/src/core/lib/debug/trace.h @@ -21,9 +21,10 @@ #include -#include #include +#include + #include "src/core/lib/gprpp/global_config.h" GPR_GLOBAL_CONFIG_DECLARE_STRING(grpc_trace); diff --git a/src/core/lib/event_engine/endpoint_config.cc b/src/core/lib/event_engine/endpoint_config.cc index 78d28ecbb48..ca6438d522d 100644 --- a/src/core/lib/event_engine/endpoint_config.cc +++ b/src/core/lib/event_engine/endpoint_config.cc @@ -14,7 +14,6 @@ #include #include - #include #include diff --git a/src/core/lib/event_engine/event_engine.cc b/src/core/lib/event_engine/event_engine.cc index cfc270c07f1..cce18ab4587 100644 --- a/src/core/lib/event_engine/event_engine.cc +++ b/src/core/lib/event_engine/event_engine.cc @@ -13,15 +13,15 @@ // limitations under the License. #include +#include "absl/strings/str_format.h" +#include "absl/strings/str_join.h" + #include #include #include #include #include -#include "absl/strings/str_format.h" -#include "absl/strings/str_join.h" - #include "src/core/lib/event_engine/sockaddr.h" namespace grpc_event_engine { diff --git a/src/core/lib/gpr/alloc.cc b/src/core/lib/gpr/alloc.cc index 5bfdc8d1562..9a46ff85fe7 100644 --- a/src/core/lib/gpr/alloc.cc +++ b/src/core/lib/gpr/alloc.cc @@ -18,11 +18,12 @@ #include -#include - -#include #include #include + +#include +#include + #include "src/core/lib/profiling/timers.h" void* gpr_malloc(size_t size) { diff --git a/src/core/lib/gpr/env_linux.cc b/src/core/lib/gpr/env_linux.cc index 6a78dc14155..4b332468104 100644 --- a/src/core/lib/gpr/env_linux.cc +++ b/src/core/lib/gpr/env_linux.cc @@ -25,8 +25,6 @@ #ifdef GPR_LINUX_ENV -#include "src/core/lib/gpr/env.h" - #include #include #include @@ -35,6 +33,7 @@ #include #include +#include "src/core/lib/gpr/env.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" diff --git a/src/core/lib/gpr/env_posix.cc b/src/core/lib/gpr/env_posix.cc index 232095b4e22..fb2a21c6699 100644 --- a/src/core/lib/gpr/env_posix.cc +++ b/src/core/lib/gpr/env_posix.cc @@ -20,13 +20,12 @@ #ifdef GPR_POSIX_ENV -#include "src/core/lib/gpr/env.h" - #include #include - #include + +#include "src/core/lib/gpr/env.h" #include "src/core/lib/gpr/string.h" char* gpr_getenv(const char* name) { diff --git a/src/core/lib/gpr/log.cc b/src/core/lib/gpr/log.cc index 9400f7c4bfa..d18f52b432d 100644 --- a/src/core/lib/gpr/log.cc +++ b/src/core/lib/gpr/log.cc @@ -18,6 +18,9 @@ #include +#include +#include + #include #include #include @@ -25,9 +28,6 @@ #include "src/core/lib/gpr/string.h" #include "src/core/lib/gprpp/global_config.h" -#include -#include - #ifndef GPR_DEFAULT_LOG_VERBOSITY_STRING #define GPR_DEFAULT_LOG_VERBOSITY_STRING "ERROR" #endif // !GPR_DEFAULT_LOG_VERBOSITY_STRING diff --git a/src/core/lib/gpr/log_android.cc b/src/core/lib/gpr/log_android.cc index 40ef4c640da..11ffd64d604 100644 --- a/src/core/lib/gpr/log_android.cc +++ b/src/core/lib/gpr/log_android.cc @@ -21,12 +21,13 @@ #ifdef GPR_ANDROID #include -#include -#include #include #include #include +#include +#include + static android_LogPriority severity_to_log_priority(gpr_log_severity severity) { switch (severity) { case GPR_LOG_SEVERITY_DEBUG: diff --git a/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc index 00ea694c987..850ee13a06c 100644 --- a/src/core/lib/gpr/log_linux.cc +++ b/src/core/lib/gpr/log_linux.cc @@ -28,9 +28,6 @@ #ifdef GPR_LINUX_LOG -#include -#include -#include #include #include #include @@ -42,6 +39,11 @@ #include #include "absl/strings/str_format.h" + +#include +#include +#include + #include "src/core/lib/gpr/tls.h" #include "src/core/lib/gprpp/examine_stack.h" diff --git a/src/core/lib/gpr/log_posix.cc b/src/core/lib/gpr/log_posix.cc index 4bd6117f76c..2c28bddd757 100644 --- a/src/core/lib/gpr/log_posix.cc +++ b/src/core/lib/gpr/log_posix.cc @@ -20,18 +20,21 @@ #ifdef GPR_POSIX_LOG -#include -#include -#include #include #include #include #include #include #include + #include #include "absl/strings/str_format.h" + +#include +#include +#include + #include "src/core/lib/gprpp/examine_stack.h" int gpr_should_log_stacktrace(gpr_log_severity severity); diff --git a/src/core/lib/gpr/string.h b/src/core/lib/gpr/string.h index 8695331eafb..333756094e2 100644 --- a/src/core/lib/gpr/string.h +++ b/src/core/lib/gpr/string.h @@ -21,13 +21,13 @@ #include -#include - #include #include #include +#include + /* String utility functions */ /* Flags for gpr_dump function. */ diff --git a/src/core/lib/gpr/sync.cc b/src/core/lib/gpr/sync.cc index 36c35da38df..28d506f7f90 100644 --- a/src/core/lib/gpr/sync.cc +++ b/src/core/lib/gpr/sync.cc @@ -20,12 +20,12 @@ #include +#include + #include #include #include -#include - /* Number of mutexes to allocate for events, to avoid lock contention. Should be a prime. */ enum { event_sync_partitions = 31 }; diff --git a/src/core/lib/gpr/sync_abseil.cc b/src/core/lib/gpr/sync_abseil.cc index 0da9caa9d24..16333366468 100644 --- a/src/core/lib/gpr/sync_abseil.cc +++ b/src/core/lib/gpr/sync_abseil.cc @@ -20,20 +20,21 @@ #if defined(GPR_ABSEIL_SYNC) && !defined(GPR_CUSTOM_SYNC) -#include - #include -#include -#include -#include #include -#include "src/core/lib/profiling/timers.h" #include "absl/base/call_once.h" #include "absl/synchronization/mutex.h" #include "absl/time/clock.h" #include "absl/time/time.h" +#include +#include +#include +#include + +#include "src/core/lib/profiling/timers.h" + #ifdef GPR_LOW_LEVEL_COUNTERS gpr_atm gpr_mu_locks = 0; gpr_atm gpr_counter_atm_cas = 0; diff --git a/src/core/lib/gpr/sync_posix.cc b/src/core/lib/gpr/sync_posix.cc index fdd278be233..7ed5403a045 100644 --- a/src/core/lib/gpr/sync_posix.cc +++ b/src/core/lib/gpr/sync_posix.cc @@ -21,14 +21,14 @@ #if defined(GPR_POSIX_SYNC) && !defined(GPR_ABSEIL_SYNC) && \ !defined(GPR_CUSTOM_SYNC) +#include +#include + #include #include #include #include -#include -#include - #include "src/core/lib/profiling/timers.h" #ifdef GPR_LOW_LEVEL_COUNTERS diff --git a/src/core/lib/gpr/time.cc b/src/core/lib/gpr/time.cc index 14df70d7d66..d796f41422b 100644 --- a/src/core/lib/gpr/time.cc +++ b/src/core/lib/gpr/time.cc @@ -20,12 +20,13 @@ #include -#include -#include #include #include #include +#include +#include + int gpr_time_cmp(gpr_timespec a, gpr_timespec b) { int cmp = (a.tv_sec > b.tv_sec) - (a.tv_sec < b.tv_sec); GPR_ASSERT(a.clock_type == b.clock_type); diff --git a/src/core/lib/gpr/time_windows.cc b/src/core/lib/gpr/time_windows.cc index 247cc164682..39bca1b0940 100644 --- a/src/core/lib/gpr/time_windows.cc +++ b/src/core/lib/gpr/time_windows.cc @@ -22,12 +22,13 @@ #ifdef GPR_WINDOWS_TIME -#include -#include #include #include #include +#include +#include + #include "src/core/lib/gpr/time_precise.h" static LARGE_INTEGER g_start_time; diff --git a/src/core/lib/gpr/tls.h b/src/core/lib/gpr/tls.h index fc7b656520a..32add503568 100644 --- a/src/core/lib/gpr/tls.h +++ b/src/core/lib/gpr/tls.h @@ -48,11 +48,13 @@ class TlsTypeConstrainer { #if defined(GPR_PTHREAD_TLS) -#include /* for GPR_ASSERT */ #include + #include #include +#include /* for GPR_ASSERT */ + namespace grpc_core { template diff --git a/src/core/lib/gpr/tmpfile_posix.cc b/src/core/lib/gpr/tmpfile_posix.cc index ffdad335d67..166cdf68f24 100644 --- a/src/core/lib/gpr/tmpfile_posix.cc +++ b/src/core/lib/gpr/tmpfile_posix.cc @@ -20,8 +20,6 @@ #ifdef GPR_POSIX_TMPFILE -#include "src/core/lib/gpr/tmpfile.h" - #include #include #include @@ -32,6 +30,7 @@ #include #include "src/core/lib/gpr/string.h" +#include "src/core/lib/gpr/tmpfile.h" FILE* gpr_tmpfile(const char* prefix, char** tmp_filename) { FILE* result = nullptr; diff --git a/src/core/lib/gprpp/arena.cc b/src/core/lib/gprpp/arena.cc index fbda073e642..9e979de39ae 100644 --- a/src/core/lib/gprpp/arena.cc +++ b/src/core/lib/gprpp/arena.cc @@ -21,6 +21,7 @@ #include "src/core/lib/gprpp/arena.h" #include + #include #include diff --git a/src/core/lib/gprpp/arena.h b/src/core/lib/gprpp/arena.h index 7562bfe55fe..0c45fa64e08 100644 --- a/src/core/lib/gprpp/arena.h +++ b/src/core/lib/gprpp/arena.h @@ -27,6 +27,8 @@ #include +#include + #include #include #include @@ -37,8 +39,6 @@ #include "src/core/lib/gpr/alloc.h" #include "src/core/lib/gpr/spinlock.h" -#include - namespace grpc_core { class Arena { diff --git a/src/core/lib/gprpp/capture.h b/src/core/lib/gprpp/capture.h index 2ab3e1f20d5..860bfe47b8d 100644 --- a/src/core/lib/gprpp/capture.h +++ b/src/core/lib/gprpp/capture.h @@ -19,6 +19,7 @@ #include #include + #include "absl/utility/utility.h" namespace grpc_core { diff --git a/src/core/lib/gprpp/dual_ref_counted.h b/src/core/lib/gprpp/dual_ref_counted.h index 2943a372da5..560e08d04bf 100644 --- a/src/core/lib/gprpp/dual_ref_counted.h +++ b/src/core/lib/gprpp/dual_ref_counted.h @@ -19,14 +19,14 @@ #include -#include -#include -#include - #include #include #include +#include +#include +#include + #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" diff --git a/src/core/lib/gprpp/global_config.h b/src/core/lib/gprpp/global_config.h index ed986b8e04d..150c7385638 100644 --- a/src/core/lib/gprpp/global_config.h +++ b/src/core/lib/gprpp/global_config.h @@ -89,8 +89,7 @@ // bool gpr_global_config_get_test(); // void gpr_global_config_set_test(bool value); -#include "src/core/lib/gprpp/global_config_env.h" - #include "src/core/lib/gprpp/global_config_custom.h" +#include "src/core/lib/gprpp/global_config_env.h" #endif /* GRPC_CORE_LIB_GPRPP_GLOBAL_CONFIG_H */ diff --git a/src/core/lib/gprpp/global_config_env.cc b/src/core/lib/gprpp/global_config_env.cc index d45d232dd7e..d70c8e839aa 100644 --- a/src/core/lib/gprpp/global_config_env.cc +++ b/src/core/lib/gprpp/global_config_env.cc @@ -20,13 +20,6 @@ #include "src/core/lib/gprpp/global_config_env.h" -#include -#include -#include - -#include "src/core/lib/gpr/env.h" -#include "src/core/lib/gpr/string.h" - #include #include @@ -34,6 +27,13 @@ #include "absl/strings/str_format.h" +#include +#include +#include + +#include "src/core/lib/gpr/env.h" +#include "src/core/lib/gpr/string.h" + namespace grpc_core { namespace { diff --git a/src/core/lib/gprpp/global_config_generic.h b/src/core/lib/gprpp/global_config_generic.h index d3e3e2a2dbe..6bdadb09804 100644 --- a/src/core/lib/gprpp/global_config_generic.h +++ b/src/core/lib/gprpp/global_config_generic.h @@ -21,10 +21,10 @@ #include -#include "src/core/lib/gprpp/memory.h" - #include +#include "src/core/lib/gprpp/memory.h" + #define GPR_GLOBAL_CONFIG_GET(name) gpr_global_config_get_##name() #define GPR_GLOBAL_CONFIG_SET(name, value) gpr_global_config_set_##name(value) diff --git a/src/core/lib/gprpp/manual_constructor.h b/src/core/lib/gprpp/manual_constructor.h index dd98a330e13..49517af034a 100644 --- a/src/core/lib/gprpp/manual_constructor.h +++ b/src/core/lib/gprpp/manual_constructor.h @@ -25,6 +25,7 @@ #include #include + #include #include #include diff --git a/src/core/lib/gprpp/match.h b/src/core/lib/gprpp/match.h index caec932cc84..1a405d420f1 100644 --- a/src/core/lib/gprpp/match.h +++ b/src/core/lib/gprpp/match.h @@ -18,6 +18,7 @@ #include #include "absl/types/variant.h" + #include "src/core/lib/gprpp/overload.h" namespace grpc_core { diff --git a/src/core/lib/gprpp/memory.h b/src/core/lib/gprpp/memory.h index 4edc9b3d9c7..00e24aed240 100644 --- a/src/core/lib/gprpp/memory.h +++ b/src/core/lib/gprpp/memory.h @@ -21,15 +21,15 @@ #include -#include -#include - #include #include #include #include "absl/memory/memory.h" +#include +#include + namespace grpc_core { class DefaultDeleteChar { diff --git a/src/core/lib/gprpp/orphanable.h b/src/core/lib/gprpp/orphanable.h index b73e520198d..7fade1cf7dc 100644 --- a/src/core/lib/gprpp/orphanable.h +++ b/src/core/lib/gprpp/orphanable.h @@ -21,12 +21,12 @@ #include -#include -#include - #include #include +#include +#include + #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/memory.h" #include "src/core/lib/gprpp/ref_counted.h" diff --git a/src/core/lib/gprpp/ref_counted.h b/src/core/lib/gprpp/ref_counted.h index 06f1de6fb6e..f250bbd79ac 100644 --- a/src/core/lib/gprpp/ref_counted.h +++ b/src/core/lib/gprpp/ref_counted.h @@ -21,14 +21,14 @@ #include -#include -#include -#include - #include #include #include +#include +#include +#include + #include "src/core/lib/gprpp/atomic_utils.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/memory.h" diff --git a/src/core/lib/gprpp/status_helper.cc b/src/core/lib/gprpp/status_helper.cc index 8266e167466..f13cd403fe7 100644 --- a/src/core/lib/gprpp/status_helper.cc +++ b/src/core/lib/gprpp/status_helper.cc @@ -19,9 +19,6 @@ #include #include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time_util.h" - -#include #include "absl/strings/cord.h" #include "absl/strings/escaping.h" @@ -29,11 +26,14 @@ #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" #include "absl/time/clock.h" - #include "google/protobuf/any.upb.h" #include "google/rpc/status.upb.h" #include "upb/upb.hpp" +#include + +#include "src/core/lib/gprpp/time_util.h" + namespace grpc_core { namespace { diff --git a/src/core/lib/gprpp/sync.h b/src/core/lib/gprpp/sync.h index efb9fc25780..10f4ee6b8ce 100644 --- a/src/core/lib/gprpp/sync.h +++ b/src/core/lib/gprpp/sync.h @@ -21,11 +21,12 @@ #include +#include "absl/synchronization/mutex.h" + #include #include #include -#include "absl/synchronization/mutex.h" #include "src/core/lib/gprpp/time_util.h" // The core library is not accessible in C++ codegen headers, and vice versa. diff --git a/src/core/lib/gprpp/table.h b/src/core/lib/gprpp/table.h index a1de10e8198..be1222f6963 100644 --- a/src/core/lib/gprpp/table.h +++ b/src/core/lib/gprpp/table.h @@ -18,7 +18,9 @@ #include #include + #include "absl/utility/utility.h" + #include "src/core/lib/gprpp/bitset.h" namespace grpc_core { diff --git a/src/core/lib/gprpp/thd_posix.cc b/src/core/lib/gprpp/thd_posix.cc index c3449bdacfd..2d522c9b23c 100644 --- a/src/core/lib/gprpp/thd_posix.cc +++ b/src/core/lib/gprpp/thd_posix.cc @@ -22,20 +22,20 @@ #ifdef GPR_POSIX_SYNC -#include "src/core/lib/gprpp/thd.h" +#include +#include +#include +#include #include #include #include #include -#include -#include -#include -#include #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/fork.h" #include "src/core/lib/gprpp/memory.h" +#include "src/core/lib/gprpp/thd.h" namespace grpc_core { namespace { diff --git a/src/core/lib/gprpp/thd_windows.cc b/src/core/lib/gprpp/thd_windows.cc index ccfd551fb1d..ce1a753995b 100644 --- a/src/core/lib/gprpp/thd_windows.cc +++ b/src/core/lib/gprpp/thd_windows.cc @@ -22,15 +22,15 @@ #ifdef GPR_WINDOWS -#include "src/core/lib/gprpp/thd.h" +#include #include #include #include -#include #include "src/core/lib/gpr/tls.h" #include "src/core/lib/gprpp/memory.h" +#include "src/core/lib/gprpp/thd.h" namespace { class ThreadInternalsWindows; diff --git a/src/core/lib/gprpp/time_util.cc b/src/core/lib/gprpp/time_util.cc index d3aa25aefe2..847950327e8 100644 --- a/src/core/lib/gprpp/time_util.cc +++ b/src/core/lib/gprpp/time_util.cc @@ -16,10 +16,10 @@ #include -#include - #include "src/core/lib/gprpp/time_util.h" +#include + namespace grpc_core { gpr_timespec ToGprTimeSpec(absl::Duration duration) { diff --git a/src/core/lib/gprpp/time_util.h b/src/core/lib/gprpp/time_util.h index 4ae4a4076df..226e4051e80 100644 --- a/src/core/lib/gprpp/time_util.h +++ b/src/core/lib/gprpp/time_util.h @@ -19,10 +19,10 @@ #include -#include - #include "absl/time/time.h" +#include + namespace grpc_core { // Converts absl::Duration to gpr_timespec(GPR_TIMESPAN) diff --git a/src/core/lib/http/format_request.cc b/src/core/lib/http/format_request.cc index 947b19cbfac..1f0a5cf5e21 100644 --- a/src/core/lib/http/format_request.cc +++ b/src/core/lib/http/format_request.cc @@ -32,6 +32,7 @@ #include #include #include + #include "src/core/lib/gpr/string.h" static void fill_common_header(const grpc_httpcli_request* request, diff --git a/src/core/lib/http/format_request.h b/src/core/lib/http/format_request.h index bcc332fe6e7..30c870fb692 100644 --- a/src/core/lib/http/format_request.h +++ b/src/core/lib/http/format_request.h @@ -22,6 +22,7 @@ #include #include + #include "src/core/lib/http/httpcli.h" grpc_slice grpc_httpcli_format_get_request(const grpc_httpcli_request* request); diff --git a/src/core/lib/http/httpcli_security_connector.cc b/src/core/lib/http/httpcli_security_connector.cc index e26f99b4bc5..877b0861411 100644 --- a/src/core/lib/http/httpcli_security_connector.cc +++ b/src/core/lib/http/httpcli_security_connector.cc @@ -18,8 +18,6 @@ #include -#include "src/core/lib/http/httpcli.h" - #include #include "absl/strings/str_cat.h" @@ -33,6 +31,7 @@ #include "src/core/lib/channel/handshaker_registry.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/http/httpcli.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/ssl_utils.h" diff --git a/src/core/lib/http/parser.h b/src/core/lib/http/parser.h index 613b9726118..1f8c3889b10 100644 --- a/src/core/lib/http/parser.h +++ b/src/core/lib/http/parser.h @@ -22,6 +22,7 @@ #include #include + #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/error.h" diff --git a/src/core/lib/iomgr/buffer_list.cc b/src/core/lib/iomgr/buffer_list.cc index fa8c4aef787..0ea6af25ba1 100644 --- a/src/core/lib/iomgr/buffer_list.cc +++ b/src/core/lib/iomgr/buffer_list.cc @@ -19,10 +19,11 @@ #include #include "src/core/lib/iomgr/buffer_list.h" -#include "src/core/lib/iomgr/port.h" #include +#include "src/core/lib/iomgr/port.h" + #ifdef GRPC_LINUX_ERRQUEUE #include #include diff --git a/src/core/lib/iomgr/buffer_list.h b/src/core/lib/iomgr/buffer_list.h index 982c4c6b67f..f09bbe1d1b8 100644 --- a/src/core/lib/iomgr/buffer_list.h +++ b/src/core/lib/iomgr/buffer_list.h @@ -23,13 +23,12 @@ #include "absl/types/optional.h" -#include "src/core/lib/iomgr/port.h" - #include #include "src/core/lib/gprpp/memory.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/internal_errqueue.h" +#include "src/core/lib/iomgr/port.h" namespace grpc_core { diff --git a/src/core/lib/iomgr/call_combiner.cc b/src/core/lib/iomgr/call_combiner.cc index 44ffb12722d..945e8357d45 100644 --- a/src/core/lib/iomgr/call_combiner.cc +++ b/src/core/lib/iomgr/call_combiner.cc @@ -23,6 +23,7 @@ #include #include + #include "src/core/lib/debug/stats.h" #include "src/core/lib/profiling/timers.h" diff --git a/src/core/lib/iomgr/cfstream_handle.cc b/src/core/lib/iomgr/cfstream_handle.cc index fb112316e30..b94711c6fd9 100644 --- a/src/core/lib/iomgr/cfstream_handle.cc +++ b/src/core/lib/iomgr/cfstream_handle.cc @@ -23,13 +23,13 @@ #ifdef GRPC_CFSTREAM #import -#import "src/core/lib/iomgr/cfstream_handle.h" #include #include #include #include "src/core/lib/debug/trace.h" +#import "src/core/lib/iomgr/cfstream_handle.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error_cfstream.h" #include "src/core/lib/iomgr/ev_apple.h" diff --git a/src/core/lib/iomgr/combiner.h b/src/core/lib/iomgr/combiner.h index efa2bce6823..3b9ddfcec13 100644 --- a/src/core/lib/iomgr/combiner.h +++ b/src/core/lib/iomgr/combiner.h @@ -24,6 +24,7 @@ #include #include + #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/lib/iomgr/dualstack_socket_posix.cc b/src/core/lib/iomgr/dualstack_socket_posix.cc index dc0eafebf98..2d7711339f5 100644 --- a/src/core/lib/iomgr/dualstack_socket_posix.cc +++ b/src/core/lib/iomgr/dualstack_socket_posix.cc @@ -23,6 +23,7 @@ #ifdef GRPC_POSIX_SOCKET_UTILS_COMMON #include + #include "src/core/lib/iomgr/socket_utils_posix.h" #ifndef GRPC_SET_SOCKET_DUALSTACK_CUSTOM diff --git a/src/core/lib/iomgr/endpoint.h b/src/core/lib/iomgr/endpoint.h index e42d9ba7c7b..2a0108369df 100644 --- a/src/core/lib/iomgr/endpoint.h +++ b/src/core/lib/iomgr/endpoint.h @@ -26,6 +26,7 @@ #include #include #include + #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/resource_quota.h" diff --git a/src/core/lib/iomgr/endpoint_cfstream.cc b/src/core/lib/iomgr/endpoint_cfstream.cc index 6b2621ef759..0cc341bcd64 100644 --- a/src/core/lib/iomgr/endpoint_cfstream.cc +++ b/src/core/lib/iomgr/endpoint_cfstream.cc @@ -23,7 +23,6 @@ #ifdef GRPC_CFSTREAM_ENDPOINT #import -#import "src/core/lib/iomgr/endpoint_cfstream.h" #include #include @@ -34,6 +33,7 @@ #include "src/core/lib/iomgr/cfstream_handle.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" +#import "src/core/lib/iomgr/endpoint_cfstream.h" #include "src/core/lib/iomgr/error_cfstream.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/slice/slice_internal.h" diff --git a/src/core/lib/iomgr/endpoint_pair_event_engine.cc b/src/core/lib/iomgr/endpoint_pair_event_engine.cc index a0062e1abc2..7c0c1008a18 100644 --- a/src/core/lib/iomgr/endpoint_pair_event_engine.cc +++ b/src/core/lib/iomgr/endpoint_pair_event_engine.cc @@ -14,13 +14,12 @@ #include #ifdef GRPC_USE_EVENT_ENGINE -#include "src/core/lib/iomgr/port.h" - #include #include #include "src/core/lib/iomgr/endpoint_pair.h" +#include "src/core/lib/iomgr/port.h" grpc_endpoint_pair grpc_iomgr_create_endpoint_pair( const char* /* name */, grpc_channel_args* /* args */) { diff --git a/src/core/lib/iomgr/endpoint_pair_posix.cc b/src/core/lib/iomgr/endpoint_pair_posix.cc index 18fec146b82..217ea3770f8 100644 --- a/src/core/lib/iomgr/endpoint_pair_posix.cc +++ b/src/core/lib/iomgr/endpoint_pair_posix.cc @@ -22,10 +22,6 @@ #ifdef GRPC_POSIX_SOCKET_TCP -#include "src/core/lib/iomgr/endpoint_pair.h" -#include "src/core/lib/iomgr/socket_utils_posix.h" -#include "src/core/lib/iomgr/unix_sockets_posix.h" - #include #include #include @@ -38,8 +34,12 @@ #include #include + #include "src/core/lib/gpr/string.h" +#include "src/core/lib/iomgr/endpoint_pair.h" +#include "src/core/lib/iomgr/socket_utils_posix.h" #include "src/core/lib/iomgr/tcp_posix.h" +#include "src/core/lib/iomgr/unix_sockets_posix.h" static void create_sockets(int sv[2]) { int flags; diff --git a/src/core/lib/iomgr/endpoint_pair_windows.cc b/src/core/lib/iomgr/endpoint_pair_windows.cc index 9d87d5f1d5a..c1d34fae191 100644 --- a/src/core/lib/iomgr/endpoint_pair_windows.cc +++ b/src/core/lib/iomgr/endpoint_pair_windows.cc @@ -21,15 +21,15 @@ #include "src/core/lib/iomgr/port.h" #ifdef GRPC_WINSOCK_SOCKET -#include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/iomgr/endpoint_pair.h" -#include "src/core/lib/iomgr/sockaddr.h" - #include #include #include #include + +#include "src/core/lib/address_utils/sockaddr_utils.h" +#include "src/core/lib/iomgr/endpoint_pair.h" +#include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_windows.h" #include "src/core/lib/iomgr/tcp_windows.h" diff --git a/src/core/lib/iomgr/error.h b/src/core/lib/iomgr/error.h index e0492b809b4..9fe4785ac67 100644 --- a/src/core/lib/iomgr/error.h +++ b/src/core/lib/iomgr/error.h @@ -24,6 +24,8 @@ #include #include +#include "absl/status/status.h" + #include #include #include @@ -32,8 +34,6 @@ #include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/status_helper.h" -#include "absl/status/status.h" - /// Opaque representation of an error. /// See https://github.com/grpc/grpc/blob/master/doc/core/grpc-error.md for a /// full write up of this object. diff --git a/src/core/lib/iomgr/error_cfstream.cc b/src/core/lib/iomgr/error_cfstream.cc index 114b3f2e4eb..9c93dde9cc8 100644 --- a/src/core/lib/iomgr/error_cfstream.cc +++ b/src/core/lib/iomgr/error_cfstream.cc @@ -19,12 +19,12 @@ #include #ifdef GRPC_CFSTREAM +#include + #include #include "absl/strings/str_format.h" -#include - #include #include "src/core/lib/iomgr/error.h" diff --git a/src/core/lib/iomgr/error_internal.h b/src/core/lib/iomgr/error_internal.h index 50c1ddeb2dc..8959ed13b45 100644 --- a/src/core/lib/iomgr/error_internal.h +++ b/src/core/lib/iomgr/error_internal.h @@ -25,6 +25,7 @@ #include // TODO(unknown): , do we need this? #include + #include "src/core/lib/iomgr/error.h" #ifndef GRPC_ERROR_IS_ABSEIL_STATUS diff --git a/src/core/lib/iomgr/ev_epoll1_linux.cc b/src/core/lib/iomgr/ev_epoll1_linux.cc index 467105fb74e..91805634a55 100644 --- a/src/core/lib/iomgr/ev_epoll1_linux.cc +++ b/src/core/lib/iomgr/ev_epoll1_linux.cc @@ -18,15 +18,13 @@ #include -#include "src/core/lib/iomgr/port.h" - #include +#include "src/core/lib/iomgr/port.h" + /* This polling engine is only relevant on linux kernels supporting epoll epoll_create() or epoll_create1() */ #ifdef GRPC_LINUX_EPOLL -#include "src/core/lib/iomgr/ev_epoll1_linux.h" - #include #include #include @@ -54,6 +52,7 @@ #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/manual_constructor.h" #include "src/core/lib/iomgr/block_annotate.h" +#include "src/core/lib/iomgr/ev_epoll1_linux.h" #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/lockfree_event.h" diff --git a/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc index da5b1f3256d..2da53d243d2 100644 --- a/src/core/lib/iomgr/ev_epollex_linux.cc +++ b/src/core/lib/iomgr/ev_epollex_linux.cc @@ -18,15 +18,13 @@ #include -#include "src/core/lib/iomgr/port.h" - #include +#include "src/core/lib/iomgr/port.h" + /* This polling engine is only relevant on linux kernels supporting epoll() */ #ifdef GRPC_LINUX_EPOLL_CREATE1 -#include "src/core/lib/iomgr/ev_epollex_linux.h" - #include #include #include @@ -54,6 +52,7 @@ #include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/block_annotate.h" +#include "src/core/lib/iomgr/ev_epollex_linux.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/is_epollexclusive_available.h" #include "src/core/lib/iomgr/lockfree_event.h" diff --git a/src/core/lib/iomgr/ev_poll_posix.cc b/src/core/lib/iomgr/ev_poll_posix.cc index c8cf2ec82a3..cd22b6049e2 100644 --- a/src/core/lib/iomgr/ev_poll_posix.cc +++ b/src/core/lib/iomgr/ev_poll_posix.cc @@ -22,8 +22,6 @@ #ifdef GRPC_POSIX_SOCKET_EV_POLL -#include "src/core/lib/iomgr/ev_poll_posix.h" - #include #include #include @@ -45,6 +43,7 @@ #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/block_annotate.h" +#include "src/core/lib/iomgr/ev_poll_posix.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/wakeup_fd_posix.h" #include "src/core/lib/profiling/timers.h" diff --git a/src/core/lib/iomgr/ev_posix.cc b/src/core/lib/iomgr/ev_posix.cc index dfb250f4a6c..bae0f15ce03 100644 --- a/src/core/lib/iomgr/ev_posix.cc +++ b/src/core/lib/iomgr/ev_posix.cc @@ -22,8 +22,6 @@ #ifdef GRPC_POSIX_SOCKET_EV -#include "src/core/lib/iomgr/ev_posix.h" - #include #include @@ -36,6 +34,7 @@ #include "src/core/lib/iomgr/ev_epoll1_linux.h" #include "src/core/lib/iomgr/ev_epollex_linux.h" #include "src/core/lib/iomgr/ev_poll_posix.h" +#include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/internal_errqueue.h" GPR_GLOBAL_CONFIG_DEFINE_STRING( diff --git a/src/core/lib/iomgr/event_engine/endpoint.cc b/src/core/lib/iomgr/event_engine/endpoint.cc index c73b8059a91..c8e2feb47e4 100644 --- a/src/core/lib/iomgr/event_engine/endpoint.cc +++ b/src/core/lib/iomgr/event_engine/endpoint.cc @@ -14,19 +14,19 @@ #include #ifdef GRPC_USE_EVENT_ENGINE -#include "src/core/lib/iomgr/event_engine/endpoint.h" +#include "absl/strings/string_view.h" #include #include #include #include -#include "absl/strings/string_view.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/event_engine/closure.h" +#include "src/core/lib/iomgr/event_engine/endpoint.h" #include "src/core/lib/iomgr/event_engine/pollset.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/iomgr/pollset_set.h" diff --git a/src/core/lib/iomgr/event_engine/iomgr.cc b/src/core/lib/iomgr/event_engine/iomgr.cc index d51f453e844..6a5a79881b9 100644 --- a/src/core/lib/iomgr/event_engine/iomgr.cc +++ b/src/core/lib/iomgr/event_engine/iomgr.cc @@ -14,12 +14,11 @@ #include #ifdef GRPC_USE_EVENT_ENGINE -#include "src/core/lib/iomgr/event_engine/iomgr.h" - #include #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/event_engine/iomgr.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/iomgr/tcp_server.h" diff --git a/src/core/lib/iomgr/event_engine/resolver.cc b/src/core/lib/iomgr/event_engine/resolver.cc index 36713026820..ea0528f9133 100644 --- a/src/core/lib/iomgr/event_engine/resolver.cc +++ b/src/core/lib/iomgr/event_engine/resolver.cc @@ -14,9 +14,10 @@ #include #ifdef GRPC_USE_EVENT_ENGINE -#include #include "absl/functional/bind_front.h" +#include + #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/error.h" diff --git a/src/core/lib/iomgr/grpc_if_nametoindex_posix.cc b/src/core/lib/iomgr/grpc_if_nametoindex_posix.cc index f1ba20dcec7..8916eac984e 100644 --- a/src/core/lib/iomgr/grpc_if_nametoindex_posix.cc +++ b/src/core/lib/iomgr/grpc_if_nametoindex_posix.cc @@ -22,13 +22,13 @@ #if GRPC_IF_NAMETOINDEX == 1 && defined(GRPC_POSIX_SOCKET_IF_NAMETOINDEX) -#include "src/core/lib/iomgr/grpc_if_nametoindex.h" - #include #include #include +#include "src/core/lib/iomgr/grpc_if_nametoindex.h" + uint32_t grpc_if_nametoindex(char* name) { uint32_t out = if_nametoindex(name); if (out == 0) { diff --git a/src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc b/src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc index 08644cccf3e..63062433e6b 100644 --- a/src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc +++ b/src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc @@ -22,10 +22,10 @@ #if GRPC_IF_NAMETOINDEX == 0 || !defined(GRPC_POSIX_SOCKET_IF_NAMETOINDEX) -#include "src/core/lib/iomgr/grpc_if_nametoindex.h" - #include +#include "src/core/lib/iomgr/grpc_if_nametoindex.h" + uint32_t grpc_if_nametoindex(char* name) { gpr_log(GPR_DEBUG, "Not attempting to convert interface name %s to index for current " diff --git a/src/core/lib/iomgr/internal_errqueue.cc b/src/core/lib/iomgr/internal_errqueue.cc index b68c66b7575..ac644b2f43f 100644 --- a/src/core/lib/iomgr/internal_errqueue.cc +++ b/src/core/lib/iomgr/internal_errqueue.cc @@ -18,10 +18,11 @@ #include -#include "src/core/lib/iomgr/port.h" +#include "src/core/lib/iomgr/internal_errqueue.h" #include -#include "src/core/lib/iomgr/internal_errqueue.h" + +#include "src/core/lib/iomgr/port.h" #ifdef GRPC_POSIX_SOCKET_TCP diff --git a/src/core/lib/iomgr/iocp_windows.cc b/src/core/lib/iomgr/iocp_windows.cc index 29a05ee3099..d4c76eca8a2 100644 --- a/src/core/lib/iomgr/iocp_windows.cc +++ b/src/core/lib/iomgr/iocp_windows.cc @@ -23,6 +23,7 @@ #ifdef GRPC_WINSOCK_SOCKET #include + #include #include diff --git a/src/core/lib/iomgr/iomgr.h b/src/core/lib/iomgr/iomgr.h index 9af0557e8a9..190942bbeed 100644 --- a/src/core/lib/iomgr/iomgr.h +++ b/src/core/lib/iomgr/iomgr.h @@ -21,11 +21,11 @@ #include +#include + #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/port.h" -#include - /** Initializes the iomgr. */ void grpc_iomgr_init(); diff --git a/src/core/lib/iomgr/iomgr_custom.cc b/src/core/lib/iomgr/iomgr_custom.cc index 9a9f06a5aa2..70f4e1b7b13 100644 --- a/src/core/lib/iomgr/iomgr_custom.cc +++ b/src/core/lib/iomgr/iomgr_custom.cc @@ -18,16 +18,16 @@ #include -#include "src/core/lib/iomgr/port.h" +#include "src/core/lib/iomgr/iomgr_custom.h" #include #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/executor.h" -#include "src/core/lib/iomgr/iomgr_custom.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/pollset_custom.h" #include "src/core/lib/iomgr/pollset_set_custom.h" +#include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/resolve_address_custom.h" gpr_thd_id g_init_thread; diff --git a/src/core/lib/iomgr/iomgr_custom.h b/src/core/lib/iomgr/iomgr_custom.h index e6a88843e5c..36b75b8e8dd 100644 --- a/src/core/lib/iomgr/iomgr_custom.h +++ b/src/core/lib/iomgr/iomgr_custom.h @@ -21,13 +21,13 @@ #include +#include + #include "src/core/lib/iomgr/pollset_custom.h" #include "src/core/lib/iomgr/resolve_address_custom.h" #include "src/core/lib/iomgr/tcp_custom.h" #include "src/core/lib/iomgr/timer_custom.h" -#include - /* The thread ID of the thread on which grpc was initialized. Used to verify * that all calls into the custom iomgr are made on that same thread */ extern gpr_thd_id g_init_thread; diff --git a/src/core/lib/iomgr/iomgr_internal.cc b/src/core/lib/iomgr/iomgr_internal.cc index e5ce8ab3f89..eb527f7a128 100644 --- a/src/core/lib/iomgr/iomgr_internal.cc +++ b/src/core/lib/iomgr/iomgr_internal.cc @@ -18,9 +18,10 @@ #include +#include "src/core/lib/iomgr/iomgr_internal.h" + #include -#include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/iomgr/timer_manager.h" diff --git a/src/core/lib/iomgr/iomgr_windows.cc b/src/core/lib/iomgr/iomgr_windows.cc index df1207ae7d5..93fdaf85879 100644 --- a/src/core/lib/iomgr/iomgr_windows.cc +++ b/src/core/lib/iomgr/iomgr_windows.cc @@ -22,14 +22,13 @@ #ifdef GRPC_WINSOCK_SOCKET -#include "src/core/lib/iomgr/sockaddr_windows.h" - #include #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/pollset_windows.h" #include "src/core/lib/iomgr/resolve_address.h" +#include "src/core/lib/iomgr/sockaddr_windows.h" #include "src/core/lib/iomgr/socket_windows.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/iomgr/tcp_server.h" diff --git a/src/core/lib/iomgr/is_epollexclusive_available.cc b/src/core/lib/iomgr/is_epollexclusive_available.cc index abc901efbe0..80cac4a5af0 100644 --- a/src/core/lib/iomgr/is_epollexclusive_available.cc +++ b/src/core/lib/iomgr/is_epollexclusive_available.cc @@ -18,19 +18,19 @@ #include -#include "src/core/lib/iomgr/port.h" - #include "src/core/lib/iomgr/is_epollexclusive_available.h" -#ifdef GRPC_LINUX_EPOLL_CREATE1 +#include "src/core/lib/iomgr/port.h" -#include +#ifdef GRPC_LINUX_EPOLL_CREATE1 #include #include #include #include +#include + #include "src/core/lib/iomgr/sys_epoll_wrapper.h" /* This polling engine is only relevant on linux kernels supporting epoll() */ diff --git a/src/core/lib/iomgr/polling_entity.cc b/src/core/lib/iomgr/polling_entity.cc index dea07cae537..0c1788a6938 100644 --- a/src/core/lib/iomgr/polling_entity.cc +++ b/src/core/lib/iomgr/polling_entity.cc @@ -18,11 +18,11 @@ #include +#include "src/core/lib/iomgr/polling_entity.h" + #include #include -#include "src/core/lib/iomgr/polling_entity.h" - grpc_polling_entity grpc_polling_entity_create_from_pollset_set( grpc_pollset_set* pollset_set) { grpc_polling_entity pollent; diff --git a/src/core/lib/iomgr/pollset_custom.cc b/src/core/lib/iomgr/pollset_custom.cc index 1165ea889de..bad30fb7885 100644 --- a/src/core/lib/iomgr/pollset_custom.cc +++ b/src/core/lib/iomgr/pollset_custom.cc @@ -18,7 +18,7 @@ #include -#include "src/core/lib/iomgr/port.h" +#include "src/core/lib/iomgr/pollset_custom.h" #include #include @@ -27,14 +27,13 @@ #include #include +#include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/iomgr_custom.h" #include "src/core/lib/iomgr/pollset.h" -#include "src/core/lib/iomgr/pollset_custom.h" +#include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/timer.h" -#include "src/core/lib/debug/trace.h" - static grpc_custom_poller_vtable* poller_vtable; struct grpc_pollset { diff --git a/src/core/lib/iomgr/pollset_custom.h b/src/core/lib/iomgr/pollset_custom.h index de3067f48ea..4e6f38237c0 100644 --- a/src/core/lib/iomgr/pollset_custom.h +++ b/src/core/lib/iomgr/pollset_custom.h @@ -21,10 +21,10 @@ #include -#include "src/core/lib/iomgr/error.h" - #include +#include "src/core/lib/iomgr/error.h" + typedef struct grpc_custom_poller_vtable { void (*init)(); grpc_error* (*poll)(size_t timeout_ms); diff --git a/src/core/lib/iomgr/pollset_set_custom.cc b/src/core/lib/iomgr/pollset_set_custom.cc index 0cc90891c4c..db105bfd9e2 100644 --- a/src/core/lib/iomgr/pollset_set_custom.cc +++ b/src/core/lib/iomgr/pollset_set_custom.cc @@ -18,9 +18,8 @@ #include -#include "src/core/lib/iomgr/port.h" - #include "src/core/lib/iomgr/pollset_set.h" +#include "src/core/lib/iomgr/port.h" static grpc_pollset_set* pollset_set_create(void) { return reinterpret_cast(static_cast(0xdeafbeef)); diff --git a/src/core/lib/iomgr/pollset_set_windows.cc b/src/core/lib/iomgr/pollset_set_windows.cc index bb9e7f5d28d..1b105a2453b 100644 --- a/src/core/lib/iomgr/pollset_set_windows.cc +++ b/src/core/lib/iomgr/pollset_set_windows.cc @@ -19,6 +19,7 @@ #include #include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_WINSOCK_SOCKET diff --git a/src/core/lib/iomgr/python_util.h b/src/core/lib/iomgr/python_util.h index b2f4162ca17..5b7eeccbd2f 100644 --- a/src/core/lib/iomgr/python_util.h +++ b/src/core/lib/iomgr/python_util.h @@ -23,6 +23,7 @@ #include #include + #include "src/core/lib/iomgr/error.h" // These are only used by the gRPC Python extensions. diff --git a/src/core/lib/iomgr/resolve_address.cc b/src/core/lib/iomgr/resolve_address.cc index 30c0db146f8..a2e159a6703 100644 --- a/src/core/lib/iomgr/resolve_address.cc +++ b/src/core/lib/iomgr/resolve_address.cc @@ -17,9 +17,10 @@ */ #include +#include "src/core/lib/iomgr/resolve_address.h" + #include #include -#include "src/core/lib/iomgr/resolve_address.h" namespace grpc_core { const char* kDefaultSecurePort = "https"; diff --git a/src/core/lib/iomgr/resolve_address_custom.h b/src/core/lib/iomgr/resolve_address_custom.h index 5f674dd038e..4063dcf155a 100644 --- a/src/core/lib/iomgr/resolve_address_custom.h +++ b/src/core/lib/iomgr/resolve_address_custom.h @@ -22,7 +22,6 @@ #include #include "src/core/lib/iomgr/port.h" - #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/sockaddr.h" diff --git a/src/core/lib/iomgr/resolve_address_posix.cc b/src/core/lib/iomgr/resolve_address_posix.cc index d0d1e0cd05d..32816fec0af 100644 --- a/src/core/lib/iomgr/resolve_address_posix.cc +++ b/src/core/lib/iomgr/resolve_address_posix.cc @@ -21,10 +21,6 @@ #include "src/core/lib/iomgr/port.h" #ifdef GRPC_POSIX_SOCKET_RESOLVE_ADDRESS -#include "src/core/lib/iomgr/sockaddr.h" - -#include "src/core/lib/iomgr/resolve_address.h" - #include #include @@ -40,6 +36,8 @@ #include "src/core/lib/iomgr/block_annotate.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr_internal.h" +#include "src/core/lib/iomgr/resolve_address.h" +#include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/unix_sockets_posix.h" static grpc_error_handle posix_blocking_resolve_address( diff --git a/src/core/lib/iomgr/resolve_address_windows.cc b/src/core/lib/iomgr/resolve_address_windows.cc index 926237bccf7..5f31e1279bf 100644 --- a/src/core/lib/iomgr/resolve_address_windows.cc +++ b/src/core/lib/iomgr/resolve_address_windows.cc @@ -21,10 +21,6 @@ #include "src/core/lib/iomgr/port.h" #ifdef GRPC_WINSOCK_SOCKET -#include "src/core/lib/iomgr/sockaddr.h" - -#include "src/core/lib/iomgr/resolve_address.h" - #include #include #include @@ -46,6 +42,8 @@ #include "src/core/lib/iomgr/block_annotate.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr_internal.h" +#include "src/core/lib/iomgr/resolve_address.h" +#include "src/core/lib/iomgr/sockaddr.h" struct request { char* name; diff --git a/src/core/lib/iomgr/sockaddr.h b/src/core/lib/iomgr/sockaddr.h index 298d74ff886..7abb82ddb2b 100644 --- a/src/core/lib/iomgr/sockaddr.h +++ b/src/core/lib/iomgr/sockaddr.h @@ -23,12 +23,10 @@ #ifndef GRPC_CORE_LIB_IOMGR_SOCKADDR_H #define GRPC_CORE_LIB_IOMGR_SOCKADDR_H -#include - #include -#include "src/core/lib/iomgr/port.h" #include "src/core/lib/event_engine/sockaddr.h" +#include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/sockaddr_posix.h" #include "src/core/lib/iomgr/sockaddr_windows.h" diff --git a/src/core/lib/iomgr/socket_factory_posix.cc b/src/core/lib/iomgr/socket_factory_posix.cc index 8d1bd71a111..50fb2eff124 100644 --- a/src/core/lib/iomgr/socket_factory_posix.cc +++ b/src/core/lib/iomgr/socket_factory_posix.cc @@ -22,13 +22,13 @@ #ifdef GRPC_POSIX_SOCKET_SOCKET_FACTORY +#include +#include + #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/socket_factory_posix.h" -#include -#include - void grpc_socket_factory_init(grpc_socket_factory* factory, const grpc_socket_factory_vtable* vtable) { factory->vtable = vtable; diff --git a/src/core/lib/iomgr/socket_factory_posix.h b/src/core/lib/iomgr/socket_factory_posix.h index 92ea6c16b70..287ae5f0ef3 100644 --- a/src/core/lib/iomgr/socket_factory_posix.h +++ b/src/core/lib/iomgr/socket_factory_posix.h @@ -23,6 +23,7 @@ #include #include + #include "src/core/lib/iomgr/resolve_address.h" /** The virtual table of grpc_socket_factory */ diff --git a/src/core/lib/iomgr/socket_mutator.h b/src/core/lib/iomgr/socket_mutator.h index 55e69e3eb97..f7564da56c9 100644 --- a/src/core/lib/iomgr/socket_mutator.h +++ b/src/core/lib/iomgr/socket_mutator.h @@ -21,11 +21,11 @@ #include +#include + #include #include -#include - /** How is an fd to be used? */ typedef enum { /** Used for client connection */ diff --git a/src/core/lib/iomgr/socket_utils_common_posix.cc b/src/core/lib/iomgr/socket_utils_common_posix.cc index a9e45efaaa5..53df6d6943d 100644 --- a/src/core/lib/iomgr/socket_utils_common_posix.cc +++ b/src/core/lib/iomgr/socket_utils_common_posix.cc @@ -22,14 +22,14 @@ #ifdef GRPC_POSIX_SOCKET_UTILS_COMMON -#include "src/core/lib/iomgr/socket_utils.h" -#include "src/core/lib/iomgr/socket_utils_posix.h" - #include #include #include #include #include + +#include "src/core/lib/iomgr/socket_utils.h" +#include "src/core/lib/iomgr/socket_utils_posix.h" #ifdef GRPC_LINUX_TCP_H #include #else diff --git a/src/core/lib/iomgr/socket_utils_linux.cc b/src/core/lib/iomgr/socket_utils_linux.cc index 34f93cc4b09..ef5d975b579 100644 --- a/src/core/lib/iomgr/socket_utils_linux.cc +++ b/src/core/lib/iomgr/socket_utils_linux.cc @@ -22,13 +22,13 @@ #ifdef GRPC_LINUX_SOCKETUTILS -#include "src/core/lib/iomgr/sockaddr.h" -#include "src/core/lib/iomgr/socket_utils_posix.h" +#include +#include #include -#include -#include +#include "src/core/lib/iomgr/sockaddr.h" +#include "src/core/lib/iomgr/socket_utils_posix.h" int grpc_accept4(int sockfd, grpc_resolved_address* resolved_addr, int nonblock, int cloexec) { diff --git a/src/core/lib/iomgr/socket_utils_posix.cc b/src/core/lib/iomgr/socket_utils_posix.cc index c48da52ffb2..333e60db782 100644 --- a/src/core/lib/iomgr/socket_utils_posix.cc +++ b/src/core/lib/iomgr/socket_utils_posix.cc @@ -22,14 +22,14 @@ #ifdef GRPC_POSIX_SOCKETUTILS -#include "src/core/lib/iomgr/socket_utils_posix.h" - #include #include #include #include + #include "src/core/lib/iomgr/sockaddr.h" +#include "src/core/lib/iomgr/socket_utils_posix.h" int grpc_accept4(int sockfd, grpc_resolved_address* resolved_addr, int nonblock, int cloexec) { diff --git a/src/core/lib/iomgr/socket_utils_posix.h b/src/core/lib/iomgr/socket_utils_posix.h index d1a52a2c0fe..d79a4a15ed8 100644 --- a/src/core/lib/iomgr/socket_utils_posix.h +++ b/src/core/lib/iomgr/socket_utils_posix.h @@ -21,13 +21,13 @@ #include -#include "src/core/lib/iomgr/resolve_address.h" - #include #include #include + #include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/socket_factory_posix.h" #include "src/core/lib/iomgr/socket_mutator.h" diff --git a/src/core/lib/iomgr/socket_utils_windows.cc b/src/core/lib/iomgr/socket_utils_windows.cc index 9137ab98e60..4f483f0723d 100644 --- a/src/core/lib/iomgr/socket_utils_windows.cc +++ b/src/core/lib/iomgr/socket_utils_windows.cc @@ -22,11 +22,11 @@ #ifdef GRPC_WINDOWS_SOCKETUTILS +#include + #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils.h" -#include - uint16_t grpc_htons(uint16_t hostshort) { return htons(hostshort); } uint16_t grpc_ntohs(uint16_t netshort) { return ntohs(netshort); } diff --git a/src/core/lib/iomgr/tcp_client.h b/src/core/lib/iomgr/tcp_client.h index 808f94bbfcd..995f81791c6 100644 --- a/src/core/lib/iomgr/tcp_client.h +++ b/src/core/lib/iomgr/tcp_client.h @@ -23,6 +23,7 @@ #include #include + #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/resolve_address.h" diff --git a/src/core/lib/iomgr/tcp_client_cfstream.cc b/src/core/lib/iomgr/tcp_client_cfstream.cc index e2ea7b7787a..d329f8d36b2 100644 --- a/src/core/lib/iomgr/tcp_client_cfstream.cc +++ b/src/core/lib/iomgr/tcp_client_cfstream.cc @@ -24,15 +24,13 @@ #ifdef GRPC_CFSTREAM_CLIENT #include - +#include #include #include #include #include -#include - #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/host_port.h" diff --git a/src/core/lib/iomgr/tcp_client_custom.cc b/src/core/lib/iomgr/tcp_client_custom.cc index 476b0512fa7..fea2522d70c 100644 --- a/src/core/lib/iomgr/tcp_client_custom.cc +++ b/src/core/lib/iomgr/tcp_client_custom.cc @@ -18,8 +18,6 @@ #include -#include "src/core/lib/iomgr/port.h" - #include #include @@ -28,6 +26,7 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_custom.h" +#include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/iomgr/tcp_custom.h" #include "src/core/lib/iomgr/timer.h" diff --git a/src/core/lib/iomgr/tcp_client_posix.cc b/src/core/lib/iomgr/tcp_client_posix.cc index a01ae910e6e..3e8d20a9d88 100644 --- a/src/core/lib/iomgr/tcp_client_posix.cc +++ b/src/core/lib/iomgr/tcp_client_posix.cc @@ -22,8 +22,6 @@ #ifdef GRPC_POSIX_SOCKET_TCP_CLIENT -#include "src/core/lib/iomgr/tcp_client_posix.h" - #include #include #include @@ -44,6 +42,7 @@ #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_mutator.h" #include "src/core/lib/iomgr/socket_utils_posix.h" +#include "src/core/lib/iomgr/tcp_client_posix.h" #include "src/core/lib/iomgr/tcp_posix.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/iomgr/unix_sockets_posix.h" diff --git a/src/core/lib/iomgr/tcp_client_windows.cc b/src/core/lib/iomgr/tcp_client_windows.cc index c87684306c5..5138b889ac7 100644 --- a/src/core/lib/iomgr/tcp_client_windows.cc +++ b/src/core/lib/iomgr/tcp_client_windows.cc @@ -18,13 +18,11 @@ #include -#include "src/core/lib/iomgr/port.h" - #include -#ifdef GRPC_WINSOCK_SOCKET +#include "src/core/lib/iomgr/port.h" -#include "src/core/lib/iomgr/sockaddr_windows.h" +#ifdef GRPC_WINSOCK_SOCKET #include #include @@ -35,6 +33,7 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/sockaddr.h" +#include "src/core/lib/iomgr/sockaddr_windows.h" #include "src/core/lib/iomgr/socket_windows.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/iomgr/tcp_windows.h" diff --git a/src/core/lib/iomgr/tcp_custom.cc b/src/core/lib/iomgr/tcp_custom.cc index e468af35438..a74bc2881f5 100644 --- a/src/core/lib/iomgr/tcp_custom.cc +++ b/src/core/lib/iomgr/tcp_custom.cc @@ -18,13 +18,12 @@ #include -#include "src/core/lib/iomgr/port.h" +#include "src/core/lib/iomgr/tcp_custom.h" #include #include #include - #include #include #include @@ -32,9 +31,9 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_custom.h" +#include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/resource_quota.h" #include "src/core/lib/iomgr/tcp_client.h" -#include "src/core/lib/iomgr/tcp_custom.h" #include "src/core/lib/iomgr/tcp_server.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_string_helpers.h" diff --git a/src/core/lib/iomgr/tcp_posix.cc b/src/core/lib/iomgr/tcp_posix.cc index 14e91425cce..9d00000408c 100644 --- a/src/core/lib/iomgr/tcp_posix.cc +++ b/src/core/lib/iomgr/tcp_posix.cc @@ -22,8 +22,6 @@ #ifdef GRPC_POSIX_SOCKET_TCP -#include "src/core/lib/iomgr/tcp_posix.h" - #include #include #include @@ -35,6 +33,7 @@ #include #include #include + #include #include @@ -57,6 +56,7 @@ #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/resource_quota.h" #include "src/core/lib/iomgr/socket_utils_posix.h" +#include "src/core/lib/iomgr/tcp_posix.h" #include "src/core/lib/profiling/timers.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_string_helpers.h" diff --git a/src/core/lib/iomgr/tcp_posix.h b/src/core/lib/iomgr/tcp_posix.h index 8acfd60c8db..41f4f679c35 100644 --- a/src/core/lib/iomgr/tcp_posix.h +++ b/src/core/lib/iomgr/tcp_posix.h @@ -31,12 +31,11 @@ #include -#include "src/core/lib/iomgr/port.h" - #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/buffer_list.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/ev_posix.h" +#include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/resource_quota.h" extern grpc_core::TraceFlag grpc_tcp_trace; diff --git a/src/core/lib/iomgr/tcp_server.h b/src/core/lib/iomgr/tcp_server.h index 7aa806a57d1..9a65b6ed99f 100644 --- a/src/core/lib/iomgr/tcp_server.h +++ b/src/core/lib/iomgr/tcp_server.h @@ -21,11 +21,11 @@ #include +#include + #include #include -#include - #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/resolve_address.h" diff --git a/src/core/lib/iomgr/tcp_server_custom.cc b/src/core/lib/iomgr/tcp_server_custom.cc index 0e1363065be..cb622c03c02 100644 --- a/src/core/lib/iomgr/tcp_server_custom.cc +++ b/src/core/lib/iomgr/tcp_server_custom.cc @@ -18,8 +18,6 @@ #include -#include "src/core/lib/iomgr/port.h" - #include #include @@ -33,6 +31,7 @@ #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr_custom.h" +#include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/tcp_custom.h" #include "src/core/lib/iomgr/tcp_server.h" diff --git a/src/core/lib/iomgr/tcp_server_utils_posix_common.cc b/src/core/lib/iomgr/tcp_server_utils_posix_common.cc index 2804cac3fa2..7501596ecab 100644 --- a/src/core/lib/iomgr/tcp_server_utils_posix_common.cc +++ b/src/core/lib/iomgr/tcp_server_utils_posix_common.cc @@ -22,8 +22,6 @@ #ifdef GRPC_POSIX_SOCKET_TCP_SERVER_UTILS_COMMON -#include "src/core/lib/iomgr/tcp_server_utils_posix.h" - #include #include #include @@ -40,6 +38,7 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/sockaddr.h" +#include "src/core/lib/iomgr/tcp_server_utils_posix.h" #include "src/core/lib/iomgr/unix_sockets_posix.h" #define MIN_SAFE_ACCEPT_QUEUE_SIZE 100 diff --git a/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc b/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc index a7e8f840db0..090d4729a5b 100644 --- a/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc +++ b/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc @@ -22,8 +22,6 @@ #ifdef GRPC_HAVE_IFADDRS -#include "src/core/lib/iomgr/tcp_server_utils_posix.h" - #include #include #include @@ -39,6 +37,7 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/sockaddr.h" +#include "src/core/lib/iomgr/tcp_server_utils_posix.h" /* Return the listener in s with address addr or NULL. */ static grpc_tcp_listener* find_listener_with_addr(grpc_tcp_server* s, diff --git a/src/core/lib/iomgr/tcp_server_windows.cc b/src/core/lib/iomgr/tcp_server_windows.cc index 2781556b01b..80f4d35eaeb 100644 --- a/src/core/lib/iomgr/tcp_server_windows.cc +++ b/src/core/lib/iomgr/tcp_server_windows.cc @@ -22,8 +22,6 @@ #ifdef GRPC_WINSOCK_SOCKET -#include "src/core/lib/iomgr/sockaddr.h" - #include #include @@ -43,6 +41,7 @@ #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/pollset_windows.h" #include "src/core/lib/iomgr/resolve_address.h" +#include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_windows.h" #include "src/core/lib/iomgr/tcp_server.h" #include "src/core/lib/iomgr/tcp_windows.h" diff --git a/src/core/lib/iomgr/tcp_windows.cc b/src/core/lib/iomgr/tcp_windows.cc index da473e6069b..d0bca6bc8ac 100644 --- a/src/core/lib/iomgr/tcp_windows.cc +++ b/src/core/lib/iomgr/tcp_windows.cc @@ -24,8 +24,6 @@ #include -#include "src/core/lib/iomgr/sockaddr_windows.h" - #include #include #include @@ -36,6 +34,7 @@ #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/sockaddr.h" +#include "src/core/lib/iomgr/sockaddr_windows.h" #include "src/core/lib/iomgr/socket_windows.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/iomgr/tcp_windows.h" diff --git a/src/core/lib/iomgr/timer.cc b/src/core/lib/iomgr/timer.cc index e647cdefa04..6506d302abc 100644 --- a/src/core/lib/iomgr/timer.cc +++ b/src/core/lib/iomgr/timer.cc @@ -19,6 +19,7 @@ #include #include "src/core/lib/iomgr/timer.h" + #include "src/core/lib/iomgr/timer_manager.h" grpc_timer_vtable* grpc_timer_impl; diff --git a/src/core/lib/iomgr/timer.h b/src/core/lib/iomgr/timer.h index 5b55950044d..492d2a5e76e 100644 --- a/src/core/lib/iomgr/timer.h +++ b/src/core/lib/iomgr/timer.h @@ -21,13 +21,12 @@ #include -#include "src/core/lib/iomgr/port.h" - #include #include #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr.h" +#include "src/core/lib/iomgr/port.h" typedef struct grpc_timer { grpc_millis deadline; diff --git a/src/core/lib/iomgr/timer_custom.cc b/src/core/lib/iomgr/timer_custom.cc index cb01b7ce799..90629665fea 100644 --- a/src/core/lib/iomgr/timer_custom.cc +++ b/src/core/lib/iomgr/timer_custom.cc @@ -18,15 +18,15 @@ #include -#include "src/core/lib/iomgr/port.h" +#include "src/core/lib/iomgr/timer_custom.h" #include #include #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/iomgr_custom.h" +#include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/timer.h" -#include "src/core/lib/iomgr/timer_custom.h" static grpc_custom_timer_vtable* custom_timer_impl; diff --git a/src/core/lib/iomgr/timer_generic.cc b/src/core/lib/iomgr/timer_generic.cc index 2289acad448..109de1bf50e 100644 --- a/src/core/lib/iomgr/timer_generic.cc +++ b/src/core/lib/iomgr/timer_generic.cc @@ -18,16 +18,12 @@ #include -#include "src/core/lib/iomgr/port.h" - #include #include #include "absl/strings/str_cat.h" -#include "src/core/lib/iomgr/timer.h" - #include #include #include @@ -38,7 +34,9 @@ #include "src/core/lib/gpr/tls.h" #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/time_averaged_stats.h" +#include "src/core/lib/iomgr/timer.h" #include "src/core/lib/iomgr/timer_heap.h" #define INVALID_HEAP_INDEX 0xffffffffu diff --git a/src/core/lib/iomgr/timer_generic.h b/src/core/lib/iomgr/timer_generic.h index 97a45133553..2ac002b6f37 100644 --- a/src/core/lib/iomgr/timer_generic.h +++ b/src/core/lib/iomgr/timer_generic.h @@ -22,6 +22,7 @@ #include #include + #include "src/core/lib/iomgr/exec_ctx.h" struct grpc_timer { diff --git a/src/core/lib/iomgr/timer_heap.cc b/src/core/lib/iomgr/timer_heap.cc index 2c6a599149b..5c53fadf1f5 100644 --- a/src/core/lib/iomgr/timer_heap.cc +++ b/src/core/lib/iomgr/timer_heap.cc @@ -18,8 +18,6 @@ #include -#include "src/core/lib/iomgr/port.h" - #include "src/core/lib/iomgr/timer_heap.h" #include @@ -27,6 +25,7 @@ #include #include "src/core/lib/gpr/useful.h" +#include "src/core/lib/iomgr/port.h" /* Adjusts a heap so as to move a hole at position i closer to the root, until a suitable position is found for element t. Then, copies t into that diff --git a/src/core/lib/iomgr/udp_server.cc b/src/core/lib/iomgr/udp_server.cc index 4efaf23b4aa..653e78e4300 100644 --- a/src/core/lib/iomgr/udp_server.cc +++ b/src/core/lib/iomgr/udp_server.cc @@ -31,8 +31,6 @@ #ifdef GRPC_POSIX_SOCKET_UDP_SERVER -#include "src/core/lib/iomgr/udp_server.h" - #include #include #include @@ -68,6 +66,7 @@ #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_factory_posix.h" #include "src/core/lib/iomgr/socket_utils_posix.h" +#include "src/core/lib/iomgr/udp_server.h" #include "src/core/lib/iomgr/unix_sockets_posix.h" /* A listener which implements basic features of Listening on a port for diff --git a/src/core/lib/iomgr/unix_sockets_posix.cc b/src/core/lib/iomgr/unix_sockets_posix.cc index 2b077a38cf0..0154831c8cc 100644 --- a/src/core/lib/iomgr/unix_sockets_posix.cc +++ b/src/core/lib/iomgr/unix_sockets_posix.cc @@ -21,8 +21,6 @@ #ifdef GRPC_HAVE_UNIX_SOCKET -#include "src/core/lib/iomgr/sockaddr.h" - #include #include #include @@ -30,13 +28,13 @@ #include "absl/strings/str_cat.h" -#include "src/core/lib/address_utils/parse_address.h" -#include "src/core/lib/iomgr/unix_sockets_posix.h" - #include #include +#include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/gpr/useful.h" +#include "src/core/lib/iomgr/sockaddr.h" +#include "src/core/lib/iomgr/unix_sockets_posix.h" void grpc_create_socketpair_if_unix(int sv[2]) { GPR_ASSERT(socketpair(AF_UNIX, SOCK_STREAM, 0, sv) == 0); diff --git a/src/core/lib/iomgr/unix_sockets_posix.h b/src/core/lib/iomgr/unix_sockets_posix.h index c35423bc040..f0e5d440121 100644 --- a/src/core/lib/iomgr/unix_sockets_posix.h +++ b/src/core/lib/iomgr/unix_sockets_posix.h @@ -23,14 +23,13 @@ #include -#include "src/core/lib/iomgr/port.h" +#include "absl/strings/string_view.h" #include +#include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/resolve_address.h" -#include "absl/strings/string_view.h" - void grpc_create_socketpair_if_unix(int sv[2]); grpc_error_handle grpc_resolve_unix_domain_address( diff --git a/src/core/lib/iomgr/wakeup_fd_nospecial.cc b/src/core/lib/iomgr/wakeup_fd_nospecial.cc index b1565751ce3..aff61eaa615 100644 --- a/src/core/lib/iomgr/wakeup_fd_nospecial.cc +++ b/src/core/lib/iomgr/wakeup_fd_nospecial.cc @@ -28,6 +28,7 @@ #ifdef GRPC_POSIX_NO_SPECIAL_WAKEUP_FD #include + #include "src/core/lib/iomgr/wakeup_fd_posix.h" static int check_availability_invalid(void) { return 0; } diff --git a/src/core/lib/iomgr/wakeup_fd_pipe.cc b/src/core/lib/iomgr/wakeup_fd_pipe.cc index 943d9d54e77..e25a9448803 100644 --- a/src/core/lib/iomgr/wakeup_fd_pipe.cc +++ b/src/core/lib/iomgr/wakeup_fd_pipe.cc @@ -22,9 +22,6 @@ #ifdef GRPC_POSIX_WAKEUP_FD -#include "src/core/lib/iomgr/wakeup_fd_pipe.h" -#include "src/core/lib/iomgr/wakeup_fd_posix.h" - #include #include #include @@ -32,6 +29,8 @@ #include #include "src/core/lib/iomgr/socket_utils_posix.h" +#include "src/core/lib/iomgr/wakeup_fd_pipe.h" +#include "src/core/lib/iomgr/wakeup_fd_posix.h" static grpc_error_handle pipe_init(grpc_wakeup_fd* fd_info) { int pipefd[2]; diff --git a/src/core/lib/iomgr/wakeup_fd_posix.cc b/src/core/lib/iomgr/wakeup_fd_posix.cc index 36b497b8670..89bd51baa95 100644 --- a/src/core/lib/iomgr/wakeup_fd_posix.cc +++ b/src/core/lib/iomgr/wakeup_fd_posix.cc @@ -23,6 +23,7 @@ #ifdef GRPC_POSIX_WAKEUP_FD #include + #include "src/core/lib/iomgr/wakeup_fd_pipe.h" #include "src/core/lib/iomgr/wakeup_fd_posix.h" diff --git a/src/core/lib/matchers/matchers.h b/src/core/lib/matchers/matchers.h index fa17b416101..9889d688d06 100644 --- a/src/core/lib/matchers/matchers.h +++ b/src/core/lib/matchers/matchers.h @@ -23,7 +23,6 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" - #include "re2/re2.h" namespace grpc_core { diff --git a/src/core/lib/profiling/basic_timers.cc b/src/core/lib/profiling/basic_timers.cc index 6a586d46216..f98624bf38a 100644 --- a/src/core/lib/profiling/basic_timers.cc +++ b/src/core/lib/profiling/basic_timers.cc @@ -22,15 +22,16 @@ #ifdef GRPC_BASIC_PROFILER -#include -#include -#include -#include #include #include #include #include +#include +#include +#include +#include + #include "src/core/lib/gpr/tls.h" #include "src/core/lib/gprpp/global_config.h" #include "src/core/lib/profiling/timers.h" diff --git a/src/core/lib/profiling/stap_timers.cc b/src/core/lib/profiling/stap_timers.cc index 5ee1c4317c7..a00dbaf24be 100644 --- a/src/core/lib/profiling/stap_timers.cc +++ b/src/core/lib/profiling/stap_timers.cc @@ -20,9 +20,9 @@ #ifdef GRPC_STAP_PROFILER -#include "src/core/lib/profiling/timers.h" - #include + +#include "src/core/lib/profiling/timers.h" /* Generated from src/core/profiling/stap_probes.d */ #include "src/core/lib/profiling/stap_probes.h" diff --git a/src/core/lib/promise/activity.cc b/src/core/lib/promise/activity.cc index dcf44db6629..a8d4715ef70 100644 --- a/src/core/lib/promise/activity.cc +++ b/src/core/lib/promise/activity.cc @@ -14,9 +14,10 @@ #include -#include "src/core/lib/gprpp/atomic_utils.h" #include "src/core/lib/promise/activity.h" +#include "src/core/lib/gprpp/atomic_utils.h" + namespace grpc_core { /////////////////////////////////////////////////////////////////////////////// diff --git a/src/core/lib/promise/context.h b/src/core/lib/promise/context.h index e46818a1b91..59cdf2133c9 100644 --- a/src/core/lib/promise/context.h +++ b/src/core/lib/promise/context.h @@ -18,6 +18,7 @@ #include #include + #include "src/core/lib/gpr/tls.h" namespace grpc_core { diff --git a/src/core/lib/promise/detail/basic_join.h b/src/core/lib/promise/detail/basic_join.h index 453d281bc43..01d2d33a6cd 100644 --- a/src/core/lib/promise/detail/basic_join.h +++ b/src/core/lib/promise/detail/basic_join.h @@ -21,6 +21,7 @@ #include #include "absl/utility/utility.h" + #include "src/core/lib/gprpp/bitset.h" #include "src/core/lib/gprpp/construct_destruct.h" #include "src/core/lib/promise/detail/promise_factory.h" diff --git a/src/core/lib/promise/detail/basic_seq.h b/src/core/lib/promise/detail/basic_seq.h index daa8662038d..72b91f9a03d 100644 --- a/src/core/lib/promise/detail/basic_seq.h +++ b/src/core/lib/promise/detail/basic_seq.h @@ -19,6 +19,7 @@ #include "absl/types/variant.h" #include "absl/utility/utility.h" + #include "src/core/lib/gprpp/construct_destruct.h" #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/detail/switch.h" diff --git a/src/core/lib/promise/detail/promise_factory.h b/src/core/lib/promise/detail/promise_factory.h index 0b4d89a95f8..2adb0b75c05 100644 --- a/src/core/lib/promise/detail/promise_factory.h +++ b/src/core/lib/promise/detail/promise_factory.h @@ -17,11 +17,11 @@ #include +#include "absl/meta/type_traits.h" + #include "src/core/lib/promise/detail/promise_like.h" #include "src/core/lib/promise/poll.h" -#include "absl/meta/type_traits.h" - // PromiseFactory is an adaptor class. // // Where a Promise is a thing that's polled periodically, a PromiseFactory diff --git a/src/core/lib/promise/detail/promise_like.h b/src/core/lib/promise/detail/promise_like.h index 57507141102..c80169ae02b 100644 --- a/src/core/lib/promise/detail/promise_like.h +++ b/src/core/lib/promise/detail/promise_like.h @@ -17,9 +17,8 @@ #include -#include "src/core/lib/promise/poll.h" - #include + #include "src/core/lib/promise/poll.h" // A Promise is a callable object that returns Poll for some T. diff --git a/src/core/lib/promise/if.h b/src/core/lib/promise/if.h index cef1e792eb3..5c13105e6bf 100644 --- a/src/core/lib/promise/if.h +++ b/src/core/lib/promise/if.h @@ -19,6 +19,7 @@ #include "absl/status/statusor.h" #include "absl/types/variant.h" + #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/poll.h" diff --git a/src/core/lib/promise/loop.h b/src/core/lib/promise/loop.h index 4b374846734..0a5346b9fbf 100644 --- a/src/core/lib/promise/loop.h +++ b/src/core/lib/promise/loop.h @@ -18,6 +18,7 @@ #include #include "absl/types/variant.h" + #include "src/core/lib/promise/detail/promise_factory.h" namespace grpc_core { diff --git a/src/core/lib/promise/map.h b/src/core/lib/promise/map.h index aba0f259ecb..1ac94d46040 100644 --- a/src/core/lib/promise/map.h +++ b/src/core/lib/promise/map.h @@ -20,6 +20,7 @@ #include #include "absl/types/variant.h" + #include "src/core/lib/promise/detail/promise_like.h" #include "src/core/lib/promise/poll.h" diff --git a/src/core/lib/promise/observable.h b/src/core/lib/promise/observable.h index 456579460f5..6ca58c3a7f3 100644 --- a/src/core/lib/promise/observable.h +++ b/src/core/lib/promise/observable.h @@ -18,7 +18,9 @@ #include #include + #include "absl/types/optional.h" + #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/wait_set.h" diff --git a/src/core/lib/promise/pipe.h b/src/core/lib/promise/pipe.h index 1d8618b839d..3d287ca89f1 100644 --- a/src/core/lib/promise/pipe.h +++ b/src/core/lib/promise/pipe.h @@ -20,6 +20,7 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/types/optional.h" + #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/intra_activity_waiter.h" diff --git a/src/core/lib/promise/promise.h b/src/core/lib/promise/promise.h index 24e183d0bd3..9cf526622e0 100644 --- a/src/core/lib/promise/promise.h +++ b/src/core/lib/promise/promise.h @@ -18,7 +18,9 @@ #include #include + #include "absl/types/optional.h" + #include "src/core/lib/promise/detail/promise_like.h" #include "src/core/lib/promise/poll.h" diff --git a/src/core/lib/promise/race.h b/src/core/lib/promise/race.h index cbafd859370..9bd9e93c64b 100644 --- a/src/core/lib/promise/race.h +++ b/src/core/lib/promise/race.h @@ -18,6 +18,7 @@ #include #include + #include "src/core/lib/promise/poll.h" namespace grpc_core { diff --git a/src/core/lib/promise/seq.h b/src/core/lib/promise/seq.h index 84334a6e2c8..b81cb2d47b4 100644 --- a/src/core/lib/promise/seq.h +++ b/src/core/lib/promise/seq.h @@ -18,6 +18,7 @@ #include #include "absl/types/variant.h" + #include "src/core/lib/promise/detail/basic_seq.h" #include "src/core/lib/promise/poll.h" diff --git a/src/core/lib/promise/try_seq.h b/src/core/lib/promise/try_seq.h index 465d56723f2..9b4fb93818f 100644 --- a/src/core/lib/promise/try_seq.h +++ b/src/core/lib/promise/try_seq.h @@ -18,8 +18,10 @@ #include #include + #include "absl/status/statusor.h" #include "absl/types/variant.h" + #include "src/core/lib/promise/detail/basic_seq.h" #include "src/core/lib/promise/poll.h" diff --git a/src/core/lib/promise/wait_set.h b/src/core/lib/promise/wait_set.h index a998f5bf634..719f60b76bd 100644 --- a/src/core/lib/promise/wait_set.h +++ b/src/core/lib/promise/wait_set.h @@ -18,6 +18,7 @@ #include #include "absl/container/flat_hash_set.h" + #include "src/core/lib/promise/activity.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/cel_authorization_engine.cc b/src/core/lib/security/authorization/cel_authorization_engine.cc index fae5cc456d0..a5d0a92e671 100644 --- a/src/core/lib/security/authorization/cel_authorization_engine.cc +++ b/src/core/lib/security/authorization/cel_authorization_engine.cc @@ -14,10 +14,11 @@ #include +#include "src/core/lib/security/authorization/cel_authorization_engine.h" + #include "absl/memory/memory.h" #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/security/authorization/cel_authorization_engine.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/cel_authorization_engine.h b/src/core/lib/security/authorization/cel_authorization_engine.h index 6f37bfbe8ff..3c20478ff04 100644 --- a/src/core/lib/security/authorization/cel_authorization_engine.h +++ b/src/core/lib/security/authorization/cel_authorization_engine.h @@ -18,7 +18,6 @@ #include -#include #include #include #include @@ -29,6 +28,8 @@ #include "google/api/expr/v1alpha1/syntax.upb.h" #include "upb/upb.hpp" +#include + #include "src/core/lib/security/authorization/evaluate_args.h" #include "src/core/lib/security/authorization/mock_cel/activation.h" diff --git a/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc b/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc index a2e706c379a..7a0c77e9f53 100644 --- a/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc +++ b/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc @@ -14,11 +14,12 @@ #include +#include "src/core/lib/security/authorization/grpc_authorization_policy_provider.h" + #include #include #include "src/core/lib/security/authorization/grpc_authorization_engine.h" -#include "src/core/lib/security/authorization/grpc_authorization_policy_provider.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/matchers.cc b/src/core/lib/security/authorization/matchers.cc index ddff2bbf717..a5d337b2ba2 100644 --- a/src/core/lib/security/authorization/matchers.cc +++ b/src/core/lib/security/authorization/matchers.cc @@ -14,10 +14,11 @@ #include +#include "src/core/lib/security/authorization/matchers.h" + #include #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/security/authorization/matchers.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/mock_cel/cel_expression.h b/src/core/lib/security/authorization/mock_cel/cel_expression.h index 34a31a6d525..82ece385e72 100644 --- a/src/core/lib/security/authorization/mock_cel/cel_expression.h +++ b/src/core/lib/security/authorization/mock_cel/cel_expression.h @@ -21,8 +21,8 @@ #include #include "absl/status/statusor.h" - #include "google/api/expr/v1alpha1/syntax.upb.h" + #include "src/core/lib/security/authorization/mock_cel/activation.h" #include "src/core/lib/security/authorization/mock_cel/cel_value.h" diff --git a/src/core/lib/security/authorization/mock_cel/evaluator_core.h b/src/core/lib/security/authorization/mock_cel/evaluator_core.h index 9aab0d2a8e6..1cf99159b73 100644 --- a/src/core/lib/security/authorization/mock_cel/evaluator_core.h +++ b/src/core/lib/security/authorization/mock_cel/evaluator_core.h @@ -22,8 +22,8 @@ #include #include "absl/status/statusor.h" - #include "google/api/expr/v1alpha1/syntax.upb.h" + #include "src/core/lib/security/authorization/mock_cel/activation.h" #include "src/core/lib/security/authorization/mock_cel/cel_expression.h" #include "src/core/lib/security/authorization/mock_cel/cel_value.h" diff --git a/src/core/lib/security/authorization/rbac_translator.h b/src/core/lib/security/authorization/rbac_translator.h index 51d7024866a..4adab7dc0e3 100644 --- a/src/core/lib/security/authorization/rbac_translator.h +++ b/src/core/lib/security/authorization/rbac_translator.h @@ -18,6 +18,7 @@ #include #include "absl/status/statusor.h" + #include "src/core/lib/json/json.h" #include "src/core/lib/security/authorization/rbac_policy.h" diff --git a/src/core/lib/security/context/security_context.cc b/src/core/lib/security/context/security_context.cc index d760d82f226..bc683f34418 100644 --- a/src/core/lib/security/context/security_context.cc +++ b/src/core/lib/security/context/security_context.cc @@ -18,22 +18,23 @@ #include +#include "src/core/lib/security/context/security_context.h" + #include +#include +#include +#include +#include + #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gprpp/arena.h" #include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/security/context/security_context.h" #include "src/core/lib/surface/api_trace.h" #include "src/core/lib/surface/call.h" -#include -#include -#include -#include - grpc_core::DebugOnlyTraceFlag grpc_trace_auth_context_refcount( false, "auth_context_refcount"); diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc index 8454fd7558c..0c6f5561f5c 100644 --- a/src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc +++ b/src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc @@ -20,12 +20,12 @@ #ifdef GPR_LINUX -#include "src/core/lib/security/credentials/alts/check_gcp_environment.h" +#include #include #include -#include +#include "src/core/lib/security/credentials/alts/check_gcp_environment.h" #define GRPC_ALTS_EXPECT_NAME_GOOGLE "Google" #define GRPC_ALTS_EXPECT_NAME_GCE "Google Compute Engine" diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc index b71f66a536a..cb4010253c1 100644 --- a/src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc +++ b/src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc @@ -20,10 +20,10 @@ #if !defined(GPR_LINUX) && !defined(GPR_WINDOWS) -#include "src/core/lib/security/credentials/alts/check_gcp_environment.h" - #include +#include "src/core/lib/security/credentials/alts/check_gcp_environment.h" + bool grpc_alts_is_running_on_gcp() { gpr_log(GPR_INFO, "ALTS: Platforms other than Linux and Windows are not supported"); diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc index 59432cff361..5d2bdc14dea 100644 --- a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc +++ b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc @@ -20,8 +20,6 @@ #ifdef GPR_WINDOWS -#include "src/core/lib/security/credentials/alts/check_gcp_environment.h" - #include #include #include @@ -31,6 +29,8 @@ #include #include +#include "src/core/lib/security/credentials/alts/check_gcp_environment.h" + namespace grpc_core { namespace internal { diff --git a/src/core/lib/security/credentials/composite/composite_credentials.cc b/src/core/lib/security/credentials/composite/composite_credentials.cc index 5543ad1a244..b4bdc31f9cb 100644 --- a/src/core/lib/security/credentials/composite/composite_credentials.cc +++ b/src/core/lib/security/credentials/composite/composite_credentials.cc @@ -26,14 +26,15 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/iomgr/polling_entity.h" -#include "src/core/lib/surface/api_trace.h" #include #include #include +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/iomgr/polling_entity.h" +#include "src/core/lib/surface/api_trace.h" + /* -- Composite call credentials. -- */ static void composite_call_metadata_cb(void* arg, grpc_error_handle error); diff --git a/src/core/lib/security/credentials/credentials.cc b/src/core/lib/security/credentials/credentials.cc index d2f4c9c6bb5..dcc69d70757 100644 --- a/src/core/lib/security/credentials/credentials.cc +++ b/src/core/lib/security/credentials/credentials.cc @@ -23,6 +23,12 @@ #include #include +#include +#include +#include +#include +#include + #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/http/httpcli.h" @@ -31,12 +37,6 @@ #include "src/core/lib/json/json.h" #include "src/core/lib/surface/api_trace.h" -#include -#include -#include -#include -#include - /* -- Common. -- */ void grpc_channel_credentials_release(grpc_channel_credentials* creds) { diff --git a/src/core/lib/security/credentials/credentials.h b/src/core/lib/security/credentials/credentials.h index b8609c58d7d..737fe87c7df 100644 --- a/src/core/lib/security/credentials/credentials.h +++ b/src/core/lib/security/credentials/credentials.h @@ -28,13 +28,13 @@ #include #include #include -#include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/http/httpcli.h" #include "src/core/lib/http/parser.h" #include "src/core/lib/iomgr/polling_entity.h" #include "src/core/lib/security/security_connector/security_connector.h" +#include "src/core/lib/transport/metadata_batch.h" struct grpc_http_response; diff --git a/src/core/lib/security/credentials/credentials_metadata.cc b/src/core/lib/security/credentials/credentials_metadata.cc index 703de4aaafd..9d0284d3ebb 100644 --- a/src/core/lib/security/credentials/credentials_metadata.cc +++ b/src/core/lib/security/credentials/credentials_metadata.cc @@ -18,12 +18,11 @@ #include -#include "src/core/lib/security/credentials/credentials.h" +#include #include -#include - +#include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/slice/slice_internal.h" static void mdelem_list_ensure_capacity(grpc_credentials_mdelem_array* list, diff --git a/src/core/lib/security/credentials/external/aws_external_account_credentials.h b/src/core/lib/security/credentials/external/aws_external_account_credentials.h index 50ccf1943d3..bf232f2fca3 100644 --- a/src/core/lib/security/credentials/external/aws_external_account_credentials.h +++ b/src/core/lib/security/credentials/external/aws_external_account_credentials.h @@ -19,9 +19,8 @@ #include -#include "src/core/lib/security/credentials/external/external_account_credentials.h" - #include "src/core/lib/security/credentials/external/aws_request_signer.h" +#include "src/core/lib/security/credentials/external/external_account_credentials.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/external/aws_request_signer.cc b/src/core/lib/security/credentials/external/aws_request_signer.cc index b665701b023..bc4920f3ffb 100644 --- a/src/core/lib/security/credentials/external/aws_request_signer.cc +++ b/src/core/lib/security/credentials/external/aws_request_signer.cc @@ -17,6 +17,9 @@ #include "src/core/lib/security/credentials/external/aws_request_signer.h" +#include +#include + #include "absl/strings/ascii.h" #include "absl/strings/escaping.h" #include "absl/strings/str_format.h" @@ -25,9 +28,6 @@ #include "absl/time/clock.h" #include "absl/time/time.h" -#include -#include - namespace grpc_core { namespace { diff --git a/src/core/lib/security/credentials/external/external_account_credentials.cc b/src/core/lib/security/credentials/external/external_account_credentials.cc index 98a404e65af..7cf81d9676a 100644 --- a/src/core/lib/security/credentials/external/external_account_credentials.cc +++ b/src/core/lib/security/credentials/external/external_account_credentials.cc @@ -24,12 +24,11 @@ #include "absl/time/time.h" #include "src/core/lib/http/parser.h" -#include "src/core/lib/security/util/json_util.h" -#include "src/core/lib/slice/b64.h" - #include "src/core/lib/security/credentials/external/aws_external_account_credentials.h" #include "src/core/lib/security/credentials/external/file_external_account_credentials.h" #include "src/core/lib/security/credentials/external/url_external_account_credentials.h" +#include "src/core/lib/security/util/json_util.h" +#include "src/core/lib/slice/b64.h" #define EXTERNAL_ACCOUNT_CREDENTIALS_GRANT_TYPE \ "urn:ietf:params:oauth:grant-type:token-exchange" diff --git a/src/core/lib/security/credentials/google_default/credentials_generic.cc b/src/core/lib/security/credentials/google_default/credentials_generic.cc index 8716edeca61..1b56824db0f 100644 --- a/src/core/lib/security/credentials/google_default/credentials_generic.cc +++ b/src/core/lib/security/credentials/google_default/credentials_generic.cc @@ -18,8 +18,6 @@ #include -#include "src/core/lib/security/credentials/google_default/google_default_credentials.h" - #include #include "absl/strings/str_cat.h" @@ -28,6 +26,7 @@ #include #include "src/core/lib/gpr/env.h" +#include "src/core/lib/security/credentials/google_default/google_default_credentials.h" std::string grpc_get_well_known_google_credentials_file_path_impl(void) { char* base = gpr_getenv(GRPC_GOOGLE_CREDENTIALS_PATH_ENV_VAR); diff --git a/src/core/lib/security/credentials/google_default/google_default_credentials.cc b/src/core/lib/security/credentials/google_default/google_default_credentials.cc index 3ea8b9a8b0c..1d95fe30b17 100644 --- a/src/core/lib/security/credentials/google_default/google_default_credentials.cc +++ b/src/core/lib/security/credentials/google_default/google_default_credentials.cc @@ -18,7 +18,7 @@ #include -#include "src/core/lib/security/credentials/credentials.h" +#include "src/core/lib/security/credentials/google_default/google_default_credentials.h" #include @@ -42,8 +42,8 @@ #include "src/core/lib/iomgr/polling_entity.h" #include "src/core/lib/security/credentials/alts/alts_credentials.h" #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" +#include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/external/external_account_credentials.h" -#include "src/core/lib/security/credentials/google_default/google_default_credentials.h" #include "src/core/lib/security/credentials/jwt/jwt_credentials.h" #include "src/core/lib/security/credentials/oauth2/oauth2_credentials.h" #include "src/core/lib/slice/slice_internal.h" diff --git a/src/core/lib/security/credentials/iam/iam_credentials.cc b/src/core/lib/security/credentials/iam/iam_credentials.cc index c9dc223544d..36e7f11fc13 100644 --- a/src/core/lib/security/credentials/iam/iam_credentials.cc +++ b/src/core/lib/security/credentials/iam/iam_credentials.cc @@ -20,12 +20,13 @@ #include "src/core/lib/security/credentials/iam/iam_credentials.h" +#include "absl/strings/str_format.h" + #include #include #include #include -#include "absl/strings/str_format.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/surface/api_trace.h" diff --git a/src/core/lib/security/credentials/jwt/json_token.cc b/src/core/lib/security/credentials/jwt/json_token.cc index 5e317c490a5..f44ef0f6d9e 100644 --- a/src/core/lib/security/credentials/jwt/json_token.cc +++ b/src/core/lib/security/credentials/jwt/json_token.cc @@ -18,7 +18,6 @@ #include -#include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/credentials/jwt/json_token.h" #include @@ -30,6 +29,7 @@ #include #include "src/core/lib/gpr/string.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/util/json_util.h" #include "src/core/lib/slice/b64.h" diff --git a/src/core/lib/security/credentials/jwt/json_token.h b/src/core/lib/security/credentials/jwt/json_token.h index b9a41c6b2b6..163cc3d76a4 100644 --- a/src/core/lib/security/credentials/jwt/json_token.h +++ b/src/core/lib/security/credentials/jwt/json_token.h @@ -21,9 +21,10 @@ #include -#include #include +#include + #include "src/core/lib/json/json.h" /* --- Constants. --- */ diff --git a/src/core/lib/security/credentials/jwt/jwt_credentials.cc b/src/core/lib/security/credentials/jwt/jwt_credentials.cc index 07e4cb08ba5..f9132578b99 100644 --- a/src/core/lib/security/credentials/jwt/jwt_credentials.cc +++ b/src/core/lib/security/credentials/jwt/jwt_credentials.cc @@ -27,6 +27,11 @@ #include "absl/strings/str_cat.h" +#include +#include +#include +#include + #include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/slice/slice_internal.h" @@ -34,11 +39,6 @@ #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/uri/uri_parser.h" -#include -#include -#include -#include - using grpc_core::Json; void grpc_service_account_jwt_access_credentials::reset_cache() { diff --git a/src/core/lib/security/credentials/jwt/jwt_credentials.h b/src/core/lib/security/credentials/jwt/jwt_credentials.h index fca4487fde3..7a79cb7bf48 100644 --- a/src/core/lib/security/credentials/jwt/jwt_credentials.h +++ b/src/core/lib/security/credentials/jwt/jwt_credentials.h @@ -23,10 +23,11 @@ #include -#include - #include "absl/strings/str_format.h" #include "absl/time/time.h" + +#include + #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/jwt/json_token.h" diff --git a/src/core/lib/security/credentials/jwt/jwt_verifier.h b/src/core/lib/security/credentials/jwt/jwt_verifier.h index 66ddbf2206b..2d1d3606af6 100644 --- a/src/core/lib/security/credentials/jwt/jwt_verifier.h +++ b/src/core/lib/security/credentials/jwt/jwt_verifier.h @@ -21,12 +21,12 @@ #include -#include "src/core/lib/iomgr/pollset.h" -#include "src/core/lib/json/json.h" - #include #include +#include "src/core/lib/iomgr/pollset.h" +#include "src/core/lib/json/json.h" + /* --- Constants. --- */ #define GRPC_OPENID_CONFIG_URL_SUFFIX "/.well-known/openid-configuration" diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc index 49232e09147..fe933657ba6 100644 --- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc +++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc @@ -18,7 +18,6 @@ #include -#include "src/core/lib/json/json.h" #include "src/core/lib/security/credentials/oauth2/oauth2_credentials.h" #include @@ -39,6 +38,7 @@ #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/load_file.h" +#include "src/core/lib/json/json.h" #include "src/core/lib/security/util/json_util.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/surface/api_trace.h" diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.h b/src/core/lib/security/credentials/oauth2/oauth2_credentials.h index f174112b0de..ef64b23ef58 100644 --- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.h +++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.h @@ -24,6 +24,7 @@ #include #include + #include "src/core/lib/json/json.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/uri/uri_parser.h" diff --git a/src/core/lib/security/credentials/ssl/ssl_credentials.cc b/src/core/lib/security/credentials/ssl/ssl_credentials.cc index 469eb0cfcfd..093f1ad0bf5 100644 --- a/src/core/lib/security/credentials/ssl/ssl_credentials.cc +++ b/src/core/lib/security/credentials/ssl/ssl_credentials.cc @@ -22,14 +22,14 @@ #include -#include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/surface/api_trace.h" -#include "src/core/tsi/ssl_transport_security.h" - #include #include #include +#include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/surface/api_trace.h" +#include "src/core/tsi/ssl_transport_security.h" + // // SSL Channel Credentials. // diff --git a/src/core/lib/security/credentials/ssl/ssl_credentials.h b/src/core/lib/security/credentials/ssl/ssl_credentials.h index 0491eea7002..647d619ada7 100644 --- a/src/core/lib/security/credentials/ssl/ssl_credentials.h +++ b/src/core/lib/security/credentials/ssl/ssl_credentials.h @@ -21,7 +21,6 @@ #include #include "src/core/lib/security/credentials/credentials.h" - #include "src/core/lib/security/security_connector/ssl/ssl_security_connector.h" class grpc_ssl_credentials : public grpc_channel_credentials { diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.cc b/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.cc index e831aa5c0a2..5fa171998ed 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.cc +++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.cc @@ -18,11 +18,12 @@ #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h" +#include +#include + #include #include #include -#include -#include void grpc_tls_certificate_distributor::SetKeyMaterials( const std::string& cert_name, absl::optional pem_root_certs, diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h b/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h index cca63d130c4..b0bc58ca1dc 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h +++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h @@ -19,12 +19,13 @@ #include -#include - #include #include "absl/container/inlined_vector.h" #include "absl/types/optional.h" + +#include + #include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/security/security_connector/ssl_utils.h" diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc b/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc index 6e1d9342ef0..65357eaa32b 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc +++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc @@ -18,10 +18,11 @@ #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" +#include + #include #include #include -#include #include "src/core/lib/gprpp/stat.h" #include "src/core/lib/slice/slice_internal.h" diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h b/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h index d4368eda095..707e97f7d98 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h +++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h @@ -19,12 +19,13 @@ #include -#include #include #include "absl/container/inlined_vector.h" #include "absl/status/statusor.h" +#include + #include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/thd.h" diff --git a/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h b/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h index 2aae29b4b68..c3953910c56 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h +++ b/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h @@ -21,10 +21,10 @@ #include -#include - #include "absl/container/inlined_vector.h" +#include + #include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" diff --git a/src/core/lib/security/security_connector/load_system_roots_fallback.cc b/src/core/lib/security/security_connector/load_system_roots_fallback.cc index f04d0ed225b..f448d3fcac6 100644 --- a/src/core/lib/security/security_connector/load_system_roots_fallback.cc +++ b/src/core/lib/security/security_connector/load_system_roots_fallback.cc @@ -19,6 +19,7 @@ #include #include + #include "src/core/lib/security/security_connector/load_system_roots.h" #if !defined(GPR_LINUX) && !defined(GPR_ANDROID) diff --git a/src/core/lib/security/security_connector/load_system_roots_linux.cc b/src/core/lib/security/security_connector/load_system_roots_linux.cc index 4cd709f77f6..da311da7156 100644 --- a/src/core/lib/security/security_connector/load_system_roots_linux.cc +++ b/src/core/lib/security/security_connector/load_system_roots_linux.cc @@ -18,12 +18,11 @@ #include -#include #include "src/core/lib/security/security_connector/load_system_roots_linux.h" -#if defined(GPR_LINUX) || defined(GPR_ANDROID) +#include -#include "src/core/lib/security/security_connector/load_system_roots.h" +#if defined(GPR_LINUX) || defined(GPR_ANDROID) #include #include @@ -44,6 +43,7 @@ #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/global_config.h" #include "src/core/lib/iomgr/load_file.h" +#include "src/core/lib/security/security_connector/load_system_roots.h" GPR_GLOBAL_CONFIG_DEFINE_STRING(grpc_system_ssl_roots_dir, "", "Custom directory to SSL Roots"); diff --git a/src/core/lib/security/security_connector/ssl/ssl_security_connector.h b/src/core/lib/security/security_connector/ssl/ssl_security_connector.h index 04c32bb2a8c..57342d94621 100644 --- a/src/core/lib/security/security_connector/ssl/ssl_security_connector.h +++ b/src/core/lib/security/security_connector/ssl/ssl_security_connector.h @@ -23,9 +23,8 @@ #include -#include "src/core/lib/security/security_connector/security_connector.h" - #include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/tsi/ssl_transport_security.h" #include "src/core/tsi/transport_security_interface.h" diff --git a/src/core/lib/security/transport/auth_filters.h b/src/core/lib/security/transport/auth_filters.h index ae31b1d578b..fc9e59cf5fe 100644 --- a/src/core/lib/security/transport/auth_filters.h +++ b/src/core/lib/security/transport/auth_filters.h @@ -22,6 +22,7 @@ #include #include + #include "src/core/lib/channel/channel_stack.h" extern const grpc_channel_filter grpc_client_auth_filter; diff --git a/src/core/lib/security/transport/client_auth_filter.cc b/src/core/lib/security/transport/client_auth_filter.cc index babc90fb8cd..d44d8c97fe4 100644 --- a/src/core/lib/security/transport/client_auth_filter.cc +++ b/src/core/lib/security/transport/client_auth_filter.cc @@ -18,8 +18,6 @@ #include -#include "src/core/lib/security/transport/auth_filters.h" - #include #include @@ -37,6 +35,7 @@ #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/security/security_connector/ssl_utils.h" +#include "src/core/lib/security/transport/auth_filters.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/lib/surface/call.h" diff --git a/src/core/lib/security/transport/secure_endpoint.cc b/src/core/lib/security/transport/secure_endpoint.cc index 7ad5a960167..c60ecfba37e 100644 --- a/src/core/lib/security/transport/secure_endpoint.cc +++ b/src/core/lib/security/transport/secure_endpoint.cc @@ -18,20 +18,21 @@ #include -#include +#include "src/core/lib/security/transport/secure_endpoint.h" -#include "src/core/lib/iomgr/sockaddr.h" +#include #include #include #include #include #include + #include "src/core/lib/debug/trace.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gprpp/memory.h" +#include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/profiling/timers.h" -#include "src/core/lib/security/transport/secure_endpoint.h" #include "src/core/lib/security/transport/tsi_error.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_string_helpers.h" diff --git a/src/core/lib/security/transport/secure_endpoint.h b/src/core/lib/security/transport/secure_endpoint.h index e7e33516789..b3b8e239327 100644 --- a/src/core/lib/security/transport/secure_endpoint.h +++ b/src/core/lib/security/transport/secure_endpoint.h @@ -22,6 +22,7 @@ #include #include + #include "src/core/lib/iomgr/endpoint.h" struct tsi_frame_protector; diff --git a/src/core/lib/security/transport/security_handshaker.cc b/src/core/lib/security/transport/security_handshaker.cc index f464218d0d2..932fa1845b7 100644 --- a/src/core/lib/security/transport/security_handshaker.cc +++ b/src/core/lib/security/transport/security_handshaker.cc @@ -22,6 +22,7 @@ #include #include + #include #include diff --git a/src/core/lib/security/util/json_util.cc b/src/core/lib/security/util/json_util.cc index 34bf88f4db4..940289a6da4 100644 --- a/src/core/lib/security/util/json_util.cc +++ b/src/core/lib/security/util/json_util.cc @@ -18,6 +18,8 @@ #include +#include "src/core/lib/security/util/json_util.h" + #include #include "absl/strings/str_cat.h" @@ -26,7 +28,6 @@ #include #include "src/core/lib/iomgr/error.h" -#include "src/core/lib/security/util/json_util.h" const char* grpc_json_get_string_property(const grpc_core::Json& json, const char* prop_name, diff --git a/src/core/lib/slice/percent_encoding.cc b/src/core/lib/slice/percent_encoding.cc index b948706b717..5ec29350e77 100644 --- a/src/core/lib/slice/percent_encoding.cc +++ b/src/core/lib/slice/percent_encoding.cc @@ -20,13 +20,13 @@ #include "src/core/lib/slice/percent_encoding.h" +#include + #include #include "src/core/lib/gprpp/bitset.h" #include "src/core/lib/slice/slice_internal.h" -#include - #if __cplusplus > 201103l #define GRPC_PCTENCODE_CONSTEXPR_FN constexpr #define GRPC_PCTENCODE_CONSTEXPR_VALUE constexpr diff --git a/src/core/lib/slice/percent_encoding.h b/src/core/lib/slice/percent_encoding.h index d16b2ddeafa..2cc85c50b85 100644 --- a/src/core/lib/slice/percent_encoding.h +++ b/src/core/lib/slice/percent_encoding.h @@ -30,9 +30,10 @@ #include -#include #include "absl/types/optional.h" +#include + namespace grpc_core { enum class PercentEncodingType { diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc index 7f39df166b1..ac33a31ff70 100644 --- a/src/core/lib/slice/slice.cc +++ b/src/core/lib/slice/slice.cc @@ -18,17 +18,16 @@ #include -#include "src/core/lib/slice/slice_internal.h" +#include #include #include #include -#include - #include "src/core/lib/gprpp/memory.h" #include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/slice/slice_internal.h" char* grpc_slice_to_c_string(grpc_slice slice) { char* out = static_cast(gpr_malloc(GRPC_SLICE_LENGTH(slice) + 1)); diff --git a/src/core/lib/slice/slice_buffer.cc b/src/core/lib/slice/slice_buffer.cc index ba103d702bc..b16d4935353 100644 --- a/src/core/lib/slice/slice_buffer.cc +++ b/src/core/lib/slice/slice_buffer.cc @@ -18,10 +18,9 @@ #include -#include - #include +#include #include #include diff --git a/src/core/lib/slice/slice_intern.cc b/src/core/lib/slice/slice_intern.cc index 04681304e7e..305d99eb12e 100644 --- a/src/core/lib/slice/slice_intern.cc +++ b/src/core/lib/slice/slice_intern.cc @@ -18,9 +18,6 @@ #include -#include "src/core/lib/slice/slice_internal.h" -#include "src/core/lib/slice/slice_utils.h" - #include #include @@ -31,7 +28,9 @@ #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/iomgr_internal.h" /* for iomgr_abort_on_leaks() */ #include "src/core/lib/profiling/timers.h" +#include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_string_helpers.h" +#include "src/core/lib/slice/slice_utils.h" #include "src/core/lib/transport/static_metadata.h" #define LOG2_SHARD_COUNT 5 diff --git a/src/core/lib/slice/slice_internal.h b/src/core/lib/slice/slice_internal.h index 21140a99ebd..1e90ac5a1e2 100644 --- a/src/core/lib/slice/slice_internal.h +++ b/src/core/lib/slice/slice_internal.h @@ -21,11 +21,11 @@ #include -#include +#include #include #include -#include +#include #include "src/core/lib/gpr/murmur_hash.h" #include "src/core/lib/gprpp/memory.h" diff --git a/src/core/lib/surface/api_trace.cc b/src/core/lib/surface/api_trace.cc index bab5a7910c0..c40b9e1beb2 100644 --- a/src/core/lib/surface/api_trace.cc +++ b/src/core/lib/surface/api_trace.cc @@ -18,7 +18,8 @@ #include -#include "src/core/lib/debug/trace.h" #include "src/core/lib/surface/api_trace.h" +#include "src/core/lib/debug/trace.h" + grpc_core::TraceFlag grpc_api_trace(false, "api"); diff --git a/src/core/lib/surface/api_trace.h b/src/core/lib/surface/api_trace.h index 51d1f522230..a7981d14bbc 100644 --- a/src/core/lib/surface/api_trace.h +++ b/src/core/lib/surface/api_trace.h @@ -22,6 +22,7 @@ #include #include + #include "src/core/lib/debug/trace.h" extern grpc_core::TraceFlag grpc_api_trace; diff --git a/src/core/lib/surface/byte_buffer_reader.cc b/src/core/lib/surface/byte_buffer_reader.cc index 3689c79455e..207aaef8f1f 100644 --- a/src/core/lib/surface/byte_buffer_reader.cc +++ b/src/core/lib/surface/byte_buffer_reader.cc @@ -18,10 +18,10 @@ #include -#include #include #include +#include #include #include #include diff --git a/src/core/lib/surface/call.cc b/src/core/lib/surface/call.cc index 09e6615dc8c..e7f19f9893a 100644 --- a/src/core/lib/surface/call.cc +++ b/src/core/lib/surface/call.cc @@ -18,6 +18,8 @@ #include +#include "src/core/lib/surface/call.h" + #include #include #include @@ -51,7 +53,6 @@ #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/lib/slice/slice_utils.h" #include "src/core/lib/surface/api_trace.h" -#include "src/core/lib/surface/call.h" #include "src/core/lib/surface/call_test_only.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/completion_queue.h" diff --git a/src/core/lib/surface/call.h b/src/core/lib/surface/call.h index d682760f284..221de3579d6 100644 --- a/src/core/lib/surface/call.h +++ b/src/core/lib/surface/call.h @@ -21,15 +21,15 @@ #include +#include +#include + #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/context.h" #include "src/core/lib/gprpp/arena.h" #include "src/core/lib/surface/api_trace.h" #include "src/core/lib/surface/server.h" -#include -#include - typedef void (*grpc_ioreq_completion_func)(grpc_call* call, int success, void* user_data); diff --git a/src/core/lib/surface/call_details.cc b/src/core/lib/surface/call_details.cc index 29c184c26b2..ce73c3a5271 100644 --- a/src/core/lib/surface/call_details.cc +++ b/src/core/lib/surface/call_details.cc @@ -18,11 +18,11 @@ #include +#include + #include #include -#include - #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/surface/api_trace.h" diff --git a/src/core/lib/surface/call_log_batch.cc b/src/core/lib/surface/call_log_batch.cc index eac55137183..6bc1881a101 100644 --- a/src/core/lib/surface/call_log_batch.cc +++ b/src/core/lib/surface/call_log_batch.cc @@ -18,8 +18,6 @@ #include -#include "src/core/lib/surface/call.h" - #include #include @@ -29,8 +27,10 @@ #include #include + #include "src/core/lib/gpr/string.h" #include "src/core/lib/slice/slice_string_helpers.h" +#include "src/core/lib/surface/call.h" static void add_metadata(const grpc_metadata* md, size_t count, std::vector* b) { diff --git a/src/core/lib/surface/channel_ping.cc b/src/core/lib/surface/channel_ping.cc index a6e53ec409e..22c49386629 100644 --- a/src/core/lib/surface/channel_ping.cc +++ b/src/core/lib/surface/channel_ping.cc @@ -18,14 +18,13 @@ #include -#include "src/core/lib/surface/channel.h" - #include #include #include #include "src/core/lib/surface/api_trace.h" +#include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/completion_queue.h" struct ping_result { diff --git a/src/core/lib/surface/channel_stack_type.cc b/src/core/lib/surface/channel_stack_type.cc index fcf96ddc9fb..ecbc3ef6afb 100644 --- a/src/core/lib/surface/channel_stack_type.cc +++ b/src/core/lib/surface/channel_stack_type.cc @@ -18,9 +18,10 @@ #include -#include #include "src/core/lib/surface/channel_stack_type.h" +#include + bool grpc_channel_stack_type_is_client(grpc_channel_stack_type type) { switch (type) { case GRPC_CLIENT_CHANNEL: diff --git a/src/core/lib/surface/completion_queue_factory.cc b/src/core/lib/surface/completion_queue_factory.cc index d719f3b34f0..80aaba24dc6 100644 --- a/src/core/lib/surface/completion_queue_factory.cc +++ b/src/core/lib/surface/completion_queue_factory.cc @@ -18,11 +18,12 @@ #include -#include "src/core/lib/surface/completion_queue.h" #include "src/core/lib/surface/completion_queue_factory.h" #include +#include "src/core/lib/surface/completion_queue.h" + /* * == Default completion queue factory implementation == */ diff --git a/src/core/lib/surface/completion_queue_factory.h b/src/core/lib/surface/completion_queue_factory.h index d2b30a9ce19..b1b13722df7 100644 --- a/src/core/lib/surface/completion_queue_factory.h +++ b/src/core/lib/surface/completion_queue_factory.h @@ -22,6 +22,7 @@ #include #include + #include "src/core/lib/surface/completion_queue.h" typedef struct grpc_completion_queue_factory_vtable { diff --git a/src/core/lib/surface/event_string.cc b/src/core/lib/surface/event_string.cc index 32d85f7b054..da40734a944 100644 --- a/src/core/lib/surface/event_string.cc +++ b/src/core/lib/surface/event_string.cc @@ -29,6 +29,7 @@ #include #include + #include "src/core/lib/gpr/string.h" static void addhdr(grpc_event* ev, std::vector* buf) { diff --git a/src/core/lib/surface/init_secure.cc b/src/core/lib/surface/init_secure.cc index b89ccca79f6..609f868a0c8 100644 --- a/src/core/lib/surface/init_secure.cc +++ b/src/core/lib/surface/init_secure.cc @@ -18,8 +18,6 @@ #include -#include "src/core/lib/surface/init.h" - #include #include @@ -33,6 +31,7 @@ #include "src/core/lib/security/transport/secure_endpoint.h" #include "src/core/lib/security/transport/security_handshaker.h" #include "src/core/lib/surface/channel_init.h" +#include "src/core/lib/surface/init.h" #include "src/core/tsi/transport_security_interface.h" void grpc_security_pre_init(void) {} diff --git a/src/core/lib/surface/lame_client.cc b/src/core/lib/surface/lame_client.cc index b025522d315..65843e02733 100644 --- a/src/core/lib/surface/lame_client.cc +++ b/src/core/lib/surface/lame_client.cc @@ -18,6 +18,8 @@ #include +#include "src/core/lib/surface/lame_client.h" + #include #include @@ -31,7 +33,6 @@ #include "src/core/lib/surface/api_trace.h" #include "src/core/lib/surface/call.h" #include "src/core/lib/surface/channel.h" -#include "src/core/lib/surface/lame_client.h" #include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/static_metadata.h" diff --git a/src/core/lib/surface/metadata_array.cc b/src/core/lib/surface/metadata_array.cc index f794a2bb952..3633382a1ce 100644 --- a/src/core/lib/surface/metadata_array.cc +++ b/src/core/lib/surface/metadata_array.cc @@ -18,11 +18,11 @@ #include +#include + #include #include -#include - #include "src/core/lib/surface/api_trace.h" void grpc_metadata_array_init(grpc_metadata_array* array) { diff --git a/src/core/lib/surface/validate_metadata.cc b/src/core/lib/surface/validate_metadata.cc index 929f55c7408..1f16ec25db1 100644 --- a/src/core/lib/surface/validate_metadata.cc +++ b/src/core/lib/surface/validate_metadata.cc @@ -18,6 +18,8 @@ #include +#include "src/core/lib/surface/validate_metadata.h" + #include #include @@ -29,7 +31,6 @@ #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_string_helpers.h" -#include "src/core/lib/surface/validate_metadata.h" #if __cplusplus > 201103l #define GRPC_VALIDATE_METADATA_CONSTEXPR_FN constexpr diff --git a/src/core/lib/transport/byte_stream.h b/src/core/lib/transport/byte_stream.h index 09a3032641d..28dd443a8e9 100644 --- a/src/core/lib/transport/byte_stream.h +++ b/src/core/lib/transport/byte_stream.h @@ -22,6 +22,7 @@ #include #include + #include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/iomgr/closure.h" diff --git a/src/core/lib/transport/error_utils.cc b/src/core/lib/transport/error_utils.cc index 2d75a56a6de..a826b910a61 100644 --- a/src/core/lib/transport/error_utils.cc +++ b/src/core/lib/transport/error_utils.cc @@ -21,6 +21,7 @@ #include "src/core/lib/transport/error_utils.h" #include + #include "src/core/lib/iomgr/error_internal.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/transport/status_conversion.h" diff --git a/src/core/lib/transport/transport_op_string.cc b/src/core/lib/transport/transport_op_string.cc index 0285ac09902..449141d5db0 100644 --- a/src/core/lib/transport/transport_op_string.cc +++ b/src/core/lib/transport/transport_op_string.cc @@ -18,8 +18,6 @@ #include -#include "src/core/lib/channel/channel_stack.h" - #include #include #include @@ -33,6 +31,8 @@ #include #include + +#include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/lib/transport/connectivity_state.h" diff --git a/src/core/tsi/alts/crypt/aes_gcm.cc b/src/core/tsi/alts/crypt/aes_gcm.cc index 02b1ac4492f..b761224cd93 100644 --- a/src/core/tsi/alts/crypt/aes_gcm.cc +++ b/src/core/tsi/alts/crypt/aes_gcm.cc @@ -18,17 +18,18 @@ #include -#include "src/core/tsi/alts/crypt/gsec.h" +#include #include #include #include #include #include -#include #include +#include "src/core/tsi/alts/crypt/gsec.h" + constexpr size_t kKdfKeyLen = 32; constexpr size_t kKdfCounterLen = 6; constexpr size_t kKdfCounterOffset = 2; diff --git a/src/core/tsi/alts/crypt/gsec.h b/src/core/tsi/alts/crypt/gsec.h index 0cf550b7b22..11b215497be 100644 --- a/src/core/tsi/alts/crypt/gsec.h +++ b/src/core/tsi/alts/crypt/gsec.h @@ -21,12 +21,11 @@ #include -#include - #include #include #include +#include #include #ifndef _STRUCT_IOVEC diff --git a/src/core/tsi/alts/handshaker/alts_handshaker_client.cc b/src/core/tsi/alts/handshaker/alts_handshaker_client.cc index ed70d812512..2e335abbb7c 100644 --- a/src/core/tsi/alts/handshaker/alts_handshaker_client.cc +++ b/src/core/tsi/alts/handshaker/alts_handshaker_client.cc @@ -18,10 +18,10 @@ #include -#include - #include "src/core/tsi/alts/handshaker/alts_handshaker_client.h" +#include + #include "upb/upb.hpp" #include diff --git a/src/core/tsi/alts/handshaker/alts_handshaker_client.h b/src/core/tsi/alts/handshaker/alts_handshaker_client.h index d8669da01cb..133cea5da7d 100644 --- a/src/core/tsi/alts/handshaker/alts_handshaker_client.h +++ b/src/core/tsi/alts/handshaker/alts_handshaker_client.h @@ -25,11 +25,10 @@ #include #include -#include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h" -#include "src/core/tsi/transport_security_interface.h" - #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/pollset_set.h" +#include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h" +#include "src/core/tsi/transport_security_interface.h" #define ALTS_SERVICE_METHOD "/grpc.gcp.HandshakerService/DoHandshake" #define ALTS_APPLICATION_PROTOCOL "grpc" diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc index 352561d4697..67cdd994f7b 100644 --- a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc +++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc @@ -20,11 +20,11 @@ #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h" +#include + #include #include -#include - #include "src/core/lib/slice/slice_internal.h" #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h" #include "src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h" diff --git a/src/core/tsi/ssl/session_cache/ssl_session_cache.cc b/src/core/tsi/ssl/session_cache/ssl_session_cache.cc index 9254dcee5f6..15fd6fd1d0b 100644 --- a/src/core/tsi/ssl/session_cache/ssl_session_cache.cc +++ b/src/core/tsi/ssl/session_cache/ssl_session_cache.cc @@ -18,14 +18,15 @@ #include -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/slice/slice_internal.h" -#include "src/core/tsi/ssl/session_cache/ssl_session.h" #include "src/core/tsi/ssl/session_cache/ssl_session_cache.h" #include #include +#include "src/core/lib/gprpp/sync.h" +#include "src/core/lib/slice/slice_internal.h" +#include "src/core/tsi/ssl/session_cache/ssl_session.h" + namespace tsi { static void cache_key_avl_destroy(void* /*key*/, void* /*unused*/) {} diff --git a/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc b/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc index f45205cecce..60675d2dbae 100644 --- a/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc +++ b/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc @@ -18,10 +18,10 @@ #include -#include "src/core/tsi/ssl/session_cache/ssl_session.h" - #include +#include "src/core/tsi/ssl/session_cache/ssl_session.h" + #ifndef OPENSSL_IS_BORINGSSL // OpenSSL invalidates SSL_SESSION on SSL destruction making it pointless diff --git a/src/core/tsi/ssl_transport_security.cc b/src/core/tsi/ssl_transport_security.cc index 938421e6e52..b687207bd5b 100644 --- a/src/core/tsi/ssl_transport_security.cc +++ b/src/core/tsi/ssl_transport_security.cc @@ -35,6 +35,9 @@ #include +#include "absl/strings/match.h" +#include "absl/strings/string_view.h" + #include #include #include @@ -42,9 +45,6 @@ #include #include -#include "absl/strings/match.h" -#include "absl/strings/string_view.h" - extern "C" { #include #include /* For OPENSSL_free */ diff --git a/src/core/tsi/ssl_transport_security.h b/src/core/tsi/ssl_transport_security.h index c3d30a888c3..3711db0db99 100644 --- a/src/core/tsi/ssl_transport_security.h +++ b/src/core/tsi/ssl_transport_security.h @@ -21,8 +21,10 @@ #include -#include #include "absl/strings/string_view.h" + +#include + #include "src/core/tsi/transport_security_interface.h" extern "C" { diff --git a/src/core/tsi/transport_security.cc b/src/core/tsi/transport_security.cc index dd62189654e..f08093dc58c 100644 --- a/src/core/tsi/transport_security.cc +++ b/src/core/tsi/transport_security.cc @@ -20,12 +20,12 @@ #include "src/core/tsi/transport_security.h" -#include -#include - #include #include +#include +#include + /* --- Tracing. --- */ grpc_core::TraceFlag tsi_tracing_enabled(false, "tsi"); diff --git a/src/core/tsi/transport_security_grpc.h b/src/core/tsi/transport_security_grpc.h index 4779b686c66..ba9428b5885 100644 --- a/src/core/tsi/transport_security_grpc.h +++ b/src/core/tsi/transport_security_grpc.h @@ -22,6 +22,7 @@ #include #include + #include "src/core/tsi/transport_security.h" /* This method creates a tsi_zero_copy_grpc_protector object. It return TSI_OK diff --git a/src/cpp/client/channel_cc.cc b/src/cpp/client/channel_cc.cc index a96e4d11580..1702dc5642e 100644 --- a/src/cpp/client/channel_cc.cc +++ b/src/cpp/client/channel_cc.cc @@ -16,8 +16,6 @@ * */ -#include - #include #include @@ -27,6 +25,7 @@ #include #include #include +#include #include #include #include diff --git a/src/cpp/client/channel_test_peer.cc b/src/cpp/client/channel_test_peer.cc index f921352a24a..e55f522463d 100644 --- a/src/cpp/client/channel_test_peer.cc +++ b/src/cpp/client/channel_test_peer.cc @@ -16,10 +16,9 @@ * */ -#include - #include #include +#include #include "src/core/lib/surface/channel.h" diff --git a/src/cpp/client/client_context.cc b/src/cpp/client/client_context.cc index 4d35cceef46..d7a37f77ba8 100644 --- a/src/cpp/client/client_context.cc +++ b/src/cpp/client/client_context.cc @@ -16,14 +16,12 @@ * */ -#include - #include #include #include #include #include - +#include #include #include #include diff --git a/src/cpp/client/create_channel_internal.cc b/src/cpp/client/create_channel_internal.cc index 466d52405f7..f90836a609e 100644 --- a/src/cpp/client/create_channel_internal.cc +++ b/src/cpp/client/create_channel_internal.cc @@ -16,6 +16,8 @@ * */ +#include "src/cpp/client/create_channel_internal.h" + #include #include #include @@ -23,8 +25,6 @@ #include -#include "src/cpp/client/create_channel_internal.h" - struct grpc_channel; namespace grpc { diff --git a/src/cpp/client/cronet_credentials.cc b/src/cpp/client/cronet_credentials.cc index d09e2841279..4ef81139fca 100644 --- a/src/cpp/client/cronet_credentials.cc +++ b/src/cpp/client/cronet_credentials.cc @@ -16,11 +16,11 @@ * */ -#include - #include #include +#include #include + #include "src/cpp/client/create_channel_internal.h" namespace grpc { diff --git a/src/cpp/client/insecure_credentials.cc b/src/cpp/client/insecure_credentials.cc index 98e8cb75574..57c0e77fff6 100644 --- a/src/cpp/client/insecure_credentials.cc +++ b/src/cpp/client/insecure_credentials.cc @@ -15,13 +15,13 @@ * limitations under the License. * */ -#include - #include #include #include +#include #include #include + #include "src/cpp/client/create_channel_internal.h" namespace grpc { diff --git a/src/cpp/client/secure_credentials.cc b/src/cpp/client/secure_credentials.cc index e743165c518..3a3b04a6845 100644 --- a/src/cpp/client/secure_credentials.cc +++ b/src/cpp/client/secure_credentials.cc @@ -18,6 +18,8 @@ #include "src/cpp/client/secure_credentials.h" +#include "absl/strings/str_join.h" + #include #include #include @@ -28,8 +30,6 @@ #include #include -#include "absl/strings/str_join.h" - // TODO(yashykt): We shouldn't be including "src/core" headers. #include "src/core/lib/gpr/env.h" #include "src/core/lib/iomgr/error.h" diff --git a/src/cpp/client/secure_credentials.h b/src/cpp/client/secure_credentials.h index 318c402b6f3..b3bde234a94 100644 --- a/src/cpp/client/secure_credentials.h +++ b/src/cpp/client/secure_credentials.h @@ -19,13 +19,12 @@ #ifndef GRPC_INTERNAL_CPP_CLIENT_SECURE_CREDENTIALS_H #define GRPC_INTERNAL_CPP_CLIENT_SECURE_CREDENTIALS_H -#include +#include "absl/strings/str_cat.h" +#include #include #include #include - -#include "absl/strings/str_cat.h" // TODO(yashykt): We shouldn't be including "src/core" headers. #include "src/core/lib/security/credentials/credentials.h" #include "src/cpp/server/thread_pool_interface.h" diff --git a/src/cpp/common/alarm.cc b/src/cpp/common/alarm.cc index 10d633c0dd4..a367b53d3a2 100644 --- a/src/cpp/common/alarm.cc +++ b/src/cpp/common/alarm.cc @@ -15,23 +15,22 @@ * */ -#include +#include #include #include -#include +#include #include #include #include + +#include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/surface/completion_queue.h" -#include -#include "src/core/lib/debug/trace.h" - namespace grpc { namespace internal { diff --git a/src/cpp/common/auth_property_iterator.cc b/src/cpp/common/auth_property_iterator.cc index 0f380b09507..1334ea99663 100644 --- a/src/cpp/common/auth_property_iterator.cc +++ b/src/cpp/common/auth_property_iterator.cc @@ -16,9 +16,8 @@ * */ -#include - #include +#include namespace grpc { diff --git a/src/cpp/common/channel_arguments.cc b/src/cpp/common/channel_arguments.cc index 2eb280931d6..6c45dda2de4 100644 --- a/src/cpp/common/channel_arguments.cc +++ b/src/cpp/common/channel_arguments.cc @@ -15,14 +15,14 @@ * limitations under the License. * */ -#include - #include #include #include #include #include +#include + #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/socket_mutator.h" diff --git a/src/cpp/common/channel_filter.cc b/src/cpp/common/channel_filter.cc index ab56d6073fe..6d3a0552d70 100644 --- a/src/cpp/common/channel_filter.cc +++ b/src/cpp/common/channel_filter.cc @@ -16,13 +16,14 @@ * */ -#include - -#include "src/core/lib/channel/channel_stack.h" #include "src/cpp/common/channel_filter.h" +#include + #include +#include "src/core/lib/channel/channel_stack.h" + namespace grpc { // MetadataBatch diff --git a/src/cpp/common/channel_filter.h b/src/cpp/common/channel_filter.h index d58805632af..5f7b2e1cf4d 100644 --- a/src/cpp/common/channel_filter.h +++ b/src/cpp/common/channel_filter.h @@ -19,13 +19,13 @@ #ifndef GRPCXX_CHANNEL_FILTER_H #define GRPCXX_CHANNEL_FILTER_H +#include +#include + #include #include #include -#include -#include - #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/surface/channel_init.h" #include "src/core/lib/transport/metadata_batch.h" diff --git a/src/cpp/common/completion_queue_cc.cc b/src/cpp/common/completion_queue_cc.cc index cdf36b8f433..42494f7b493 100644 --- a/src/cpp/common/completion_queue_cc.cc +++ b/src/cpp/common/completion_queue_cc.cc @@ -15,13 +15,12 @@ * */ -#include - #include #include #include #include +#include #include #include diff --git a/src/cpp/common/core_codegen.cc b/src/cpp/common/core_codegen.cc index 75383ed5110..e35b1ddd439 100644 --- a/src/cpp/common/core_codegen.cc +++ b/src/cpp/common/core_codegen.cc @@ -16,7 +16,7 @@ * */ -#include +#include #include @@ -27,8 +27,8 @@ #include #include #include -#include #include +#include #include #include "src/core/lib/profiling/timers.h" diff --git a/src/cpp/common/secure_channel_arguments.cc b/src/cpp/common/secure_channel_arguments.cc index 471c23f23c1..339d94b1dde 100644 --- a/src/cpp/common/secure_channel_arguments.cc +++ b/src/cpp/common/secure_channel_arguments.cc @@ -16,9 +16,9 @@ * */ +#include #include -#include #include "src/core/lib/channel/channel_args.h" namespace grpc { diff --git a/src/cpp/common/secure_create_auth_context.cc b/src/cpp/common/secure_create_auth_context.cc index 908c46629e6..6633374b65b 100644 --- a/src/cpp/common/secure_create_auth_context.cc +++ b/src/cpp/common/secure_create_auth_context.cc @@ -20,6 +20,7 @@ #include #include #include + #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/cpp/common/secure_auth_context.h" diff --git a/src/cpp/common/tls_certificate_provider.cc b/src/cpp/common/tls_certificate_provider.cc index 2deea5f7762..62a2a5cf26b 100644 --- a/src/cpp/common/tls_certificate_provider.cc +++ b/src/cpp/common/tls_certificate_provider.cc @@ -14,12 +14,12 @@ // limitations under the License. // +#include "absl/container/inlined_vector.h" + #include #include #include -#include "absl/container/inlined_vector.h" - namespace grpc { namespace experimental { diff --git a/src/cpp/common/tls_credentials_options.cc b/src/cpp/common/tls_credentials_options.cc index 729e6a4db83..8e672308f8e 100644 --- a/src/cpp/common/tls_credentials_options.cc +++ b/src/cpp/common/tls_credentials_options.cc @@ -16,11 +16,12 @@ * */ +#include "absl/container/inlined_vector.h" + #include #include #include -#include "absl/container/inlined_vector.h" #include "src/cpp/common/tls_credentials_options_util.h" namespace grpc { diff --git a/src/cpp/common/tls_credentials_options_util.cc b/src/cpp/common/tls_credentials_options_util.cc index 1cea450b0ab..ebcab262402 100644 --- a/src/cpp/common/tls_credentials_options_util.cc +++ b/src/cpp/common/tls_credentials_options_util.cc @@ -16,12 +16,12 @@ * */ +#include "src/cpp/common/tls_credentials_options_util.h" + #include "absl/container/inlined_vector.h" #include -#include "src/cpp/common/tls_credentials_options_util.h" - namespace grpc { namespace experimental { diff --git a/src/cpp/ext/filters/census/client_filter.cc b/src/cpp/ext/filters/census/client_filter.cc index 362ea529259..bb332a889d8 100644 --- a/src/cpp/ext/filters/census/client_filter.cc +++ b/src/cpp/ext/filters/census/client_filter.cc @@ -18,18 +18,19 @@ #include +#include "src/cpp/ext/filters/census/client_filter.h" + #include #include #include -#include "src/cpp/ext/filters/census/client_filter.h" - #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "opencensus/stats/stats.h" #include "opencensus/tags/context_util.h" #include "opencensus/tags/tag_key.h" #include "opencensus/tags/tag_map.h" + #include "src/core/lib/surface/call.h" #include "src/cpp/ext/filters/census/grpc_plugin.h" #include "src/cpp/ext/filters/census/measures.h" diff --git a/src/cpp/ext/filters/census/client_filter.h b/src/cpp/ext/filters/census/client_filter.h index ea90cad31ef..1c08f7d3043 100644 --- a/src/cpp/ext/filters/census/client_filter.h +++ b/src/cpp/ext/filters/census/client_filter.h @@ -23,6 +23,7 @@ #include "absl/strings/string_view.h" #include "absl/time/time.h" + #include "src/cpp/ext/filters/census/channel_filter.h" #include "src/cpp/ext/filters/census/open_census_call_tracer.h" diff --git a/src/cpp/ext/filters/census/context.cc b/src/cpp/ext/filters/census/context.cc index 0650bd1b01a..672228a83bf 100644 --- a/src/cpp/ext/filters/census/context.cc +++ b/src/cpp/ext/filters/census/context.cc @@ -18,10 +18,11 @@ #include +#include "src/cpp/ext/filters/census/context.h" + #include "opencensus/tags/context_util.h" #include "opencensus/trace/context_util.h" #include "opencensus/trace/propagation/grpc_trace_bin.h" -#include "src/cpp/ext/filters/census/context.h" namespace grpc { diff --git a/src/cpp/ext/filters/census/context.h b/src/cpp/ext/filters/census/context.h index 668e5ecb0a7..45192042ca2 100644 --- a/src/cpp/ext/filters/census/context.h +++ b/src/cpp/ext/filters/census/context.h @@ -21,12 +21,9 @@ #include -#include - #include "absl/memory/memory.h" #include "absl/strings/string_view.h" #include "absl/strings/strip.h" - #include "opencensus/context/context.h" #include "opencensus/tags/tag_map.h" #include "opencensus/trace/context_util.h" @@ -34,6 +31,8 @@ #include "opencensus/trace/span_context.h" #include "opencensus/trace/trace_params.h" +#include + #include "src/core/lib/slice/slice_internal.h" #include "src/cpp/common/channel_filter.h" #include "src/cpp/ext/filters/census/rpc_encoding.h" diff --git a/src/cpp/ext/filters/census/grpc_plugin.cc b/src/cpp/ext/filters/census/grpc_plugin.cc index f16eb526ad2..41ded5cbcc0 100644 --- a/src/cpp/ext/filters/census/grpc_plugin.cc +++ b/src/cpp/ext/filters/census/grpc_plugin.cc @@ -20,10 +20,11 @@ #include "src/cpp/ext/filters/census/grpc_plugin.h" -#include - #include "opencensus/tags/tag_key.h" #include "opencensus/trace/span.h" + +#include + #include "src/cpp/ext/filters/census/channel_filter.h" #include "src/cpp/ext/filters/census/client_filter.h" #include "src/cpp/ext/filters/census/measures.h" diff --git a/src/cpp/ext/filters/census/grpc_plugin.h b/src/cpp/ext/filters/census/grpc_plugin.h index 359d7a11ac8..54754aa88fa 100644 --- a/src/cpp/ext/filters/census/grpc_plugin.h +++ b/src/cpp/ext/filters/census/grpc_plugin.h @@ -21,11 +21,12 @@ #include -#include #include "absl/strings/string_view.h" #include "opencensus/stats/stats.h" #include "opencensus/tags/tag_key.h" +#include + namespace grpc { // The tag keys set when recording RPC stats. diff --git a/src/cpp/ext/filters/census/measures.cc b/src/cpp/ext/filters/census/measures.cc index f8a6508760d..c02fdce684b 100644 --- a/src/cpp/ext/filters/census/measures.cc +++ b/src/cpp/ext/filters/census/measures.cc @@ -21,6 +21,7 @@ #include "src/cpp/ext/filters/census/measures.h" #include "opencensus/stats/stats.h" + #include "src/cpp/ext/filters/census/grpc_plugin.h" namespace grpc { diff --git a/src/cpp/ext/filters/census/measures.h b/src/cpp/ext/filters/census/measures.h index 2a95cb70328..0682f2e5b87 100644 --- a/src/cpp/ext/filters/census/measures.h +++ b/src/cpp/ext/filters/census/measures.h @@ -22,6 +22,7 @@ #include #include "opencensus/stats/stats.h" + #include "src/cpp/ext/filters/census/grpc_plugin.h" namespace grpc { diff --git a/src/cpp/ext/filters/census/server_filter.cc b/src/cpp/ext/filters/census/server_filter.cc index 72ee8e16a63..fa606b80f65 100644 --- a/src/cpp/ext/filters/census/server_filter.cc +++ b/src/cpp/ext/filters/census/server_filter.cc @@ -25,6 +25,7 @@ #include "absl/time/clock.h" #include "absl/time/time.h" #include "opencensus/stats/stats.h" + #include "src/core/lib/surface/call.h" #include "src/cpp/ext/filters/census/grpc_plugin.h" #include "src/cpp/ext/filters/census/measures.h" diff --git a/src/cpp/ext/filters/census/server_filter.h b/src/cpp/ext/filters/census/server_filter.h index 26c4e973c8c..3359c492cae 100644 --- a/src/cpp/ext/filters/census/server_filter.h +++ b/src/cpp/ext/filters/census/server_filter.h @@ -21,10 +21,12 @@ #include -#include #include "absl/strings/string_view.h" #include "absl/time/clock.h" #include "absl/time/time.h" + +#include + #include "src/cpp/ext/filters/census/channel_filter.h" #include "src/cpp/ext/filters/census/context.h" diff --git a/src/cpp/ext/filters/census/views.cc b/src/cpp/ext/filters/census/views.cc index cd552a9849b..926e842551c 100644 --- a/src/cpp/ext/filters/census/views.cc +++ b/src/cpp/ext/filters/census/views.cc @@ -18,13 +18,13 @@ #include -#include "src/cpp/ext/filters/census/grpc_plugin.h" - #include "absl/time/time.h" #include "opencensus/stats/internal/aggregation_window.h" #include "opencensus/stats/internal/set_aggregation_window.h" #include "opencensus/stats/stats.h" +#include "src/cpp/ext/filters/census/grpc_plugin.h" + namespace grpc { using ::opencensus::stats::Aggregation; diff --git a/src/cpp/ext/proto_server_reflection.cc b/src/cpp/ext/proto_server_reflection.cc index 336465a34f6..af35a28564e 100644 --- a/src/cpp/ext/proto_server_reflection.cc +++ b/src/cpp/ext/proto_server_reflection.cc @@ -16,13 +16,13 @@ * */ +#include "src/cpp/ext/proto_server_reflection.h" + #include #include #include -#include "src/cpp/ext/proto_server_reflection.h" - using grpc::Status; using grpc::StatusCode; using grpc::reflection::v1alpha::ErrorResponse; diff --git a/src/cpp/ext/proto_server_reflection.h b/src/cpp/ext/proto_server_reflection.h index 31e386f3732..04f1e6380c5 100644 --- a/src/cpp/ext/proto_server_reflection.h +++ b/src/cpp/ext/proto_server_reflection.h @@ -23,6 +23,7 @@ #include #include + #include "src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h" namespace grpc { diff --git a/src/cpp/server/admin/admin_services.cc b/src/cpp/server/admin/admin_services.cc index 5159b3adbe4..7e8841e7d48 100644 --- a/src/cpp/server/admin/admin_services.cc +++ b/src/cpp/server/admin/admin_services.cc @@ -22,7 +22,6 @@ #include #include - #include // TODO(lidiz) build a real registration system that can pull in services diff --git a/src/cpp/server/async_generic_service.cc b/src/cpp/server/async_generic_service.cc index 07697a52d1f..fdb3da830c5 100644 --- a/src/cpp/server/async_generic_service.cc +++ b/src/cpp/server/async_generic_service.cc @@ -17,7 +17,6 @@ */ #include - #include namespace grpc { diff --git a/src/cpp/server/channelz/channelz_service.h b/src/cpp/server/channelz/channelz_service.h index b4a66ba1c66..824f0a9fe17 100644 --- a/src/cpp/server/channelz/channelz_service.h +++ b/src/cpp/server/channelz/channelz_service.h @@ -22,6 +22,7 @@ #include #include + #include "src/proto/grpc/channelz/channelz.grpc.pb.h" namespace grpc { diff --git a/src/cpp/server/csds/csds.cc b/src/cpp/server/csds/csds.cc index fc8e7e0e3c2..61de37604dc 100644 --- a/src/cpp/server/csds/csds.cc +++ b/src/cpp/server/csds/csds.cc @@ -20,14 +20,14 @@ #include "src/cpp/server/csds/csds.h" +#include + #include "absl/status/statusor.h" #include #include #include -#include - #include "src/proto/grpc/testing/xds/v3/csds.grpc.pb.h" namespace grpc { diff --git a/src/cpp/server/csds/csds.h b/src/cpp/server/csds/csds.h index be2a4aa1ee8..d08e15241f0 100644 --- a/src/cpp/server/csds/csds.h +++ b/src/cpp/server/csds/csds.h @@ -20,9 +20,11 @@ #define GRPC_INTERNAL_CPP_SERVER_CSDS_H #include -#include + #include "absl/status/status.h" +#include + #include "src/proto/grpc/testing/xds/v3/csds.grpc.pb.h" namespace grpc { diff --git a/src/cpp/server/health/default_health_check_service.cc b/src/cpp/server/health/default_health_check_service.cc index 42c55c526ef..dd638e6ec2f 100644 --- a/src/cpp/server/health/default_health_check_service.cc +++ b/src/cpp/server/health/default_health_check_service.cc @@ -16,6 +16,8 @@ * */ +#include "src/cpp/server/health/default_health_check_service.h" + #include #include "absl/memory/memory.h" @@ -26,9 +28,7 @@ #include #include -#include "src/cpp/server/health/default_health_check_service.h" #include "src/proto/grpc/health/v1/health.upb.h" -#include "upb/upb.hpp" #define MAX_SERVICE_NAME_LENGTH 200 diff --git a/src/cpp/server/insecure_server_credentials.cc b/src/cpp/server/insecure_server_credentials.cc index 4c1cec0cc22..10da4b9e366 100644 --- a/src/cpp/server/insecure_server_credentials.cc +++ b/src/cpp/server/insecure_server_credentials.cc @@ -16,10 +16,9 @@ * */ -#include - #include #include +#include namespace grpc { namespace { diff --git a/src/cpp/server/load_reporter/get_cpu_stats_windows.cc b/src/cpp/server/load_reporter/get_cpu_stats_windows.cc index 0a98e848a2c..c03daddb35b 100644 --- a/src/cpp/server/load_reporter/get_cpu_stats_windows.cc +++ b/src/cpp/server/load_reporter/get_cpu_stats_windows.cc @@ -21,6 +21,7 @@ #ifdef GPR_WINDOWS #include + #include #include "src/cpp/server/load_reporter/get_cpu_stats.h" diff --git a/src/cpp/server/load_reporter/load_data_store.cc b/src/cpp/server/load_reporter/load_data_store.cc index 003192c3fdb..9a65c3e78ba 100644 --- a/src/cpp/server/load_reporter/load_data_store.cc +++ b/src/cpp/server/load_reporter/load_data_store.cc @@ -18,14 +18,16 @@ #include +#include "src/cpp/server/load_reporter/load_data_store.h" + #include + #include #include #include #include #include "src/core/lib/iomgr/socket_utils.h" -#include "src/cpp/server/load_reporter/load_data_store.h" namespace grpc { namespace load_reporter { diff --git a/src/cpp/server/load_reporter/load_reporter.cc b/src/cpp/server/load_reporter/load_reporter.cc index 613cf3a03bc..df0ac096d12 100644 --- a/src/cpp/server/load_reporter/load_reporter.cc +++ b/src/cpp/server/load_reporter/load_reporter.cc @@ -18,20 +18,22 @@ #include +#include "src/cpp/server/load_reporter/load_reporter.h" + #include #include #include + #include #include #include -#include "src/cpp/server/load_reporter/constants.h" -#include "src/cpp/server/load_reporter/get_cpu_stats.h" -#include "src/cpp/server/load_reporter/load_reporter.h" - #include "opencensus/stats/internal/set_aggregation_window.h" #include "opencensus/tags/tag_key.h" +#include "src/cpp/server/load_reporter/constants.h" +#include "src/cpp/server/load_reporter/get_cpu_stats.h" + namespace grpc { namespace load_reporter { diff --git a/src/cpp/server/load_reporter/load_reporter.h b/src/cpp/server/load_reporter/load_reporter.h index f8b1123cb1a..e83e146fd37 100644 --- a/src/cpp/server/load_reporter/load_reporter.h +++ b/src/cpp/server/load_reporter/load_reporter.h @@ -26,6 +26,9 @@ #include #include +#include "opencensus/stats/stats.h" +#include "opencensus/tags/tag_key.h" + #include #include @@ -33,9 +36,6 @@ #include "src/cpp/server/load_reporter/load_data_store.h" #include "src/proto/grpc/lb/v1/load_reporter.grpc.pb.h" -#include "opencensus/stats/stats.h" -#include "opencensus/tags/tag_key.h" - namespace grpc { namespace load_reporter { diff --git a/src/cpp/server/load_reporter/load_reporter_async_service_impl.cc b/src/cpp/server/load_reporter/load_reporter_async_service_impl.cc index e2a14efc501..7c9465b8fd3 100644 --- a/src/cpp/server/load_reporter/load_reporter_async_service_impl.cc +++ b/src/cpp/server/load_reporter/load_reporter_async_service_impl.cc @@ -18,12 +18,12 @@ #include +#include "src/cpp/server/load_reporter/load_reporter_async_service_impl.h" + #include #include "absl/memory/memory.h" -#include "src/cpp/server/load_reporter/load_reporter_async_service_impl.h" - namespace grpc { namespace load_reporter { diff --git a/src/cpp/server/load_reporter/util.cc b/src/cpp/server/load_reporter/util.cc index 4f05a5b8c04..75be7f16174 100644 --- a/src/cpp/server/load_reporter/util.cc +++ b/src/cpp/server/load_reporter/util.cc @@ -18,11 +18,10 @@ #include -#include - #include #include +#include namespace grpc { namespace load_reporter { diff --git a/src/cpp/server/secure_server_credentials.cc b/src/cpp/server/secure_server_credentials.cc index 53c9236569b..b69ee5226f4 100644 --- a/src/cpp/server/secure_server_credentials.cc +++ b/src/cpp/server/secure_server_credentials.cc @@ -16,6 +16,8 @@ * */ +#include "src/cpp/server/secure_server_credentials.h" + #include #include #include @@ -25,7 +27,6 @@ #include #include "src/cpp/common/secure_auth_context.h" -#include "src/cpp/server/secure_server_credentials.h" namespace grpc { diff --git a/src/cpp/server/secure_server_credentials.h b/src/cpp/server/secure_server_credentials.h index 730abdb83cd..6a74fd9a487 100644 --- a/src/cpp/server/secure_server_credentials.h +++ b/src/cpp/server/secure_server_credentials.h @@ -21,11 +21,10 @@ #include +#include #include #include -#include - #include "src/cpp/server/thread_pool_interface.h" namespace grpc { diff --git a/src/cpp/server/server_builder.cc b/src/cpp/server/server_builder.cc index af308797f29..4519eb04c8a 100644 --- a/src/cpp/server/server_builder.cc +++ b/src/cpp/server/server_builder.cc @@ -16,15 +16,14 @@ * */ -#include +#include #include #include #include #include #include - -#include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/string.h" diff --git a/src/cpp/server/server_cc.cc b/src/cpp/server/server_cc.cc index efa12aa79f2..ebfbc9e8c34 100644 --- a/src/cpp/server/server_cc.cc +++ b/src/cpp/server/server_cc.cc @@ -15,13 +15,13 @@ * */ -#include - #include #include #include #include +#include "absl/memory/memory.h" + #include #include #include @@ -39,11 +39,10 @@ #include #include #include +#include #include #include -#include "absl/memory/memory.h" - #include "src/core/ext/transport/inproc/inproc_transport.h" #include "src/core/lib/gprpp/manual_constructor.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/cpp/server/server_context.cc b/src/cpp/server/server_context.cc index 4df3ea55fce..43a98b4985f 100644 --- a/src/cpp/server/server_context.cc +++ b/src/cpp/server/server_context.cc @@ -16,8 +16,6 @@ * */ -#include - #include #include #include @@ -29,6 +27,7 @@ #include #include #include +#include #include #include #include diff --git a/src/cpp/server/server_credentials.cc b/src/cpp/server/server_credentials.cc index 36b5a52dc7c..454e8b4e9d6 100644 --- a/src/cpp/server/server_credentials.cc +++ b/src/cpp/server/server_credentials.cc @@ -16,9 +16,8 @@ * */ -#include - #include +#include namespace grpc { diff --git a/src/cpp/server/server_posix.cc b/src/cpp/server/server_posix.cc index c3d40d4fa2d..f2452cc3261 100644 --- a/src/cpp/server/server_posix.cc +++ b/src/cpp/server/server_posix.cc @@ -16,9 +16,8 @@ * */ -#include - #include +#include namespace grpc { diff --git a/src/cpp/thread_manager/thread_manager.cc b/src/cpp/thread_manager/thread_manager.cc index 3ab9569787b..d257ae8dda6 100644 --- a/src/cpp/thread_manager/thread_manager.cc +++ b/src/cpp/thread_manager/thread_manager.cc @@ -21,6 +21,7 @@ #include #include + #include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/cpp/util/core_stats.h b/src/cpp/util/core_stats.h index 6366d7d06e7..358de90fad8 100644 --- a/src/cpp/util/core_stats.h +++ b/src/cpp/util/core_stats.h @@ -19,9 +19,8 @@ #ifndef GRPC_INTERNAL_CPP_UTIL_CORE_STATS_H #define GRPC_INTERNAL_CPP_UTIL_CORE_STATS_H -#include "src/proto/grpc/core/stats.pb.h" - #include "src/core/lib/debug/stats.h" +#include "src/proto/grpc/core/stats.pb.h" namespace grpc { diff --git a/src/csharp/ext/grpc_csharp_ext.c b/src/csharp/ext/grpc_csharp_ext.c index 710b59da5a6..2133a6a79c6 100644 --- a/src/csharp/ext/grpc_csharp_ext.c +++ b/src/csharp/ext/grpc_csharp_ext.c @@ -16,18 +16,19 @@ * */ +#include + +#include + #include #include #include #include #include #include -#include #include #include -#include - #ifdef GPR_WINDOWS #define GPR_EXPORT __declspec(dllexport) #define GPR_CALLTYPE __stdcall diff --git a/src/ruby/ext/grpc/rb_byte_buffer.c b/src/ruby/ext/grpc/rb_byte_buffer.c index e11c7e82a8a..ffd95330d2a 100644 --- a/src/ruby/ext/grpc/rb_byte_buffer.c +++ b/src/ruby/ext/grpc/rb_byte_buffer.c @@ -19,12 +19,13 @@ #include #include "rb_byte_buffer.h" + +#include "rb_grpc.h" #include "rb_grpc_imports.generated.h" #include #include #include -#include "rb_grpc.h" grpc_byte_buffer* grpc_rb_s_to_byte_buffer(char* string, size_t length) { grpc_slice slice = grpc_slice_from_copied_buffer(string, length); diff --git a/src/ruby/ext/grpc/rb_call.c b/src/ruby/ext/grpc/rb_call.c index 117ab63e9af..090fe0afc38 100644 --- a/src/ruby/ext/grpc/rb_call.c +++ b/src/ruby/ext/grpc/rb_call.c @@ -19,6 +19,11 @@ #include #include "rb_call.h" + +#include "rb_byte_buffer.h" +#include "rb_call_credentials.h" +#include "rb_completion_queue.h" +#include "rb_grpc.h" #include "rb_grpc_imports.generated.h" #include @@ -26,11 +31,6 @@ #include #include -#include "rb_byte_buffer.h" -#include "rb_call_credentials.h" -#include "rb_completion_queue.h" -#include "rb_grpc.h" - /* grpc_rb_cCall is the Call class whose instances proxy grpc_call. */ static VALUE grpc_rb_cCall; diff --git a/src/ruby/ext/grpc/rb_call_credentials.c b/src/ruby/ext/grpc/rb_call_credentials.c index 76e5159cb6e..5f305fa2e12 100644 --- a/src/ruby/ext/grpc/rb_call_credentials.c +++ b/src/ruby/ext/grpc/rb_call_credentials.c @@ -19,19 +19,19 @@ #include #include "rb_call_credentials.h" -#include "rb_grpc_imports.generated.h" #include +#include "rb_call.h" +#include "rb_event_thread.h" +#include "rb_grpc.h" +#include "rb_grpc_imports.generated.h" + #include #include #include #include -#include "rb_call.h" -#include "rb_event_thread.h" -#include "rb_grpc.h" - /* grpc_rb_cCallCredentials is the ruby class that proxies * grpc_call_credentials */ static VALUE grpc_rb_cCallCredentials = Qnil; diff --git a/src/ruby/ext/grpc/rb_channel.c b/src/ruby/ext/grpc/rb_channel.c index 6a665b2cc7f..dc833f47815 100644 --- a/src/ruby/ext/grpc/rb_channel.c +++ b/src/ruby/ext/grpc/rb_channel.c @@ -17,25 +17,27 @@ */ #include -#include -#include "rb_byte_buffer.h" #include "rb_channel.h" -#include "rb_grpc_imports.generated.h" -#include -#include -#include -#include -#include +#include + +#include "rb_byte_buffer.h" #include "rb_call.h" #include "rb_channel_args.h" #include "rb_channel_credentials.h" #include "rb_completion_queue.h" #include "rb_grpc.h" +#include "rb_grpc_imports.generated.h" #include "rb_server.h" #include "rb_xds_channel_credentials.h" +#include +#include +#include +#include +#include + /* id_channel is the name of the hidden ivar that preserves a reference to the * channel on a call, so that calls are not GCed before their channel. */ static ID id_channel; diff --git a/src/ruby/ext/grpc/rb_channel_args.c b/src/ruby/ext/grpc/rb_channel_args.c index 6aaf240ad59..666a99475b5 100644 --- a/src/ruby/ext/grpc/rb_channel_args.c +++ b/src/ruby/ext/grpc/rb_channel_args.c @@ -19,12 +19,12 @@ #include #include "rb_channel_args.h" + +#include "rb_grpc.h" #include "rb_grpc_imports.generated.h" #include -#include "rb_grpc.h" - static rb_data_type_t grpc_rb_channel_args_data_type = { "grpc_channel_args", {GRPC_RB_GC_NOT_MARKED, diff --git a/src/ruby/ext/grpc/rb_channel_credentials.c b/src/ruby/ext/grpc/rb_channel_credentials.c index d65d049559e..368ad1440e0 100644 --- a/src/ruby/ext/grpc/rb_channel_credentials.c +++ b/src/ruby/ext/grpc/rb_channel_credentials.c @@ -18,9 +18,12 @@ #include +#include "rb_channel_credentials.h" + #include -#include "rb_channel_credentials.h" +#include "rb_call_credentials.h" +#include "rb_grpc.h" #include "rb_grpc_imports.generated.h" #include @@ -28,9 +31,6 @@ #include #include -#include "rb_call_credentials.h" -#include "rb_grpc.h" - /* grpc_rb_cChannelCredentials is the ruby class that proxies grpc_channel_credentials. */ static VALUE grpc_rb_cChannelCredentials = Qnil; diff --git a/src/ruby/ext/grpc/rb_channel_credentials.h b/src/ruby/ext/grpc/rb_channel_credentials.h index 56856df2bc7..75bda4b25ad 100644 --- a/src/ruby/ext/grpc/rb_channel_credentials.h +++ b/src/ruby/ext/grpc/rb_channel_credentials.h @@ -20,6 +20,7 @@ #define GRPC_RB_CREDENTIALS_H_ #include + #include #include diff --git a/src/ruby/ext/grpc/rb_completion_queue.c b/src/ruby/ext/grpc/rb_completion_queue.c index 64264f5b158..8c0af2ec0d9 100644 --- a/src/ruby/ext/grpc/rb_completion_queue.c +++ b/src/ruby/ext/grpc/rb_completion_queue.c @@ -19,14 +19,15 @@ #include #include "rb_completion_queue.h" -#include "rb_grpc_imports.generated.h" #include +#include "rb_grpc.h" +#include "rb_grpc_imports.generated.h" + #include #include #include -#include "rb_grpc.h" /* Used to allow grpc_completion_queue_next call to release the GIL */ typedef struct next_call_stack { diff --git a/src/ruby/ext/grpc/rb_compression_options.c b/src/ruby/ext/grpc/rb_compression_options.c index 53b71e2a19b..0c0e5a9ca8a 100644 --- a/src/ruby/ext/grpc/rb_compression_options.c +++ b/src/ruby/ext/grpc/rb_compression_options.c @@ -18,8 +18,12 @@ #include -#include "rb_byte_buffer.h" #include "rb_compression_options.h" + +#include + +#include "rb_byte_buffer.h" +#include "rb_grpc.h" #include "rb_grpc_imports.generated.h" #include @@ -29,9 +33,6 @@ #include #include #include -#include - -#include "rb_grpc.h" static VALUE grpc_rb_cCompressionOptions = Qnil; diff --git a/src/ruby/ext/grpc/rb_event_thread.c b/src/ruby/ext/grpc/rb_event_thread.c index 0bdf72547a1..0f2461eff27 100644 --- a/src/ruby/ext/grpc/rb_event_thread.c +++ b/src/ruby/ext/grpc/rb_event_thread.c @@ -19,17 +19,17 @@ #include #include "rb_event_thread.h" -#include "rb_grpc_imports.generated.h" +#include #include +#include "rb_grpc.h" +#include "rb_grpc_imports.generated.h" + #include #include #include #include -#include - -#include "rb_grpc.h" typedef struct grpc_rb_event { // callback will be called with argument while holding the GVL diff --git a/src/ruby/ext/grpc/rb_grpc.c b/src/ruby/ext/grpc/rb_grpc.c index 8b230ea2764..ab10af50e47 100644 --- a/src/ruby/ext/grpc/rb_grpc.c +++ b/src/ruby/ext/grpc/rb_grpc.c @@ -19,7 +19,6 @@ #include #include "rb_grpc.h" -#include "rb_grpc_imports.generated.h" #include #include @@ -28,21 +27,23 @@ #include #include -#include -#include -#include #include "rb_call.h" #include "rb_call_credentials.h" #include "rb_channel.h" #include "rb_channel_credentials.h" #include "rb_compression_options.h" #include "rb_event_thread.h" +#include "rb_grpc_imports.generated.h" #include "rb_loader.h" #include "rb_server.h" #include "rb_server_credentials.h" #include "rb_xds_channel_credentials.h" #include "rb_xds_server_credentials.h" +#include +#include +#include + static VALUE grpc_rb_cTimeVal = Qnil; static rb_data_type_t grpc_rb_timespec_data_type = { diff --git a/src/ruby/ext/grpc/rb_grpc.h b/src/ruby/ext/grpc/rb_grpc.h index 2c4675839ac..716e779e585 100644 --- a/src/ruby/ext/grpc/rb_grpc.h +++ b/src/ruby/ext/grpc/rb_grpc.h @@ -20,6 +20,7 @@ #define GRPC_RB_H_ #include + #include #include diff --git a/src/ruby/ext/grpc/rb_server.c b/src/ruby/ext/grpc/rb_server.c index 31434a3706c..0b19328129f 100644 --- a/src/ruby/ext/grpc/rb_server.c +++ b/src/ruby/ext/grpc/rb_server.c @@ -18,21 +18,22 @@ #include -#include "rb_grpc_imports.generated.h" #include "rb_server.h" -#include -#include -#include -#include #include "rb_byte_buffer.h" #include "rb_call.h" #include "rb_channel_args.h" #include "rb_completion_queue.h" #include "rb_grpc.h" +#include "rb_grpc_imports.generated.h" #include "rb_server_credentials.h" #include "rb_xds_server_credentials.h" +#include +#include +#include +#include + /* grpc_rb_cServer is the ruby class that proxies grpc_server. */ static VALUE grpc_rb_cServer = Qnil; diff --git a/src/ruby/ext/grpc/rb_server_credentials.c b/src/ruby/ext/grpc/rb_server_credentials.c index 7c68cfd034f..ccd8a28d23d 100644 --- a/src/ruby/ext/grpc/rb_server_credentials.c +++ b/src/ruby/ext/grpc/rb_server_credentials.c @@ -18,15 +18,15 @@ #include -#include "rb_grpc_imports.generated.h" #include "rb_server_credentials.h" +#include "rb_grpc.h" +#include "rb_grpc_imports.generated.h" + #include #include #include -#include "rb_grpc.h" - /* grpc_rb_cServerCredentials is the ruby class that proxies grpc_server_credentials. */ static VALUE grpc_rb_cServerCredentials = Qnil; diff --git a/src/ruby/ext/grpc/rb_server_credentials.h b/src/ruby/ext/grpc/rb_server_credentials.h index 35c2ef0a027..bb14b575c05 100644 --- a/src/ruby/ext/grpc/rb_server_credentials.h +++ b/src/ruby/ext/grpc/rb_server_credentials.h @@ -20,6 +20,7 @@ #define GRPC_RB_SERVER_CREDENTIALS_H_ #include + #include #include diff --git a/src/ruby/ext/grpc/rb_xds_channel_credentials.c b/src/ruby/ext/grpc/rb_xds_channel_credentials.c index b65a3e88c96..71f94afc86c 100644 --- a/src/ruby/ext/grpc/rb_xds_channel_credentials.c +++ b/src/ruby/ext/grpc/rb_xds_channel_credentials.c @@ -16,18 +16,21 @@ * */ -#include -#include -#include -#include #include + +#include "rb_xds_channel_credentials.h" + #include #include "rb_call_credentials.h" #include "rb_channel_credentials.h" #include "rb_grpc.h" #include "rb_grpc_imports.generated.h" -#include "rb_xds_channel_credentials.h" + +#include +#include +#include +#include /* grpc_rb_cXdsChannelCredentials is the ruby class that proxies grpc_channel_credentials. */ diff --git a/src/ruby/ext/grpc/rb_xds_channel_credentials.h b/src/ruby/ext/grpc/rb_xds_channel_credentials.h index 2dc655e0b96..5eba040ba17 100644 --- a/src/ruby/ext/grpc/rb_xds_channel_credentials.h +++ b/src/ruby/ext/grpc/rb_xds_channel_credentials.h @@ -19,10 +19,12 @@ #ifndef GRPC_RB_XDS_CHANNEL_CREDENTIALS_H_ #define GRPC_RB_XDS_CHANNEL_CREDENTIALS_H_ -#include #include + #include +#include + /* Initializes the ruby ChannelCredentials class. */ void Init_grpc_xds_channel_credentials(); diff --git a/src/ruby/ext/grpc/rb_xds_server_credentials.c b/src/ruby/ext/grpc/rb_xds_server_credentials.c index 54f1ecbaab1..4d877d15473 100644 --- a/src/ruby/ext/grpc/rb_xds_server_credentials.c +++ b/src/ruby/ext/grpc/rb_xds_server_credentials.c @@ -16,17 +16,18 @@ * */ -#include "rb_xds_server_credentials.h" - -#include -#include -#include #include +#include "rb_xds_server_credentials.h" + #include "rb_grpc.h" #include "rb_grpc_imports.generated.h" #include "rb_server_credentials.h" +#include +#include +#include + /* grpc_rb_cXdsServerCredentials is the ruby class that proxies grpc_server_credentials. */ static VALUE grpc_rb_cXdsServerCredentials = Qnil; diff --git a/src/ruby/ext/grpc/rb_xds_server_credentials.h b/src/ruby/ext/grpc/rb_xds_server_credentials.h index 398ab47f1e4..eff00c7dcf5 100644 --- a/src/ruby/ext/grpc/rb_xds_server_credentials.h +++ b/src/ruby/ext/grpc/rb_xds_server_credentials.h @@ -19,10 +19,12 @@ #ifndef GRPC_RB_XDS_SERVER_CREDENTIALS_H_ #define GRPC_RB_XDS_SERVER_CREDENTIALS_H_ -#include #include + #include +#include + /* Initializes the ruby XdsServerCredentials class. */ void Init_grpc_xds_server_credentials(); diff --git a/test/core/address_utils/parse_address_test.cc b/test/core/address_utils/parse_address_test.cc index a1730fff892..f92a97bce65 100644 --- a/test/core/address_utils/parse_address_test.cc +++ b/test/core/address_utils/parse_address_test.cc @@ -17,8 +17,6 @@ */ #include "src/core/lib/address_utils/parse_address.h" -#include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/iomgr/sockaddr.h" #include #ifdef GRPC_HAVE_UNIX_SOCKET @@ -28,7 +26,9 @@ #include #include +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils.h" #include "test/core/util/test_config.h" diff --git a/test/core/address_utils/parse_address_with_named_scope_id_test.cc b/test/core/address_utils/parse_address_with_named_scope_id_test.cc index cd4f1a5fed2..caec8bfcca2 100644 --- a/test/core/address_utils/parse_address_with_named_scope_id_test.cc +++ b/test/core/address_utils/parse_address_with_named_scope_id_test.cc @@ -16,10 +16,6 @@ * */ -#include "src/core/lib/address_utils/parse_address.h" -#include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/iomgr/sockaddr.h" - #include #include #ifdef GRPC_HAVE_UNIX_SOCKET @@ -31,9 +27,12 @@ #include #include +#include "src/core/lib/address_utils/parse_address.h" +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/gprpp/memory.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils.h" #include "test/core/util/test_config.h" diff --git a/test/core/address_utils/sockaddr_utils_test.cc b/test/core/address_utils/sockaddr_utils_test.cc index 7871261258e..2c615f147e6 100644 --- a/test/core/address_utils/sockaddr_utils_test.cc +++ b/test/core/address_utils/sockaddr_utils_test.cc @@ -14,9 +14,9 @@ // limitations under the License. // +#include + #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/iomgr/sockaddr.h" -#include "src/core/lib/iomgr/socket_utils.h" #include #include @@ -25,7 +25,9 @@ #include #include -#include + +#include "src/core/lib/iomgr/sockaddr.h" +#include "src/core/lib/iomgr/socket_utils.h" #include "test/core/util/test_config.h" namespace { diff --git a/test/core/backoff/backoff_test.cc b/test/core/backoff/backoff_test.cc index 62d60590440..0a44374353b 100644 --- a/test/core/backoff/backoff_test.cc +++ b/test/core/backoff/backoff_test.cc @@ -20,10 +20,11 @@ #include +#include + #include #include -#include #include "test/core/util/test_config.h" namespace grpc { diff --git a/test/core/bad_client/bad_client.h b/test/core/bad_client/bad_client.h index de7d830cd72..fcd998e1b28 100644 --- a/test/core/bad_client/bad_client.h +++ b/test/core/bad_client/bad_client.h @@ -19,10 +19,10 @@ #ifndef GRPC_TEST_CORE_BAD_CLIENT_BAD_CLIENT_H #define GRPC_TEST_CORE_BAD_CLIENT_BAD_CLIENT_H -#include - #include +#include + #include "test/core/util/test_config.h" #define GRPC_BAD_CLIENT_REGISTERED_METHOD "/registered/bar" diff --git a/test/core/bad_client/tests/bad_streaming_id.cc b/test/core/bad_client/tests/bad_streaming_id.cc index 3efc3ebdb12..a76f55dd2fd 100644 --- a/test/core/bad_client/tests/bad_streaming_id.cc +++ b/test/core/bad_client/tests/bad_streaming_id.cc @@ -21,6 +21,7 @@ #include #include + #include "src/core/lib/surface/server.h" #include "test/core/bad_client/bad_client.h" diff --git a/test/core/bad_client/tests/badreq.cc b/test/core/bad_client/tests/badreq.cc index ab322b292b0..8c3c5a39429 100644 --- a/test/core/bad_client/tests/badreq.cc +++ b/test/core/bad_client/tests/badreq.cc @@ -16,13 +16,12 @@ * */ -#include "test/core/bad_client/bad_client.h" - #include #include #include "src/core/lib/surface/server.h" +#include "test/core/bad_client/bad_client.h" #include "test/core/end2end/cq_verifier.h" #define PFX_STR \ diff --git a/test/core/bad_client/tests/duplicate_header.cc b/test/core/bad_client/tests/duplicate_header.cc index 1fa1fd2f97f..de2766345e4 100644 --- a/test/core/bad_client/tests/duplicate_header.cc +++ b/test/core/bad_client/tests/duplicate_header.cc @@ -16,13 +16,12 @@ * */ -#include "test/core/bad_client/bad_client.h" - #include #include #include "src/core/lib/surface/server.h" +#include "test/core/bad_client/bad_client.h" #include "test/core/end2end/cq_verifier.h" #define PFX_STR \ diff --git a/test/core/bad_client/tests/head_of_line_blocking.cc b/test/core/bad_client/tests/head_of_line_blocking.cc index 08d7bb8e4c5..188de862363 100644 --- a/test/core/bad_client/tests/head_of_line_blocking.cc +++ b/test/core/bad_client/tests/head_of_line_blocking.cc @@ -16,14 +16,13 @@ * */ -#include "test/core/bad_client/bad_client.h" - #include #include #include #include "src/core/lib/surface/server.h" +#include "test/core/bad_client/bad_client.h" #include "test/core/end2end/cq_verifier.h" static const char prefix[] = diff --git a/test/core/bad_client/tests/large_metadata.cc b/test/core/bad_client/tests/large_metadata.cc index c1c4fd259b2..5b4561725a3 100644 --- a/test/core/bad_client/tests/large_metadata.cc +++ b/test/core/bad_client/tests/large_metadata.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/bad_client/bad_client.h" - #include #include "absl/strings/str_format.h" @@ -25,8 +23,10 @@ #include #include + #include "src/core/lib/gpr/string.h" #include "src/core/lib/surface/server.h" +#include "test/core/bad_client/bad_client.h" #include "test/core/end2end/cq_verifier.h" // The large-metadata headers that we're adding for this test are not diff --git a/test/core/bad_client/tests/out_of_bounds.cc b/test/core/bad_client/tests/out_of_bounds.cc index 0e38223f288..ce3f1d8a0a7 100644 --- a/test/core/bad_client/tests/out_of_bounds.cc +++ b/test/core/bad_client/tests/out_of_bounds.cc @@ -21,6 +21,7 @@ #include #include + #include "src/core/lib/surface/server.h" #include "test/core/bad_client/bad_client.h" diff --git a/test/core/bad_client/tests/server_registered_method.cc b/test/core/bad_client/tests/server_registered_method.cc index 69e26925044..e176f611631 100644 --- a/test/core/bad_client/tests/server_registered_method.cc +++ b/test/core/bad_client/tests/server_registered_method.cc @@ -16,11 +16,10 @@ * */ -#include "test/core/bad_client/bad_client.h" - #include #include "src/core/lib/surface/server.h" +#include "test/core/bad_client/bad_client.h" #include "test/core/end2end/cq_verifier.h" #define PFX_STR \ diff --git a/test/core/bad_client/tests/simple_request.cc b/test/core/bad_client/tests/simple_request.cc index a4aacc20e8f..3c4bd84ddf9 100644 --- a/test/core/bad_client/tests/simple_request.cc +++ b/test/core/bad_client/tests/simple_request.cc @@ -16,13 +16,12 @@ * */ -#include "test/core/bad_client/bad_client.h" - #include #include #include "src/core/lib/surface/server.h" +#include "test/core/bad_client/bad_client.h" #include "test/core/end2end/cq_verifier.h" #define PFX_STR \ diff --git a/test/core/bad_client/tests/unknown_frame.cc b/test/core/bad_client/tests/unknown_frame.cc index 645c08f6588..04ce10e1e81 100644 --- a/test/core/bad_client/tests/unknown_frame.cc +++ b/test/core/bad_client/tests/unknown_frame.cc @@ -21,6 +21,7 @@ #include #include + #include "src/core/lib/surface/server.h" #include "test/core/bad_client/bad_client.h" diff --git a/test/core/bad_client/tests/window_overflow.cc b/test/core/bad_client/tests/window_overflow.cc index dbb98a2b0d8..cff0cfbf2ea 100644 --- a/test/core/bad_client/tests/window_overflow.cc +++ b/test/core/bad_client/tests/window_overflow.cc @@ -16,14 +16,13 @@ * */ -#include "test/core/bad_client/bad_client.h" - #include #include #include #include "src/core/lib/surface/server.h" +#include "test/core/bad_client/bad_client.h" #define PFX_STR \ "\x00\x00\x00\x04\x01\x00\x00\x00\x00" \ diff --git a/test/core/bad_connection/close_fd_test.cc b/test/core/bad_connection/close_fd_test.cc index 057be6df531..4b4c1a7ee5e 100644 --- a/test/core/bad_connection/close_fd_test.cc +++ b/test/core/bad_connection/close_fd_test.cc @@ -26,8 +26,6 @@ // This test won't work except with posix sockets enabled #ifdef GRPC_POSIX_SOCKET_TCP -#include "test/core/util/test_config.h" - #include #include #include @@ -38,12 +36,14 @@ #include #include #include + #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/iomgr/endpoint_pair.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/completion_queue.h" #include "src/core/lib/surface/server.h" #include "test/core/util/resource_user_util.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/bad_ssl/server_common.cc b/test/core/bad_ssl/server_common.cc index 88740a49b6d..d3e1a341a92 100644 --- a/test/core/bad_ssl/server_common.cc +++ b/test/core/bad_ssl/server_common.cc @@ -16,10 +16,12 @@ * */ -#include +#include "test/core/bad_ssl/server_common.h" + #include -#include "test/core/bad_ssl/server_common.h" +#include + #include "test/core/util/cmdline.h" #include "test/core/util/test_config.h" diff --git a/test/core/bad_ssl/servers/alpn.cc b/test/core/bad_ssl/servers/alpn.cc index 795a856bcd2..27a9aa46e52 100644 --- a/test/core/bad_ssl/servers/alpn.cc +++ b/test/core/bad_ssl/servers/alpn.cc @@ -18,10 +18,11 @@ #include "src/core/ext/transport/chttp2/alpn/alpn.h" +#include + #include #include #include -#include #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/load_file.h" diff --git a/test/core/bad_ssl/servers/cert.cc b/test/core/bad_ssl/servers/cert.cc index 785e10b99bb..7b95eb34b98 100644 --- a/test/core/bad_ssl/servers/cert.cc +++ b/test/core/bad_ssl/servers/cert.cc @@ -23,7 +23,6 @@ #include #include "src/core/lib/iomgr/load_file.h" - #include "test/core/bad_ssl/server_common.h" /* This server will present an untrusted cert to the connecting client, diff --git a/test/core/channel/channel_args_test.cc b/test/core/channel/channel_args_test.cc index 6f7ebc60ab6..8680d3c193d 100644 --- a/test/core/channel/channel_args_test.cc +++ b/test/core/channel/channel_args_test.cc @@ -16,13 +16,14 @@ * */ -#include -#include +#include "src/core/lib/channel/channel_args.h" + #include +#include +#include #include -#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/test/core/channel/channel_trace_test.cc b/test/core/channel/channel_trace_test.cc index 0ecefede9c3..824bd21e6ab 100644 --- a/test/core/channel/channel_trace_test.cc +++ b/test/core/channel/channel_trace_test.cc @@ -16,6 +16,8 @@ * */ +#include "src/core/lib/channel/channel_trace.h" + #include #include @@ -25,20 +27,15 @@ #include #include -#include "src/core/lib/channel/channel_trace.h" #include "src/core/lib/channel/channelz.h" #include "src/core/lib/channel/channelz_registry.h" #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/json/json.h" #include "src/core/lib/surface/channel.h" - #include "test/core/util/test_config.h" #include "test/cpp/util/channel_trace_proto_helper.h" -#include -#include - namespace grpc_core { namespace channelz { namespace testing { diff --git a/test/core/channel/channelz_registry_test.cc b/test/core/channel/channelz_registry_test.cc index eca7f20ead6..166dcdfdcff 100644 --- a/test/core/channel/channelz_registry_test.cc +++ b/test/core/channel/channelz_registry_test.cc @@ -16,19 +16,20 @@ * */ +#include "src/core/lib/channel/channelz_registry.h" + #include #include -#include #include +#include #include #include #include #include "src/core/lib/channel/channel_trace.h" #include "src/core/lib/channel/channelz.h" -#include "src/core/lib/channel/channelz_registry.h" #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/memory.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -36,9 +37,6 @@ #include "src/core/lib/surface/channel.h" #include "test/core/util/test_config.h" -#include -#include - namespace grpc_core { namespace channelz { namespace testing { diff --git a/test/core/channel/channelz_test.cc b/test/core/channel/channelz_test.cc index cc17a333b6a..bd59ea4097e 100644 --- a/test/core/channel/channelz_test.cc +++ b/test/core/channel/channelz_test.cc @@ -16,6 +16,8 @@ * */ +#include "src/core/lib/channel/channelz.h" + #include #include @@ -23,23 +25,18 @@ #include #include +#include #include "src/core/lib/channel/channel_trace.h" -#include "src/core/lib/channel/channelz.h" #include "src/core/lib/channel/channelz_registry.h" #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/json/json.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/server.h" - #include "test/core/util/test_config.h" #include "test/cpp/util/channel_trace_proto_helper.h" -#include -#include -#include - namespace grpc_core { namespace channelz { namespace testing { diff --git a/test/core/channel/minimal_stack_is_minimal_test.cc b/test/core/channel/minimal_stack_is_minimal_test.cc index a222242d3eb..5aca1fe9954 100644 --- a/test/core/channel/minimal_stack_is_minimal_test.cc +++ b/test/core/channel/minimal_stack_is_minimal_test.cc @@ -29,15 +29,16 @@ * configurations and assess whether such a change is correct and desirable. */ -#include -#include -#include #include #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" +#include +#include +#include + #include "src/core/lib/channel/channel_stack_builder.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/surface/channel_init.h" diff --git a/test/core/client_channel/certificate_provider_registry_test.cc b/test/core/client_channel/certificate_provider_registry_test.cc index ef33b14b69e..3717d8b8cbf 100644 --- a/test/core/client_channel/certificate_provider_registry_test.cc +++ b/test/core/client_channel/certificate_provider_registry_test.cc @@ -18,10 +18,10 @@ #include -#include - #include "src/core/ext/xds/certificate_provider_registry.h" +#include + #include "test/core/util/test_config.h" namespace grpc_core { diff --git a/test/core/client_channel/resolvers/fake_resolver_test.cc b/test/core/client_channel/resolvers/fake_resolver_test.cc index 0d208440306..010fb1cf879 100644 --- a/test/core/client_channel/resolvers/fake_resolver_test.cc +++ b/test/core/client_channel/resolvers/fake_resolver_test.cc @@ -16,6 +16,8 @@ * */ +#include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h" + #include #include @@ -25,7 +27,6 @@ #include #include -#include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h" #include "src/core/ext/filters/client_channel/resolver_registry.h" #include "src/core/ext/filters/client_channel/server_address.h" #include "src/core/lib/address_utils/parse_address.h" @@ -33,7 +34,6 @@ #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/work_serializer.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" - #include "test/core/util/test_config.h" class ResultHandler : public grpc_core::Resolver::ResultHandler { diff --git a/test/core/client_channel/resolvers/sockaddr_resolver_test.cc b/test/core/client_channel/resolvers/sockaddr_resolver_test.cc index 8b0692503f3..5c77d311226 100644 --- a/test/core/client_channel/resolvers/sockaddr_resolver_test.cc +++ b/test/core/client_channel/resolvers/sockaddr_resolver_test.cc @@ -25,7 +25,6 @@ #include "src/core/ext/filters/client_channel/resolver_registry.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/work_serializer.h" - #include "test/core/util/test_config.h" static std::shared_ptr* g_work_serializer; diff --git a/test/core/client_channel/service_config_test.cc b/test/core/client_channel/service_config_test.cc index e22a26f73d3..d281ccff97f 100644 --- a/test/core/client_channel/service_config_test.cc +++ b/test/core/client_channel/service_config_test.cc @@ -16,15 +16,17 @@ * */ -#include "absl/strings/str_cat.h" +#include "src/core/ext/filters/client_channel/service_config.h" #include #include +#include "absl/strings/str_cat.h" + #include + #include "src/core/ext/filters/client_channel/resolver_result_parsing.h" #include "src/core/ext/filters/client_channel/retry_service_config.h" -#include "src/core/ext/filters/client_channel/service_config.h" #include "src/core/ext/filters/client_channel/service_config_parser.h" #include "src/core/ext/filters/message_size/message_size_filter.h" #include "src/core/lib/gpr/string.h" diff --git a/test/core/compiler_bugs/miscompile_with_no_unique_address_test.cc b/test/core/compiler_bugs/miscompile_with_no_unique_address_test.cc index 03661cf7158..73e39f5cc7a 100644 --- a/test/core/compiler_bugs/miscompile_with_no_unique_address_test.cc +++ b/test/core/compiler_bugs/miscompile_with_no_unique_address_test.cc @@ -13,6 +13,7 @@ // limitations under the License. #include + #include // Make a template argument to test which bit pattern remains in A's destructor diff --git a/test/core/compression/algorithm_test.cc b/test/core/compression/algorithm_test.cc index c32820f08f4..b28aaf57b65 100644 --- a/test/core/compression/algorithm_test.cc +++ b/test/core/compression/algorithm_test.cc @@ -16,14 +16,13 @@ * */ -#include "src/core/lib/compression/algorithm_metadata.h" - #include #include #include #include +#include "src/core/lib/compression/algorithm_metadata.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/transport/static_metadata.h" diff --git a/test/core/compression/message_compress_fuzzer.cc b/test/core/compression/message_compress_fuzzer.cc index ebc947a6255..c698e901596 100644 --- a/test/core/compression/message_compress_fuzzer.cc +++ b/test/core/compression/message_compress_fuzzer.cc @@ -16,11 +16,12 @@ * */ -#include #include #include #include +#include + #include "src/core/lib/compression/message_compress.h" #include "src/core/lib/security/credentials/credentials.h" #include "test/core/util/memory_counters.h" diff --git a/test/core/compression/message_decompress_fuzzer.cc b/test/core/compression/message_decompress_fuzzer.cc index 3f78caa8ebe..1d6eb45e066 100644 --- a/test/core/compression/message_decompress_fuzzer.cc +++ b/test/core/compression/message_decompress_fuzzer.cc @@ -16,11 +16,12 @@ * */ -#include #include #include #include +#include + #include "src/core/lib/compression/message_compress.h" #include "src/core/lib/security/credentials/credentials.h" #include "test/core/util/memory_counters.h" diff --git a/test/core/compression/stream_compression_fuzzer.cc b/test/core/compression/stream_compression_fuzzer.cc index 0f123a14818..55bc4d6a474 100644 --- a/test/core/compression/stream_compression_fuzzer.cc +++ b/test/core/compression/stream_compression_fuzzer.cc @@ -16,11 +16,12 @@ * */ -#include #include #include #include +#include + #include "src/core/lib/compression/stream_compression.h" #include "src/core/lib/security/credentials/credentials.h" #include "test/core/util/memory_counters.h" diff --git a/test/core/compression/stream_compression_test.cc b/test/core/compression/stream_compression_test.cc index 9d5e13761eb..252652f00cc 100644 --- a/test/core/compression/stream_compression_test.cc +++ b/test/core/compression/stream_compression_test.cc @@ -16,6 +16,8 @@ * */ +#include "src/core/lib/compression/stream_compression.h" + #include #include @@ -23,7 +25,6 @@ #include #include -#include "src/core/lib/compression/stream_compression.h" #include "test/core/util/test_config.h" static void generate_random_payload(char* payload, size_t size) { diff --git a/test/core/compression/stream_decompression_fuzzer.cc b/test/core/compression/stream_decompression_fuzzer.cc index 14695cba304..cbfbd5d43e1 100644 --- a/test/core/compression/stream_decompression_fuzzer.cc +++ b/test/core/compression/stream_decompression_fuzzer.cc @@ -16,11 +16,12 @@ * */ -#include #include #include #include +#include + #include "src/core/lib/compression/stream_compression.h" #include "src/core/lib/security/credentials/credentials.h" #include "test/core/util/memory_counters.h" diff --git a/test/core/config/core_configuration_test.cc b/test/core/config/core_configuration_test.cc index af27528521d..814c383aad0 100644 --- a/test/core/config/core_configuration_test.cc +++ b/test/core/config/core_configuration_test.cc @@ -13,10 +13,12 @@ // limitations under the License. #include "src/core/lib/config/core_configuration.h" -#include + #include #include +#include + namespace grpc_core { // Allow substitution of config builder - in real code this would iterate diff --git a/test/core/debug/stats_test.cc b/test/core/debug/stats_test.cc index 252dbd406e7..fe8fe4951e2 100644 --- a/test/core/debug/stats_test.cc +++ b/test/core/debug/stats_test.cc @@ -21,10 +21,11 @@ #include #include +#include + #include #include #include -#include #include "test/core/util/test_config.h" diff --git a/test/core/end2end/bad_server_response_test.cc b/test/core/end2end/bad_server_response_test.cc index b5e002a66dd..c906ad5a7a0 100644 --- a/test/core/end2end/bad_server_response_test.cc +++ b/test/core/end2end/bad_server_response_test.cc @@ -16,8 +16,6 @@ * */ -#include "src/core/lib/iomgr/sockaddr.h" - #include #include diff --git a/test/core/end2end/connection_refused_test.cc b/test/core/end2end/connection_refused_test.cc index 59d7c69409b..6fd40fd58c3 100644 --- a/test/core/end2end/connection_refused_test.cc +++ b/test/core/end2end/connection_refused_test.cc @@ -28,7 +28,6 @@ #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/transport/metadata.h" - #include "test/core/end2end/cq_verifier.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/cq_verifier.cc b/test/core/end2end/cq_verifier.cc index 8d50116d7d8..7d84727899b 100644 --- a/test/core/end2end/cq_verifier.cc +++ b/test/core/end2end/cq_verifier.cc @@ -36,6 +36,7 @@ #include #include #include + #include "src/core/lib/compression/compression_internal.h" #include "src/core/lib/compression/message_compress.h" #include "src/core/lib/gpr/string.h" diff --git a/test/core/end2end/cq_verifier.h b/test/core/end2end/cq_verifier.h index 48bf0180f6c..9e6b3abaf08 100644 --- a/test/core/end2end/cq_verifier.h +++ b/test/core/end2end/cq_verifier.h @@ -22,6 +22,7 @@ #include #include + #include "test/core/util/test_config.h" /* A cq_verifier can verify that expected events arrive in a timely fashion diff --git a/test/core/end2end/end2end_test_utils.cc b/test/core/end2end/end2end_test_utils.cc index 51d2730f0e3..c5927611b6d 100644 --- a/test/core/end2end/end2end_test_utils.cc +++ b/test/core/end2end/end2end_test_utils.cc @@ -16,12 +16,12 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include +#include "test/core/end2end/end2end_tests.h" + const char* get_host_override_string(const char* str, grpc_end2end_test_config config) { if (config.feature_mask & FEATURE_MASK_SUPPORTS_AUTHORITY_HEADER) { diff --git a/test/core/end2end/fixtures/h2_census.cc b/test/core/end2end/fixtures/h2_census.cc index 2e8429669df..6ab374e7db4 100644 --- a/test/core/end2end/fixtures/h2_census.cc +++ b/test/core/end2end/fixtures/h2_census.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -32,6 +30,7 @@ #include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/server.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/fixtures/h2_compress.cc b/test/core/end2end/fixtures/h2_compress.cc index 9bc359a8e77..f0de5c6b41e 100644 --- a/test/core/end2end/fixtures/h2_compress.cc +++ b/test/core/end2end/fixtures/h2_compress.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -33,6 +31,7 @@ #include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/server.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/fixtures/h2_fakesec.cc b/test/core/end2end/fixtures/h2_fakesec.cc index b38e90cb70a..156185aa3b1 100644 --- a/test/core/end2end/fixtures/h2_fakesec.cc +++ b/test/core/end2end/fixtures/h2_fakesec.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -27,6 +25,7 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/fixtures/h2_fd.cc b/test/core/end2end/fixtures/h2_fd.cc index 9ef037573fa..bd977c9f8c5 100644 --- a/test/core/end2end/fixtures/h2_fd.cc +++ b/test/core/end2end/fixtures/h2_fd.cc @@ -21,8 +21,6 @@ // This test won't work except with posix sockets enabled #ifdef GRPC_POSIX_SOCKET -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -30,9 +28,11 @@ #include #include #include + #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/socket_utils_posix.h" #include "src/core/lib/iomgr/unix_sockets_posix.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/util/test_config.h" typedef struct { diff --git a/test/core/end2end/fixtures/h2_full+pipe.cc b/test/core/end2end/fixtures/h2_full+pipe.cc index dd5ae5ba70a..f26c390d2f0 100644 --- a/test/core/end2end/fixtures/h2_full+pipe.cc +++ b/test/core/end2end/fixtures/h2_full+pipe.cc @@ -21,8 +21,6 @@ // This test requires posix wakeup fds #ifdef GRPC_POSIX_WAKEUP_FD -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -37,6 +35,7 @@ #include "src/core/lib/iomgr/wakeup_fd_posix.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/server.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/fixtures/h2_full+trace.cc b/test/core/end2end/fixtures/h2_full+trace.cc index 68cf39a4c38..48085e9315c 100644 --- a/test/core/end2end/fixtures/h2_full+trace.cc +++ b/test/core/end2end/fixtures/h2_full+trace.cc @@ -16,10 +16,6 @@ * */ -#include "src/core/lib/iomgr/port.h" - -#include "test/core/end2end/end2end_tests.h" - #include #ifdef GRPC_POSIX_SOCKET #include @@ -35,8 +31,10 @@ #include "src/core/lib/channel/connected_channel.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/host_port.h" +#include "src/core/lib/iomgr/port.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/server.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/fixtures/h2_full+workarounds.cc b/test/core/end2end/fixtures/h2_full+workarounds.cc index 13c1f1fa181..55a73543d40 100644 --- a/test/core/end2end/fixtures/h2_full+workarounds.cc +++ b/test/core/end2end/fixtures/h2_full+workarounds.cc @@ -16,14 +16,11 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include #include #include - #include #include "src/core/ext/filters/client_channel/client_channel.h" @@ -33,6 +30,7 @@ #include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/server.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/fixtures/h2_full.cc b/test/core/end2end/fixtures/h2_full.cc index 16c9128e0a8..074ec7f8643 100644 --- a/test/core/end2end/fixtures/h2_full.cc +++ b/test/core/end2end/fixtures/h2_full.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -31,6 +29,7 @@ #include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/server.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/fixtures/h2_http_proxy.cc b/test/core/end2end/fixtures/h2_http_proxy.cc index 957beb3ec84..61a3955633b 100644 --- a/test/core/end2end/fixtures/h2_http_proxy.cc +++ b/test/core/end2end/fixtures/h2_http_proxy.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -36,6 +34,7 @@ #include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/server.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/fixtures/http_proxy_fixture.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/fixtures/h2_insecure.cc b/test/core/end2end/fixtures/h2_insecure.cc index f6d6d2380aa..13ac3e8fe79 100644 --- a/test/core/end2end/fixtures/h2_insecure.cc +++ b/test/core/end2end/fixtures/h2_insecure.cc @@ -16,8 +16,6 @@ // // -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -26,6 +24,7 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/host_port.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/fixtures/h2_oauth2.cc b/test/core/end2end/fixtures/h2_oauth2.cc index 2cc53d0cfa5..1f71fda3018 100644 --- a/test/core/end2end/fixtures/h2_oauth2.cc +++ b/test/core/end2end/fixtures/h2_oauth2.cc @@ -16,11 +16,12 @@ * */ -#include -#include #include #include +#include +#include + #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/iomgr/iomgr.h" diff --git a/test/core/end2end/fixtures/h2_proxy.cc b/test/core/end2end/fixtures/h2_proxy.cc index fcc508ef629..134a65cd3fe 100644 --- a/test/core/end2end/fixtures/h2_proxy.cc +++ b/test/core/end2end/fixtures/h2_proxy.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -30,6 +28,7 @@ #include "src/core/lib/channel/connected_channel.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/server.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/fixtures/proxy.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.cc b/test/core/end2end/fixtures/h2_sockpair+trace.cc index 4f1814f1bf5..c3e33553216 100644 --- a/test/core/end2end/fixtures/h2_sockpair+trace.cc +++ b/test/core/end2end/fixtures/h2_sockpair+trace.cc @@ -16,10 +16,6 @@ * */ -#include "src/core/lib/iomgr/port.h" - -#include "test/core/end2end/end2end_tests.h" - #include #ifdef GRPC_POSIX_SOCKET #include @@ -38,9 +34,11 @@ #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/endpoint_pair.h" #include "src/core/lib/iomgr/iomgr.h" +#include "src/core/lib/iomgr/port.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/completion_queue.h" #include "src/core/lib/surface/server.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/fixtures/h2_sockpair.cc b/test/core/end2end/fixtures/h2_sockpair.cc index b7a483be4d1..a8b61152e6e 100644 --- a/test/core/end2end/fixtures/h2_sockpair.cc +++ b/test/core/end2end/fixtures/h2_sockpair.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -35,6 +33,7 @@ #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/completion_queue.h" #include "src/core/lib/surface/server.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/fixtures/h2_sockpair_1byte.cc b/test/core/end2end/fixtures/h2_sockpair_1byte.cc index bfa097ce99d..35586267123 100644 --- a/test/core/end2end/fixtures/h2_sockpair_1byte.cc +++ b/test/core/end2end/fixtures/h2_sockpair_1byte.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -35,6 +33,7 @@ #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/completion_queue.h" #include "src/core/lib/surface/server.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/fixtures/h2_ssl.cc b/test/core/end2end/fixtures/h2_ssl.cc index 2d1ef42c995..e66565f1e49 100644 --- a/test/core/end2end/fixtures/h2_ssl.cc +++ b/test/core/end2end/fixtures/h2_ssl.cc @@ -16,11 +16,12 @@ * */ -#include -#include #include #include +#include +#include + #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/tmpfile.h" diff --git a/test/core/end2end/fixtures/h2_ssl_cred_reload.cc b/test/core/end2end/fixtures/h2_ssl_cred_reload.cc index bf78cda091a..433e44337bb 100644 --- a/test/core/end2end/fixtures/h2_ssl_cred_reload.cc +++ b/test/core/end2end/fixtures/h2_ssl_cred_reload.cc @@ -16,11 +16,12 @@ * */ -#include -#include #include #include +#include +#include + #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/tmpfile.h" diff --git a/test/core/end2end/fixtures/h2_ssl_proxy.cc b/test/core/end2end/fixtures/h2_ssl_proxy.cc index ecccda35838..9980c0957ee 100644 --- a/test/core/end2end/fixtures/h2_ssl_proxy.cc +++ b/test/core/end2end/fixtures/h2_ssl_proxy.cc @@ -16,11 +16,12 @@ * */ -#include -#include #include #include +#include +#include + #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/tmpfile.h" diff --git a/test/core/end2end/fixtures/h2_tls.cc b/test/core/end2end/fixtures/h2_tls.cc index 9157e1eee8f..2254e1cfd6d 100644 --- a/test/core/end2end/fixtures/h2_tls.cc +++ b/test/core/end2end/fixtures/h2_tls.cc @@ -16,15 +16,16 @@ * */ -#include -#include -#include -#include #include #include #include "absl/container/inlined_vector.h" +#include +#include +#include +#include + #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/env.h" #include "src/core/lib/gpr/string.h" diff --git a/test/core/end2end/fixtures/h2_uds.cc b/test/core/end2end/fixtures/h2_uds.cc index 1087b74af32..f42667e849b 100644 --- a/test/core/end2end/fixtures/h2_uds.cc +++ b/test/core/end2end/fixtures/h2_uds.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include #include @@ -38,6 +36,7 @@ #include "src/core/lib/gpr/string.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/server.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/fixtures/http_proxy_fixture.cc b/test/core/end2end/fixtures/http_proxy_fixture.cc index fae8ee8cf07..87f98e565b8 100644 --- a/test/core/end2end/fixtures/http_proxy_fixture.cc +++ b/test/core/end2end/fixtures/http_proxy_fixture.cc @@ -18,8 +18,6 @@ #include "test/core/end2end/fixtures/http_proxy_fixture.h" -#include "src/core/lib/iomgr/sockaddr.h" - #include #include "absl/strings/str_cat.h" @@ -45,6 +43,7 @@ #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/resolve_address.h" +#include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/iomgr/tcp_server.h" #include "src/core/lib/iomgr/timer.h" diff --git a/test/core/end2end/fixtures/inproc.cc b/test/core/end2end/fixtures/inproc.cc index 2bd25c0b646..71f8d352ed0 100644 --- a/test/core/end2end/fixtures/inproc.cc +++ b/test/core/end2end/fixtures/inproc.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -30,6 +28,7 @@ #include "src/core/lib/channel/connected_channel.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/server.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/fixtures/local_util.h b/test/core/end2end/fixtures/local_util.h index 9e7a3345d0c..9775a996e03 100644 --- a/test/core/end2end/fixtures/local_util.h +++ b/test/core/end2end/fixtures/local_util.h @@ -16,11 +16,10 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include "src/core/lib/surface/channel.h" +#include "test/core/end2end/end2end_tests.h" struct grpc_end2end_local_fullstack_fixture_data { std::string localaddr; diff --git a/test/core/end2end/goaway_server_test.cc b/test/core/end2end/goaway_server_test.cc index 2bbd9abb869..e0aaef622f1 100644 --- a/test/core/end2end/goaway_server_test.cc +++ b/test/core/end2end/goaway_server_test.cc @@ -16,9 +16,6 @@ * */ -#include "src/core/lib/iomgr/sockaddr.h" -#include "src/core/lib/iomgr/socket_utils.h" - #include #include @@ -33,6 +30,7 @@ #include "src/core/ext/filters/client_channel/server_address.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/sockaddr.h" +#include "src/core/lib/iomgr/socket_utils.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/h2_ssl_cert_test.cc b/test/core/end2end/h2_ssl_cert_test.cc index 46d38a63e54..770267212f4 100644 --- a/test/core/end2end/h2_ssl_cert_test.cc +++ b/test/core/end2end/h2_ssl_cert_test.cc @@ -16,11 +16,11 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include +#include + #include #include #include @@ -33,11 +33,10 @@ #include "src/core/lib/security/security_connector/ssl_utils_config.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/data/ssl_test_data.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" -#include - extern "C" { #include } diff --git a/test/core/end2end/h2_ssl_session_reuse_test.cc b/test/core/end2end/h2_ssl_session_reuse_test.cc index 9230a56fabd..6b88a1d8a58 100644 --- a/test/core/end2end/h2_ssl_session_reuse_test.cc +++ b/test/core/end2end/h2_ssl_session_reuse_test.cc @@ -16,12 +16,14 @@ * */ -#include -#include -#include #include #include +#include + +#include +#include + #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/tmpfile.h" diff --git a/test/core/end2end/inproc_callback_test.cc b/test/core/end2end/inproc_callback_test.cc index 327affa59db..18493e9f0f9 100644 --- a/test/core/end2end/inproc_callback_test.cc +++ b/test/core/end2end/inproc_callback_test.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -28,6 +26,7 @@ #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/completion_queue.h" #include "src/core/lib/surface/server.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/multiple_server_queues_test.cc b/test/core/end2end/multiple_server_queues_test.cc index bb4e3dac106..987383765ce 100644 --- a/test/core/end2end/multiple_server_queues_test.cc +++ b/test/core/end2end/multiple_server_queues_test.cc @@ -17,6 +17,7 @@ */ #include + #include "test/core/util/test_config.h" int main(int argc, char** argv) { diff --git a/test/core/end2end/tests/authority_not_supported.cc b/test/core/end2end/tests/authority_not_supported.cc index 95e38f563a0..806215e18d4 100644 --- a/test/core/end2end/tests/authority_not_supported.cc +++ b/test/core/end2end/tests/authority_not_supported.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -25,7 +23,9 @@ #include #include #include + #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/bad_hostname.cc b/test/core/end2end/tests/bad_hostname.cc index 33281ab88b5..a2caf88e2dc 100644 --- a/test/core/end2end/tests/bad_hostname.cc +++ b/test/core/end2end/tests/bad_hostname.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -26,8 +24,10 @@ #include #include #include + #include "src/core/lib/gpr/string.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/bad_ping.cc b/test/core/end2end/tests/bad_ping.cc index 6d927ee490d..d957f583ebe 100644 --- a/test/core/end2end/tests/bad_ping.cc +++ b/test/core/end2end/tests/bad_ping.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -29,6 +27,7 @@ #include "src/core/lib/gpr/useful.h" #include "src/core/lib/surface/channel.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #define MAX_PING_STRIKES 2 diff --git a/test/core/end2end/tests/binary_metadata.cc b/test/core/end2end/tests/binary_metadata.cc index 96c386122d9..ebc64a94d23 100644 --- a/test/core/end2end/tests/binary_metadata.cc +++ b/test/core/end2end/tests/binary_metadata.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -25,7 +23,9 @@ #include #include #include + #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/call_creds.cc b/test/core/end2end/tests/call_creds.cc index a11c95e1b5d..8d64b550ef0 100644 --- a/test/core/end2end/tests/call_creds.cc +++ b/test/core/end2end/tests/call_creds.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -30,6 +28,7 @@ #include "src/core/lib/gpr/string.h" #include "src/core/lib/security/credentials/credentials.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static const char iam_token[] = "token"; static const char iam_selector[] = "selector"; diff --git a/test/core/end2end/tests/call_host_override.cc b/test/core/end2end/tests/call_host_override.cc index 2538999d493..04d718d4447 100644 --- a/test/core/end2end/tests/call_host_override.cc +++ b/test/core/end2end/tests/call_host_override.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -30,6 +28,7 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/string.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/cancel_after_accept.cc b/test/core/end2end/tests/cancel_after_accept.cc index d80f524e393..459cdc8037d 100644 --- a/test/core/end2end/tests/cancel_after_accept.cc +++ b/test/core/end2end/tests/cancel_after_accept.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -30,8 +28,8 @@ #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/transport/metadata.h" - #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/cancel_after_client_done.cc b/test/core/end2end/tests/cancel_after_client_done.cc index 5ff9dd08abd..1039d9b3247 100644 --- a/test/core/end2end/tests/cancel_after_client_done.cc +++ b/test/core/end2end/tests/cancel_after_client_done.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -28,6 +26,7 @@ #include "src/core/lib/gpr/useful.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/cancel_after_invoke.cc b/test/core/end2end/tests/cancel_after_invoke.cc index 2d58b99ca84..0195dd1c182 100644 --- a/test/core/end2end/tests/cancel_after_invoke.cc +++ b/test/core/end2end/tests/cancel_after_invoke.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include #include @@ -29,6 +27,7 @@ #include "src/core/lib/gpr/useful.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/cancel_after_round_trip.cc b/test/core/end2end/tests/cancel_after_round_trip.cc index ea03daed8e5..bb579d0d95d 100644 --- a/test/core/end2end/tests/cancel_after_round_trip.cc +++ b/test/core/end2end/tests/cancel_after_round_trip.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -30,8 +28,8 @@ #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/transport/metadata.h" - #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/cancel_before_invoke.cc b/test/core/end2end/tests/cancel_before_invoke.cc index f118ffff80a..748219327bc 100644 --- a/test/core/end2end/tests/cancel_before_invoke.cc +++ b/test/core/end2end/tests/cancel_before_invoke.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include #include @@ -26,7 +24,9 @@ #include #include #include + #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/cancel_in_a_vacuum.cc b/test/core/end2end/tests/cancel_in_a_vacuum.cc index 4b530f18686..e004cee0d9c 100644 --- a/test/core/end2end/tests/cancel_in_a_vacuum.cc +++ b/test/core/end2end/tests/cancel_in_a_vacuum.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -28,6 +26,7 @@ #include "src/core/lib/gpr/useful.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/cancel_with_status.cc b/test/core/end2end/tests/cancel_with_status.cc index 80eb5e00d29..98c83c5fc11 100644 --- a/test/core/end2end/tests/cancel_with_status.cc +++ b/test/core/end2end/tests/cancel_with_status.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include #include @@ -28,8 +26,10 @@ #include #include #include + #include "src/core/lib/gpr/string.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/channelz.cc b/test/core/end2end/tests/channelz.cc index 20618736e72..d508fc1210d 100644 --- a/test/core/end2end/tests/channelz.cc +++ b/test/core/end2end/tests/channelz.cc @@ -16,22 +16,21 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include -#include "src/core/lib/surface/channel.h" -#include "src/core/lib/surface/server.h" - #include #include #include #include #include + #include "src/core/lib/channel/channelz_registry.h" #include "src/core/lib/gpr/string.h" +#include "src/core/lib/surface/channel.h" +#include "src/core/lib/surface/server.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/client_streaming.cc b/test/core/end2end/tests/client_streaming.cc index f9cfaff7115..6b62a0101c5 100644 --- a/test/core/end2end/tests/client_streaming.cc +++ b/test/core/end2end/tests/client_streaming.cc @@ -16,8 +16,6 @@ // // -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -25,7 +23,9 @@ #include #include #include + #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/compressed_payload.cc b/test/core/end2end/tests/compressed_payload.cc index 05ffb500a46..4185d84cfd9 100644 --- a/test/core/end2end/tests/compressed_payload.cc +++ b/test/core/end2end/tests/compressed_payload.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -38,6 +36,7 @@ #include "src/core/lib/surface/call_test_only.h" #include "src/core/lib/transport/static_metadata.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/connectivity.cc b/test/core/end2end/tests/connectivity.cc index 4175eae000e..326b7bf8569 100644 --- a/test/core/end2end/tests/connectivity.cc +++ b/test/core/end2end/tests/connectivity.cc @@ -16,14 +16,13 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include #include #include "src/core/lib/gprpp/thd.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/default_host.cc b/test/core/end2end/tests/default_host.cc index 3527073afc4..efd4fea9e04 100644 --- a/test/core/end2end/tests/default_host.cc +++ b/test/core/end2end/tests/default_host.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -26,8 +24,10 @@ #include #include #include + #include "src/core/lib/gpr/string.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/disappearing_server.cc b/test/core/end2end/tests/disappearing_server.cc index e8fa4e4fec4..6f4493cca57 100644 --- a/test/core/end2end/tests/disappearing_server.cc +++ b/test/core/end2end/tests/disappearing_server.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -25,7 +23,9 @@ #include #include #include + #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/empty_batch.cc b/test/core/end2end/tests/empty_batch.cc index 7325616f3fe..3104c5d0ad5 100644 --- a/test/core/end2end/tests/empty_batch.cc +++ b/test/core/end2end/tests/empty_batch.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -26,8 +24,10 @@ #include #include #include + #include "src/core/lib/gpr/string.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/filter_causes_close.cc b/test/core/end2end/tests/filter_causes_close.cc index f7471c1038e..c951174e99e 100644 --- a/test/core/end2end/tests/filter_causes_close.cc +++ b/test/core/end2end/tests/filter_causes_close.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include #include @@ -26,9 +24,11 @@ #include #include #include + #include "src/core/lib/channel/channel_stack_builder.h" #include "src/core/lib/surface/channel_init.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static bool g_enable_filter = false; diff --git a/test/core/end2end/tests/filter_context.cc b/test/core/end2end/tests/filter_context.cc index 0b97dc47d0a..d9528bc00d8 100644 --- a/test/core/end2end/tests/filter_context.cc +++ b/test/core/end2end/tests/filter_context.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include #include @@ -31,6 +29,7 @@ #include "src/core/lib/channel/channel_stack_builder.h" #include "src/core/lib/surface/channel_init.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" enum { TIMEOUT = 200000 }; diff --git a/test/core/end2end/tests/filter_init_fails.cc b/test/core/end2end/tests/filter_init_fails.cc index 43da6900e8c..30ee08d8d7c 100644 --- a/test/core/end2end/tests/filter_init_fails.cc +++ b/test/core/end2end/tests/filter_init_fails.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include #include @@ -27,9 +25,11 @@ #include #include #include + #include "src/core/lib/channel/channel_stack_builder.h" #include "src/core/lib/surface/channel_init.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" enum { TIMEOUT = 200000 }; diff --git a/test/core/end2end/tests/filter_latency.cc b/test/core/end2end/tests/filter_latency.cc index 6b94d941ff0..7dfaca5bcd0 100644 --- a/test/core/end2end/tests/filter_latency.cc +++ b/test/core/end2end/tests/filter_latency.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include #include @@ -31,6 +29,7 @@ #include "src/core/lib/channel/channel_stack_builder.h" #include "src/core/lib/surface/channel_init.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" enum { TIMEOUT = 200000 }; diff --git a/test/core/end2end/tests/filter_status_code.cc b/test/core/end2end/tests/filter_status_code.cc index 6359980b5ce..db9d5cbdd1d 100644 --- a/test/core/end2end/tests/filter_status_code.cc +++ b/test/core/end2end/tests/filter_status_code.cc @@ -24,8 +24,6 @@ * https://github.com/grpc/grpc/blob/master/doc/http-grpc-status-mapping.md */ -#include "test/core/end2end/end2end_tests.h" - #include #include #include @@ -40,6 +38,7 @@ #include "src/core/lib/surface/call.h" #include "src/core/lib/surface/channel_init.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static bool g_enable_filter = false; static gpr_mu g_mu; diff --git a/test/core/end2end/tests/graceful_server_shutdown.cc b/test/core/end2end/tests/graceful_server_shutdown.cc index 93561bf5c3d..8dc56ff0868 100644 --- a/test/core/end2end/tests/graceful_server_shutdown.cc +++ b/test/core/end2end/tests/graceful_server_shutdown.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -25,7 +23,9 @@ #include #include #include + #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/high_initial_seqno.cc b/test/core/end2end/tests/high_initial_seqno.cc index 55005947499..9772601e651 100644 --- a/test/core/end2end/tests/high_initial_seqno.cc +++ b/test/core/end2end/tests/high_initial_seqno.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -33,6 +31,7 @@ #include "src/core/lib/gpr/string.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/hpack_size.cc b/test/core/end2end/tests/hpack_size.cc index a9be0144fac..ca1410229e9 100644 --- a/test/core/end2end/tests/hpack_size.cc +++ b/test/core/end2end/tests/hpack_size.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -34,6 +32,7 @@ #include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/idempotent_request.cc b/test/core/end2end/tests/idempotent_request.cc index 294b94c70d2..a271c96c97a 100644 --- a/test/core/end2end/tests/idempotent_request.cc +++ b/test/core/end2end/tests/idempotent_request.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -29,6 +27,7 @@ #include "src/core/lib/gpr/string.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/invoke_large_request.cc b/test/core/end2end/tests/invoke_large_request.cc index 987125f622d..2fff0cc00a6 100644 --- a/test/core/end2end/tests/invoke_large_request.cc +++ b/test/core/end2end/tests/invoke_large_request.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -32,6 +30,7 @@ #include "src/core/lib/gpr/useful.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/keepalive_timeout.cc b/test/core/end2end/tests/keepalive_timeout.cc index a1aacd024bd..6db92f2c9db 100644 --- a/test/core/end2end/tests/keepalive_timeout.cc +++ b/test/core/end2end/tests/keepalive_timeout.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -32,6 +30,7 @@ #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #ifdef GRPC_POSIX_SOCKET #include "src/core/lib/iomgr/ev_posix.h" diff --git a/test/core/end2end/tests/large_metadata.cc b/test/core/end2end/tests/large_metadata.cc index 07983d8eb96..19ac61a2bd2 100644 --- a/test/core/end2end/tests/large_metadata.cc +++ b/test/core/end2end/tests/large_metadata.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -25,7 +23,9 @@ #include #include #include + #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/load_reporting_hook.cc b/test/core/end2end/tests/load_reporting_hook.cc index 4324e9dfc17..f96cda344ae 100644 --- a/test/core/end2end/tests/load_reporting_hook.cc +++ b/test/core/end2end/tests/load_reporting_hook.cc @@ -29,7 +29,6 @@ #include "src/core/ext/filters/load_reporting/server_load_reporting_plugin.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/transport/static_metadata.h" - #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/max_concurrent_streams.cc b/test/core/end2end/tests/max_concurrent_streams.cc index bd7d7cd4e8f..3d3e4063705 100644 --- a/test/core/end2end/tests/max_concurrent_streams.cc +++ b/test/core/end2end/tests/max_concurrent_streams.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -25,7 +23,9 @@ #include #include #include + #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/max_connection_age.cc b/test/core/end2end/tests/max_connection_age.cc index 63b804294d8..3219b60e8fa 100644 --- a/test/core/end2end/tests/max_connection_age.cc +++ b/test/core/end2end/tests/max_connection_age.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -27,6 +25,7 @@ #include "src/core/lib/gpr/useful.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #define MAX_CONNECTION_AGE_MS 500 #define MAX_CONNECTION_AGE_GRACE_MS 1000 diff --git a/test/core/end2end/tests/max_connection_idle.cc b/test/core/end2end/tests/max_connection_idle.cc index 6df32f4b376..ecc51b54665 100644 --- a/test/core/end2end/tests/max_connection_idle.cc +++ b/test/core/end2end/tests/max_connection_idle.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -28,6 +26,7 @@ #include "src/core/lib/gpr/useful.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #define MAX_CONNECTION_IDLE_MS 500 #define MAX_CONNECTION_AGE_MS 9999 diff --git a/test/core/end2end/tests/max_message_length.cc b/test/core/end2end/tests/max_message_length.cc index ca9f8605282..c36d370fc95 100644 --- a/test/core/end2end/tests/max_message_length.cc +++ b/test/core/end2end/tests/max_message_length.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -31,8 +29,8 @@ #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/lib/transport/metadata.h" - #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/negative_deadline.cc b/test/core/end2end/tests/negative_deadline.cc index e975f371db8..a2d1528eb88 100644 --- a/test/core/end2end/tests/negative_deadline.cc +++ b/test/core/end2end/tests/negative_deadline.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include #include @@ -27,8 +25,10 @@ #include #include #include + #include "src/core/lib/gpr/string.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/no_error_on_hotpath.cc b/test/core/end2end/tests/no_error_on_hotpath.cc index 411ed93e5d1..59ea65bcd11 100644 --- a/test/core/end2end/tests/no_error_on_hotpath.cc +++ b/test/core/end2end/tests/no_error_on_hotpath.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -27,9 +25,11 @@ #include #include #include + #include "src/core/lib/gpr/string.h" #include "src/core/lib/iomgr/error.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/no_logging.cc b/test/core/end2end/tests/no_logging.cc index 5f325271f92..7ca364c2b73 100644 --- a/test/core/end2end/tests/no_logging.cc +++ b/test/core/end2end/tests/no_logging.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -30,9 +28,11 @@ #include #include #include + #include "src/core/lib/gpr/string.h" #include "src/core/lib/iomgr/error.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" enum { TIMEOUT = 200000 }; diff --git a/test/core/end2end/tests/no_op.cc b/test/core/end2end/tests/no_op.cc index 2c515f10c22..1f3343cff4a 100644 --- a/test/core/end2end/tests/no_op.cc +++ b/test/core/end2end/tests/no_op.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -25,7 +23,9 @@ #include #include #include + #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/payload.cc b/test/core/end2end/tests/payload.cc index fab5daf837d..fd4565c14d0 100644 --- a/test/core/end2end/tests/payload.cc +++ b/test/core/end2end/tests/payload.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -25,7 +23,9 @@ #include #include #include + #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/ping.cc b/test/core/end2end/tests/ping.cc index 28bef18c026..db4d54525cd 100644 --- a/test/core/end2end/tests/ping.cc +++ b/test/core/end2end/tests/ping.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include #include @@ -26,6 +24,7 @@ #include "src/core/lib/gpr/useful.h" #include "src/core/lib/surface/channel.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #define PING_NUM 5 diff --git a/test/core/end2end/tests/ping_pong_streaming.cc b/test/core/end2end/tests/ping_pong_streaming.cc index 4e030e015c1..66c60c3ed94 100644 --- a/test/core/end2end/tests/ping_pong_streaming.cc +++ b/test/core/end2end/tests/ping_pong_streaming.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -25,7 +23,9 @@ #include #include #include + #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/proxy_auth.cc b/test/core/end2end/tests/proxy_auth.cc index 3684b27a099..738387aaee4 100644 --- a/test/core/end2end/tests/proxy_auth.cc +++ b/test/core/end2end/tests/proxy_auth.cc @@ -20,9 +20,6 @@ * This test is for checking whether proxy authentication is working with HTTP * Connect. */ -#include "test/core/end2end/end2end_tests.h" -#include "test/core/end2end/fixtures/http_proxy_fixture.h" - #include #include @@ -31,8 +28,11 @@ #include #include #include + #include "src/core/lib/gpr/string.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" +#include "test/core/end2end/fixtures/http_proxy_fixture.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/registered_call.cc b/test/core/end2end/tests/registered_call.cc index 719758ea1fc..b7c0258f83f 100644 --- a/test/core/end2end/tests/registered_call.cc +++ b/test/core/end2end/tests/registered_call.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -29,6 +27,7 @@ #include "src/core/lib/gpr/string.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/request_with_flags.cc b/test/core/end2end/tests/request_with_flags.cc index 348e0b66a6a..3f42b609b8c 100644 --- a/test/core/end2end/tests/request_with_flags.cc +++ b/test/core/end2end/tests/request_with_flags.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -29,6 +27,7 @@ #include "src/core/lib/gpr/useful.h" #include "src/core/lib/transport/byte_stream.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/request_with_payload.cc b/test/core/end2end/tests/request_with_payload.cc index 404c3bf6d7d..1a655c1ba58 100644 --- a/test/core/end2end/tests/request_with_payload.cc +++ b/test/core/end2end/tests/request_with_payload.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -25,7 +23,9 @@ #include #include #include + #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/resource_quota_server.cc b/test/core/end2end/tests/resource_quota_server.cc index 96c0686f3a7..0e5e50d6337 100644 --- a/test/core/end2end/tests/resource_quota_server.cc +++ b/test/core/end2end/tests/resource_quota_server.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -27,6 +25,7 @@ #include #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry.cc b/test/core/end2end/tests/retry.cc index 5e75494b604..68b22ac494c 100644 --- a/test/core/end2end/tests/retry.cc +++ b/test/core/end2end/tests/retry.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -33,8 +31,8 @@ #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/transport/static_metadata.h" - #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_cancel_during_delay.cc b/test/core/end2end/tests/retry_cancel_during_delay.cc index 05d1f941644..b0cafab0f9c 100644 --- a/test/core/end2end/tests/retry_cancel_during_delay.cc +++ b/test/core/end2end/tests/retry_cancel_during_delay.cc @@ -14,8 +14,6 @@ // limitations under the License. // -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -34,8 +32,8 @@ #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/transport/static_metadata.h" - #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc b/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc index a86e23b3798..320816faa1c 100644 --- a/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc +++ b/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -38,8 +36,8 @@ #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/channel_init.h" #include "src/core/lib/transport/static_metadata.h" - #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_cancellation.cc b/test/core/end2end/tests/retry_cancellation.cc index 654ad59609c..64108c8b442 100644 --- a/test/core/end2end/tests/retry_cancellation.cc +++ b/test/core/end2end/tests/retry_cancellation.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -36,8 +34,8 @@ #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/transport/static_metadata.h" - #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_disabled.cc b/test/core/end2end/tests/retry_disabled.cc index 83deb41113f..dc1d99f2769 100644 --- a/test/core/end2end/tests/retry_disabled.cc +++ b/test/core/end2end/tests/retry_disabled.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -33,8 +31,8 @@ #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/transport/static_metadata.h" - #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_exceeds_buffer_size_in_delay.cc b/test/core/end2end/tests/retry_exceeds_buffer_size_in_delay.cc index d515bc46b8b..74671136928 100644 --- a/test/core/end2end/tests/retry_exceeds_buffer_size_in_delay.cc +++ b/test/core/end2end/tests/retry_exceeds_buffer_size_in_delay.cc @@ -14,8 +14,6 @@ // limitations under the License. // -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -31,8 +29,8 @@ #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/transport/static_metadata.h" - #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc b/test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc index 286e81ec29b..f20bc6932c6 100644 --- a/test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc +++ b/test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -33,8 +31,8 @@ #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/transport/static_metadata.h" - #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc b/test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc index 6c2abcca565..f4630fdf7a2 100644 --- a/test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc +++ b/test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -33,8 +31,8 @@ #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/transport/static_metadata.h" - #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_lb_drop.cc b/test/core/end2end/tests/retry_lb_drop.cc index 2a729104569..4e0dc323f45 100644 --- a/test/core/end2end/tests/retry_lb_drop.cc +++ b/test/core/end2end/tests/retry_lb_drop.cc @@ -14,8 +14,6 @@ // limitations under the License. // -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -32,8 +30,8 @@ #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/transport/static_metadata.h" - #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" #include "test/core/util/test_lb_policies.h" diff --git a/test/core/end2end/tests/retry_lb_fail.cc b/test/core/end2end/tests/retry_lb_fail.cc index fe25abf2d65..e97567d5243 100644 --- a/test/core/end2end/tests/retry_lb_fail.cc +++ b/test/core/end2end/tests/retry_lb_fail.cc @@ -14,8 +14,6 @@ // limitations under the License. // -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -33,8 +31,8 @@ #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/transport/static_metadata.h" - #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry_non_retriable_status.cc b/test/core/end2end/tests/retry_non_retriable_status.cc index aeab8772a99..7771073629b 100644 --- a/test/core/end2end/tests/retry_non_retriable_status.cc +++ b/test/core/end2end/tests/retry_non_retriable_status.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -33,8 +31,8 @@ #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/transport/static_metadata.h" - #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_non_retriable_status_before_recv_trailing_metadata_started.cc b/test/core/end2end/tests/retry_non_retriable_status_before_recv_trailing_metadata_started.cc index 64365534392..657c206a7c9 100644 --- a/test/core/end2end/tests/retry_non_retriable_status_before_recv_trailing_metadata_started.cc +++ b/test/core/end2end/tests/retry_non_retriable_status_before_recv_trailing_metadata_started.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -33,8 +31,8 @@ #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/transport/static_metadata.h" - #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_per_attempt_recv_timeout.cc b/test/core/end2end/tests/retry_per_attempt_recv_timeout.cc index 74a09ba81ae..5dc1a7dbd87 100644 --- a/test/core/end2end/tests/retry_per_attempt_recv_timeout.cc +++ b/test/core/end2end/tests/retry_per_attempt_recv_timeout.cc @@ -14,8 +14,6 @@ // limitations under the License. // -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -31,8 +29,8 @@ #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/transport/static_metadata.h" - #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_per_attempt_recv_timeout_on_last_attempt.cc b/test/core/end2end/tests/retry_per_attempt_recv_timeout_on_last_attempt.cc index 597b16759ab..572727b82e1 100644 --- a/test/core/end2end/tests/retry_per_attempt_recv_timeout_on_last_attempt.cc +++ b/test/core/end2end/tests/retry_per_attempt_recv_timeout_on_last_attempt.cc @@ -14,8 +14,6 @@ // limitations under the License. // -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -31,8 +29,8 @@ #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/transport/static_metadata.h" - #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_recv_initial_metadata.cc b/test/core/end2end/tests/retry_recv_initial_metadata.cc index b58b33dbc02..24f9993111e 100644 --- a/test/core/end2end/tests/retry_recv_initial_metadata.cc +++ b/test/core/end2end/tests/retry_recv_initial_metadata.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -33,8 +31,8 @@ #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/transport/static_metadata.h" - #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_recv_message.cc b/test/core/end2end/tests/retry_recv_message.cc index a6fb07cd6d7..347c1485dad 100644 --- a/test/core/end2end/tests/retry_recv_message.cc +++ b/test/core/end2end/tests/retry_recv_message.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -33,8 +31,8 @@ #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/transport/static_metadata.h" - #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc b/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc index c91c7c83d68..a8f20e0eb16 100644 --- a/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc +++ b/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc @@ -14,8 +14,6 @@ // limitations under the License. // -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -34,8 +32,8 @@ #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/channel_init.h" #include "src/core/lib/transport/static_metadata.h" - #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_send_initial_metadata_refs.cc b/test/core/end2end/tests/retry_send_initial_metadata_refs.cc index 08a3691a07a..b9eeafe15eb 100644 --- a/test/core/end2end/tests/retry_send_initial_metadata_refs.cc +++ b/test/core/end2end/tests/retry_send_initial_metadata_refs.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -33,8 +31,8 @@ #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/transport/static_metadata.h" - #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_send_op_fails.cc b/test/core/end2end/tests/retry_send_op_fails.cc index 61e6743e213..6abcc128b05 100644 --- a/test/core/end2end/tests/retry_send_op_fails.cc +++ b/test/core/end2end/tests/retry_send_op_fails.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -36,8 +34,8 @@ #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/channel_init.h" #include "src/core/lib/transport/static_metadata.h" - #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_server_pushback_delay.cc b/test/core/end2end/tests/retry_server_pushback_delay.cc index c7d25dacc04..b57167468ef 100644 --- a/test/core/end2end/tests/retry_server_pushback_delay.cc +++ b/test/core/end2end/tests/retry_server_pushback_delay.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -33,8 +31,8 @@ #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/transport/static_metadata.h" - #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_server_pushback_disabled.cc b/test/core/end2end/tests/retry_server_pushback_disabled.cc index 580f75aa418..cc805108f7e 100644 --- a/test/core/end2end/tests/retry_server_pushback_disabled.cc +++ b/test/core/end2end/tests/retry_server_pushback_disabled.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -33,8 +31,8 @@ #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/transport/static_metadata.h" - #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_streaming.cc b/test/core/end2end/tests/retry_streaming.cc index 25219102b80..fdd8e592329 100644 --- a/test/core/end2end/tests/retry_streaming.cc +++ b/test/core/end2end/tests/retry_streaming.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -28,16 +26,15 @@ #include #include -#include "src/core/lib/surface/channel.h" -#include "src/core/lib/surface/server.h" - #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/surface/channel.h" +#include "src/core/lib/surface/server.h" #include "src/core/lib/transport/static_metadata.h" - #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_streaming_after_commit.cc b/test/core/end2end/tests/retry_streaming_after_commit.cc index 4fc3aaa26d0..5829edb25da 100644 --- a/test/core/end2end/tests/retry_streaming_after_commit.cc +++ b/test/core/end2end/tests/retry_streaming_after_commit.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -33,8 +31,8 @@ #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/transport/static_metadata.h" - #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_streaming_succeeds_before_replay_finished.cc b/test/core/end2end/tests/retry_streaming_succeeds_before_replay_finished.cc index f3e90d3a5bb..4c2faca227e 100644 --- a/test/core/end2end/tests/retry_streaming_succeeds_before_replay_finished.cc +++ b/test/core/end2end/tests/retry_streaming_succeeds_before_replay_finished.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -33,8 +31,8 @@ #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/transport/static_metadata.h" - #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_throttled.cc b/test/core/end2end/tests/retry_throttled.cc index 1ff6ddaf6ce..a9051ba6bb8 100644 --- a/test/core/end2end/tests/retry_throttled.cc +++ b/test/core/end2end/tests/retry_throttled.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -33,8 +31,8 @@ #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/transport/static_metadata.h" - #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_too_many_attempts.cc b/test/core/end2end/tests/retry_too_many_attempts.cc index 15ec44f6980..1048334ecb1 100644 --- a/test/core/end2end/tests/retry_too_many_attempts.cc +++ b/test/core/end2end/tests/retry_too_many_attempts.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -33,8 +31,8 @@ #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/transport/static_metadata.h" - #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/sdk_authz.cc b/test/core/end2end/tests/sdk_authz.cc index 22a8682c80b..6ab5e0b3192 100644 --- a/test/core/end2end/tests/sdk_authz.cc +++ b/test/core/end2end/tests/sdk_authz.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -28,6 +26,7 @@ #include "src/core/lib/security/authorization/grpc_authorization_policy_provider.h" #include "src/core/lib/security/credentials/credentials.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/server_finishes_request.cc b/test/core/end2end/tests/server_finishes_request.cc index 859fa61ca80..3c16b579521 100644 --- a/test/core/end2end/tests/server_finishes_request.cc +++ b/test/core/end2end/tests/server_finishes_request.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -26,8 +24,10 @@ #include #include #include + #include "src/core/lib/gpr/string.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/server_streaming.cc b/test/core/end2end/tests/server_streaming.cc index f457e650647..f7dcf0feead 100644 --- a/test/core/end2end/tests/server_streaming.cc +++ b/test/core/end2end/tests/server_streaming.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -25,7 +23,9 @@ #include #include #include + #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/shutdown_finishes_calls.cc b/test/core/end2end/tests/shutdown_finishes_calls.cc index 443c3cef604..63f66a720cb 100644 --- a/test/core/end2end/tests/shutdown_finishes_calls.cc +++ b/test/core/end2end/tests/shutdown_finishes_calls.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -25,7 +23,9 @@ #include #include #include + #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/shutdown_finishes_tags.cc b/test/core/end2end/tests/shutdown_finishes_tags.cc index 92f45e5e504..4c4128ef177 100644 --- a/test/core/end2end/tests/shutdown_finishes_tags.cc +++ b/test/core/end2end/tests/shutdown_finishes_tags.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -25,7 +23,9 @@ #include #include #include + #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/simple_cacheable_request.cc b/test/core/end2end/tests/simple_cacheable_request.cc index 8817da10d4d..f14df66a9cc 100644 --- a/test/core/end2end/tests/simple_cacheable_request.cc +++ b/test/core/end2end/tests/simple_cacheable_request.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -25,7 +23,9 @@ #include #include #include + #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" enum { TIMEOUT = 200000 }; diff --git a/test/core/end2end/tests/simple_delayed_request.cc b/test/core/end2end/tests/simple_delayed_request.cc index 947e3976f87..101701223ce 100644 --- a/test/core/end2end/tests/simple_delayed_request.cc +++ b/test/core/end2end/tests/simple_delayed_request.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -25,7 +23,9 @@ #include #include #include + #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/simple_metadata.cc b/test/core/end2end/tests/simple_metadata.cc index e56ed5377be..74c28d4ff7b 100644 --- a/test/core/end2end/tests/simple_metadata.cc +++ b/test/core/end2end/tests/simple_metadata.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -25,7 +23,9 @@ #include #include #include + #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/simple_request.cc b/test/core/end2end/tests/simple_request.cc index c9782a1c967..df5d40e1447 100644 --- a/test/core/end2end/tests/simple_request.cc +++ b/test/core/end2end/tests/simple_request.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -28,9 +26,11 @@ #include #include #include + #include "src/core/lib/debug/stats.h" #include "src/core/lib/gpr/string.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/stream_compression_compressed_payload.cc b/test/core/end2end/tests/stream_compression_compressed_payload.cc index 3bb481af587..965b7e57047 100644 --- a/test/core/end2end/tests/stream_compression_compressed_payload.cc +++ b/test/core/end2end/tests/stream_compression_compressed_payload.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -38,6 +36,7 @@ #include "src/core/lib/surface/call_test_only.h" #include "src/core/lib/transport/static_metadata.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/stream_compression_payload.cc b/test/core/end2end/tests/stream_compression_payload.cc index cf29185f8ff..f552294900b 100644 --- a/test/core/end2end/tests/stream_compression_payload.cc +++ b/test/core/end2end/tests/stream_compression_payload.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -26,10 +24,12 @@ #include #include #include + #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/compression/compression_args.h" #include "src/core/lib/surface/call.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/stream_compression_ping_pong_streaming.cc b/test/core/end2end/tests/stream_compression_ping_pong_streaming.cc index 36c6cd28a66..c7e131af994 100644 --- a/test/core/end2end/tests/stream_compression_ping_pong_streaming.cc +++ b/test/core/end2end/tests/stream_compression_ping_pong_streaming.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -31,6 +29,7 @@ #include "src/core/lib/compression/compression_args.h" #include "src/core/lib/surface/call.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/streaming_error_response.cc b/test/core/end2end/tests/streaming_error_response.cc index df0c7784736..178eb68fb24 100644 --- a/test/core/end2end/tests/streaming_error_response.cc +++ b/test/core/end2end/tests/streaming_error_response.cc @@ -19,8 +19,6 @@ /** \file Verify that status ordering rules are obeyed. \ref doc/status_ordering.md */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -28,7 +26,9 @@ #include #include #include + #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/trailing_metadata.cc b/test/core/end2end/tests/trailing_metadata.cc index a674bb7462d..1d1b883e9fe 100644 --- a/test/core/end2end/tests/trailing_metadata.cc +++ b/test/core/end2end/tests/trailing_metadata.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -25,7 +23,9 @@ #include #include #include + #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/workaround_cronet_compression.cc b/test/core/end2end/tests/workaround_cronet_compression.cc index 69b33ebcf15..a2e7476503c 100644 --- a/test/core/end2end/tests/workaround_cronet_compression.cc +++ b/test/core/end2end/tests/workaround_cronet_compression.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -35,6 +33,7 @@ #include "src/core/lib/surface/call_test_only.h" #include "src/core/lib/transport/static_metadata.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/write_buffering.cc b/test/core/end2end/tests/write_buffering.cc index 2f1b297309b..d3536a91f5f 100644 --- a/test/core/end2end/tests/write_buffering.cc +++ b/test/core/end2end/tests/write_buffering.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -25,7 +23,9 @@ #include #include #include + #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/write_buffering_at_end.cc b/test/core/end2end/tests/write_buffering_at_end.cc index 55c208f346b..c0114d9bf70 100644 --- a/test/core/end2end/tests/write_buffering_at_end.cc +++ b/test/core/end2end/tests/write_buffering_at_end.cc @@ -16,8 +16,6 @@ * */ -#include "test/core/end2end/end2end_tests.h" - #include #include @@ -25,7 +23,9 @@ #include #include #include + #include "test/core/end2end/cq_verifier.h" +#include "test/core/end2end/end2end_tests.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/event_engine/endpoint_config_test.cc b/test/core/event_engine/endpoint_config_test.cc index a682f0b62e4..f6e58147eb2 100644 --- a/test/core/event_engine/endpoint_config_test.cc +++ b/test/core/event_engine/endpoint_config_test.cc @@ -13,16 +13,15 @@ // limitations under the License. #include -#include - #include -#include #include -#include "test/core/util/test_config.h" +#include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/endpoint_config_internal.h" +#include "test/core/util/test_config.h" using ::grpc_event_engine::experimental::ChannelArgsEndpointConfig; diff --git a/test/core/fling/client.cc b/test/core/fling/client.cc index c9db1951a7c..5fa5ecc3b35 100644 --- a/test/core/fling/client.cc +++ b/test/core/fling/client.cc @@ -16,11 +16,10 @@ * */ -#include - #include #include +#include #include #include diff --git a/test/core/fling/server.cc b/test/core/fling/server.cc index af9bd557fbc..441cf0024b9 100644 --- a/test/core/fling/server.cc +++ b/test/core/fling/server.cc @@ -16,14 +16,14 @@ * */ -#include -#include - #include #include #include #include #include + +#include +#include #ifndef _WIN32 /* This is for _exit() below, which is temporary. */ #include diff --git a/test/core/gpr/cpu_test.cc b/test/core/gpr/cpu_test.cc index 316a4c61bef..90c72bad8be 100644 --- a/test/core/gpr/cpu_test.cc +++ b/test/core/gpr/cpu_test.cc @@ -21,12 +21,11 @@ gpr_cpu_current_cpu() */ -#include - #include #include #include +#include #include #include #include diff --git a/test/core/gpr/env_test.cc b/test/core/gpr/env_test.cc index 3883a5df997..89237cdf26a 100644 --- a/test/core/gpr/env_test.cc +++ b/test/core/gpr/env_test.cc @@ -16,13 +16,14 @@ * */ +#include "src/core/lib/gpr/env.h" + #include #include #include #include -#include "src/core/lib/gpr/env.h" #include "src/core/lib/gpr/string.h" #include "test/core/util/test_config.h" diff --git a/test/core/gpr/murmur_hash_test.cc b/test/core/gpr/murmur_hash_test.cc index fdc2cfa76b3..1756496e247 100644 --- a/test/core/gpr/murmur_hash_test.cc +++ b/test/core/gpr/murmur_hash_test.cc @@ -17,11 +17,13 @@ */ #include "src/core/lib/gpr/murmur_hash.h" + +#include + #include #include -#include "test/core/util/test_config.h" -#include +#include "test/core/util/test_config.h" typedef uint32_t (*hash_func)(const void* key, size_t len, uint32_t seed); diff --git a/test/core/gpr/sync_test.cc b/test/core/gpr/sync_test.cc index ae0025f25bc..b38180d0369 100644 --- a/test/core/gpr/sync_test.cc +++ b/test/core/gpr/sync_test.cc @@ -18,13 +18,12 @@ /* Test of gpr synchronization support. */ -#include - #include #include #include #include +#include #include #include "src/core/lib/gprpp/thd.h" diff --git a/test/core/gpr/time_test.cc b/test/core/gpr/time_test.cc index a32cbfb09aa..4631ae8fd13 100644 --- a/test/core/gpr/time_test.cc +++ b/test/core/gpr/time_test.cc @@ -18,15 +18,16 @@ /* Test of gpr time support. */ -#include -#include -#include #include #include #include #include #include +#include +#include +#include + #include "test/core/util/test_config.h" static void to_fp(void* arg, const char* buf, size_t len) { diff --git a/test/core/gpr/tls_test.cc b/test/core/gpr/tls_test.cc index 6a6c1bed3ab..1642580fcb6 100644 --- a/test/core/gpr/tls_test.cc +++ b/test/core/gpr/tls_test.cc @@ -20,9 +20,10 @@ #include "src/core/lib/gpr/tls.h" -#include #include +#include + #include "src/core/lib/gprpp/thd.h" #include "test/core/util/test_config.h" diff --git a/test/core/gpr/useful_test.cc b/test/core/gpr/useful_test.cc index 4f8582ab415..8be61001189 100644 --- a/test/core/gpr/useful_test.cc +++ b/test/core/gpr/useful_test.cc @@ -16,10 +16,12 @@ * */ -#include #include #include "src/core/lib/gpr/useful.h" + +#include + #include "test/core/util/test_config.h" int main(int argc, char** argv) { diff --git a/test/core/gprpp/bitset_test.cc b/test/core/gprpp/bitset_test.cc index bbd0a70ae1f..88f365ccc93 100644 --- a/test/core/gprpp/bitset_test.cc +++ b/test/core/gprpp/bitset_test.cc @@ -13,6 +13,7 @@ // limitations under the License. #include "src/core/lib/gprpp/bitset.h" + #include namespace grpc_core { diff --git a/test/core/gprpp/capture_test.cc b/test/core/gprpp/capture_test.cc index e45c738ff4e..0cb68ef237b 100644 --- a/test/core/gprpp/capture_test.cc +++ b/test/core/gprpp/capture_test.cc @@ -13,6 +13,7 @@ // limitations under the License. #include "src/core/lib/gprpp/capture.h" + #include namespace grpc_core { diff --git a/test/core/gprpp/global_config_env_test.cc b/test/core/gprpp/global_config_env_test.cc index d67dd42f70c..519c242e445 100644 --- a/test/core/gprpp/global_config_env_test.cc +++ b/test/core/gprpp/global_config_env_test.cc @@ -16,6 +16,8 @@ * */ +#include "src/core/lib/gprpp/global_config_env.h" + #include #include @@ -25,7 +27,6 @@ #include #include "src/core/lib/gpr/env.h" -#include "src/core/lib/gprpp/global_config_env.h" #include "src/core/lib/gprpp/memory.h" namespace { diff --git a/test/core/gprpp/global_config_test.cc b/test/core/gprpp/global_config_test.cc index 7da78b690b1..31ab94bfb78 100644 --- a/test/core/gprpp/global_config_test.cc +++ b/test/core/gprpp/global_config_test.cc @@ -16,6 +16,8 @@ * */ +#include "src/core/lib/gprpp/global_config.h" + #include #include @@ -25,7 +27,6 @@ #include #include "src/core/lib/gpr/env.h" -#include "src/core/lib/gprpp/global_config.h" #include "src/core/lib/gprpp/memory.h" GPR_GLOBAL_CONFIG_DECLARE_BOOL(bool_var); diff --git a/test/core/gprpp/host_port_test.cc b/test/core/gprpp/host_port_test.cc index 0cff9975f1d..a63065c576e 100644 --- a/test/core/gprpp/host_port_test.cc +++ b/test/core/gprpp/host_port_test.cc @@ -16,12 +16,13 @@ * */ +#include "src/core/lib/gprpp/host_port.h" + #include #include #include -#include "src/core/lib/gprpp/host_port.h" #include "test/core/util/test_config.h" static void join_host_port_expect(const char* host, int port, diff --git a/test/core/gprpp/manual_constructor_test.cc b/test/core/gprpp/manual_constructor_test.cc index 828f2f89aa9..04ad592623a 100644 --- a/test/core/gprpp/manual_constructor_test.cc +++ b/test/core/gprpp/manual_constructor_test.cc @@ -19,13 +19,16 @@ /* Test of gpr synchronization support. */ #include "src/core/lib/gprpp/manual_constructor.h" -#include -#include -#include + #include #include + #include +#include +#include +#include + #include "test/core/util/test_config.h" class A { diff --git a/test/core/gprpp/match_test.cc b/test/core/gprpp/match_test.cc index a3b9cd7c48a..f0ea8a0c233 100644 --- a/test/core/gprpp/match_test.cc +++ b/test/core/gprpp/match_test.cc @@ -13,6 +13,7 @@ // limitations under the License. #include "src/core/lib/gprpp/match.h" + #include namespace grpc_core { diff --git a/test/core/gprpp/overload_test.cc b/test/core/gprpp/overload_test.cc index 1e7f346b7b3..2bbc3318cea 100644 --- a/test/core/gprpp/overload_test.cc +++ b/test/core/gprpp/overload_test.cc @@ -13,6 +13,7 @@ // limitations under the License. #include "src/core/lib/gprpp/overload.h" + #include namespace grpc_core { diff --git a/test/core/gprpp/stat_test.cc b/test/core/gprpp/stat_test.cc index a8077173237..7f3a0073725 100644 --- a/test/core/gprpp/stat_test.cc +++ b/test/core/gprpp/stat_test.cc @@ -14,6 +14,8 @@ // limitations under the License. // +#include "src/core/lib/gprpp/stat.h" + #include #include @@ -27,7 +29,6 @@ #include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/tmpfile.h" -#include "src/core/lib/gprpp/stat.h" #include "src/core/lib/iomgr/load_file.h" #include "test/core/util/test_config.h" diff --git a/test/core/gprpp/table_test.cc b/test/core/gprpp/table_test.cc index 0f3957bb13f..22cb905e355 100644 --- a/test/core/gprpp/table_test.cc +++ b/test/core/gprpp/table_test.cc @@ -13,9 +13,12 @@ // limitations under the License. #include "src/core/lib/gprpp/table.h" -#include + #include #include + +#include + #include "absl/types/optional.h" namespace grpc_core { diff --git a/test/core/gprpp/time_util_test.cc b/test/core/gprpp/time_util_test.cc index 4529147d662..0fbbce5bc08 100644 --- a/test/core/gprpp/time_util_test.cc +++ b/test/core/gprpp/time_util_test.cc @@ -14,16 +14,16 @@ // limitations under the License. // +#include "src/core/lib/gprpp/time_util.h" + #include #include #include -#include - #include "absl/time/time.h" -#include "src/core/lib/gprpp/time_util.h" +#include TEST(TimeUtilTest, ToGprTimeSpecFromAbslDurationWithRegularValues) { std::vector times = {-10, -1, 0, 1, 10}; diff --git a/test/core/handshake/client_ssl.cc b/test/core/handshake/client_ssl.cc index 78413cc4630..a18e971e4d5 100644 --- a/test/core/handshake/client_ssl.cc +++ b/test/core/handshake/client_ssl.cc @@ -22,8 +22,6 @@ #ifdef GRPC_POSIX_SOCKET_TCP #include -#include -#include #include #include #include @@ -31,6 +29,9 @@ #include +#include +#include + #include "absl/strings/str_cat.h" #include diff --git a/test/core/handshake/readahead_handshaker_server_ssl.cc b/test/core/handshake/readahead_handshaker_server_ssl.cc index a70ba390aad..66eec9ecd8e 100644 --- a/test/core/handshake/readahead_handshaker_server_ssl.cc +++ b/test/core/handshake/readahead_handshaker_server_ssl.cc @@ -17,12 +17,13 @@ */ #include -#include -#include #include #include #include +#include +#include + #include #include #include @@ -30,15 +31,13 @@ #include #include -#include "src/core/lib/iomgr/load_file.h" -#include "test/core/util/port.h" -#include "test/core/util/test_config.h" - #include "src/core/lib/channel/handshaker_factory.h" #include "src/core/lib/channel/handshaker_registry.h" +#include "src/core/lib/iomgr/load_file.h" #include "src/core/lib/security/transport/security_handshaker.h" - #include "test/core/handshake/server_ssl_common.h" +#include "test/core/util/port.h" +#include "test/core/util/test_config.h" /* The purpose of this test is to exercise the case when a * grpc *security_handshaker* begins its handshake with data already diff --git a/test/core/handshake/server_ssl.cc b/test/core/handshake/server_ssl.cc index 33580223c40..f759b70afb3 100644 --- a/test/core/handshake/server_ssl.cc +++ b/test/core/handshake/server_ssl.cc @@ -17,12 +17,13 @@ */ #include -#include -#include #include #include #include +#include +#include + #include #include #include @@ -31,11 +32,10 @@ #include #include "src/core/lib/iomgr/load_file.h" +#include "test/core/handshake/server_ssl_common.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" -#include "test/core/handshake/server_ssl_common.h" - int main(int argc, char* argv[]) { grpc::testing::TestEnvironment env(argc, argv); // Handshake succeeeds when the client supplies the standard ALPN list. diff --git a/test/core/handshake/server_ssl_common.cc b/test/core/handshake/server_ssl_common.cc index ce410520f39..7b8914677b4 100644 --- a/test/core/handshake/server_ssl_common.cc +++ b/test/core/handshake/server_ssl_common.cc @@ -19,14 +19,15 @@ #include "test/core/handshake/server_ssl_common.h" #include -#include -#include #include #include #include #include +#include +#include + #include "absl/strings/str_cat.h" #include diff --git a/test/core/handshake/verify_peer_options.cc b/test/core/handshake/verify_peer_options.cc index 4cac4356242..606fb2ccb2d 100644 --- a/test/core/handshake/verify_peer_options.cc +++ b/test/core/handshake/verify_peer_options.cc @@ -22,8 +22,6 @@ #ifdef GRPC_POSIX_SOCKET_TCP #include -#include -#include #include #include #include @@ -31,6 +29,9 @@ #include +#include +#include + #include "absl/strings/str_cat.h" #include diff --git a/test/core/http/format_request_test.cc b/test/core/http/format_request_test.cc index b0a90c4613b..d4d1be808d5 100644 --- a/test/core/http/format_request_test.cc +++ b/test/core/http/format_request_test.cc @@ -21,6 +21,7 @@ #include #include + #include "test/core/util/test_config.h" static void test_format_get_request(void) { diff --git a/test/core/http/httpscli_test.cc b/test/core/http/httpscli_test.cc index 9c5ba3a183a..07e46ffa7c4 100644 --- a/test/core/http/httpscli_test.cc +++ b/test/core/http/httpscli_test.cc @@ -16,8 +16,6 @@ * */ -#include "src/core/lib/http/httpcli.h" - #include #include @@ -28,6 +26,7 @@ #include #include "src/core/lib/gpr/env.h" +#include "src/core/lib/http/httpcli.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/security/security_connector/ssl_utils_config.h" #include "test/core/util/port.h" diff --git a/test/core/iomgr/buffer_list_test.cc b/test/core/iomgr/buffer_list_test.cc index 6df4156336c..c7ac823caec 100644 --- a/test/core/iomgr/buffer_list_test.cc +++ b/test/core/iomgr/buffer_list_test.cc @@ -16,12 +16,11 @@ * */ -#include "src/core/lib/iomgr/port.h" - #include "src/core/lib/iomgr/buffer_list.h" #include +#include "src/core/lib/iomgr/port.h" #include "test/core/util/test_config.h" #ifdef GRPC_LINUX_ERRQUEUE diff --git a/test/core/iomgr/endpoint_pair_test.cc b/test/core/iomgr/endpoint_pair_test.cc index 18317d08dd2..d97a3c78388 100644 --- a/test/core/iomgr/endpoint_pair_test.cc +++ b/test/core/iomgr/endpoint_pair_test.cc @@ -17,6 +17,7 @@ */ #include "src/core/lib/iomgr/endpoint_pair.h" + #include #include #include diff --git a/test/core/iomgr/error_test.cc b/test/core/iomgr/error_test.cc index e50a5f0140e..cb3e30e895c 100644 --- a/test/core/iomgr/error_test.cc +++ b/test/core/iomgr/error_test.cc @@ -18,12 +18,12 @@ #include "src/core/lib/iomgr/error.h" +#include + #include #include #include -#include - #include "test/core/util/test_config.h" static void test_set_get_int() { diff --git a/test/core/iomgr/ev_epollex_linux_test.cc b/test/core/iomgr/ev_epollex_linux_test.cc index 35c27ec8758..5656efa7eac 100644 --- a/test/core/iomgr/ev_epollex_linux_test.cc +++ b/test/core/iomgr/ev_epollex_linux_test.cc @@ -19,12 +19,12 @@ /* This test only relevant on linux systems where epoll() is available */ #if defined(GRPC_LINUX_EPOLL_CREATE1) && defined(GRPC_LINUX_EVENTFD) -#include "src/core/lib/iomgr/ev_epollex_linux.h" - -#include #include #include +#include + +#include "src/core/lib/iomgr/ev_epollex_linux.h" #include "test/core/util/test_config.h" static void pollset_destroy(void* ps, grpc_error_handle /*error*/) { diff --git a/test/core/iomgr/fd_posix_test.cc b/test/core/iomgr/fd_posix_test.cc index 9ca837e5d51..7c2ec737656 100644 --- a/test/core/iomgr/fd_posix_test.cc +++ b/test/core/iomgr/fd_posix_test.cc @@ -21,8 +21,6 @@ // This test won't work except with posix sockets enabled #ifdef GRPC_POSIX_SOCKET_EV -#include "src/core/lib/iomgr/ev_posix.h" - #include #include #include diff --git a/test/core/iomgr/grpc_ipv6_loopback_available_test.cc b/test/core/iomgr/grpc_ipv6_loopback_available_test.cc index 9360a45e796..efda72e8889 100644 --- a/test/core/iomgr/grpc_ipv6_loopback_available_test.cc +++ b/test/core/iomgr/grpc_ipv6_loopback_available_test.cc @@ -16,10 +16,10 @@ * */ -#include "src/core/lib/iomgr/port.h" - #include #include + +#include "src/core/lib/iomgr/port.h" #include "test/core/util/test_config.h" #ifdef GPR_WINDOWS diff --git a/test/core/iomgr/load_file_test.cc b/test/core/iomgr/load_file_test.cc index 6974cedea11..1e46ab4423a 100644 --- a/test/core/iomgr/load_file_test.cc +++ b/test/core/iomgr/load_file_test.cc @@ -16,6 +16,8 @@ * */ +#include "src/core/lib/iomgr/load_file.h" + #include #include @@ -26,7 +28,6 @@ #include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/tmpfile.h" -#include "src/core/lib/iomgr/load_file.h" #include "test/core/util/test_config.h" #define LOG_TEST_NAME(x) gpr_log(GPR_INFO, "%s", x) diff --git a/test/core/iomgr/resolve_address_posix_test.cc b/test/core/iomgr/resolve_address_posix_test.cc index 6924a35c753..7e34a02737b 100644 --- a/test/core/iomgr/resolve_address_posix_test.cc +++ b/test/core/iomgr/resolve_address_posix_test.cc @@ -16,8 +16,6 @@ * */ -#include "src/core/lib/iomgr/resolve_address.h" - #include #include #include @@ -39,6 +37,7 @@ #include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr.h" +#include "src/core/lib/iomgr/resolve_address.h" #include "test/core/util/cmdline.h" #include "test/core/util/test_config.h" diff --git a/test/core/iomgr/resolve_address_test.cc b/test/core/iomgr/resolve_address_test.cc index d1fc73fe6e6..6e633f52659 100644 --- a/test/core/iomgr/resolve_address_test.cc +++ b/test/core/iomgr/resolve_address_test.cc @@ -17,16 +17,17 @@ */ #include "src/core/lib/iomgr/resolve_address.h" + +#include + +#include + #include #include #include #include #include -#include - -#include - #include "src/core/ext/filters/client_channel/resolver/dns/dns_resolver_selection.h" #include "src/core/lib/event_engine/sockaddr.h" #include "src/core/lib/gpr/string.h" diff --git a/test/core/iomgr/socket_utils_test.cc b/test/core/iomgr/socket_utils_test.cc index 899eeb4ad0b..b960fc1317c 100644 --- a/test/core/iomgr/socket_utils_test.cc +++ b/test/core/iomgr/socket_utils_test.cc @@ -21,8 +21,6 @@ // This test won't work except with posix sockets enabled #ifdef GRPC_POSIX_SOCKET_UTILS_COMMON -#include "src/core/lib/iomgr/socket_utils_posix.h" - #include #include #include @@ -34,6 +32,7 @@ #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/socket_mutator.h" +#include "src/core/lib/iomgr/socket_utils_posix.h" #include "test/core/util/test_config.h" struct test_socket_mutator { diff --git a/test/core/iomgr/stranded_event_test.cc b/test/core/iomgr/stranded_event_test.cc index 451182345b9..3634b2cc494 100644 --- a/test/core/iomgr/stranded_event_test.cc +++ b/test/core/iomgr/stranded_event_test.cc @@ -27,6 +27,10 @@ #include +#include "absl/strings/str_cat.h" +#include "absl/strings/str_format.h" +#include "absl/types/optional.h" + #include #include #include @@ -36,10 +40,6 @@ #include #include -#include "absl/strings/str_cat.h" -#include "absl/strings/str_format.h" -#include "absl/types/optional.h" - #include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/gpr/useful.h" @@ -51,13 +51,11 @@ #include "src/core/lib/security/security_connector/alts/alts_security_connector.h" #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/lib/uri/uri_parser.h" - +#include "test/core/end2end/cq_verifier.h" #include "test/core/util/memory_counters.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" -#include "test/core/end2end/cq_verifier.h" - namespace { const int kNumMessagePingPongsPerCall = 4000; diff --git a/test/core/iomgr/tcp_client_posix_test.cc b/test/core/iomgr/tcp_client_posix_test.cc index 4ab5f06d6dc..e5ec7bc3544 100644 --- a/test/core/iomgr/tcp_client_posix_test.cc +++ b/test/core/iomgr/tcp_client_posix_test.cc @@ -21,8 +21,6 @@ // This test won't work except with posix sockets enabled #ifdef GRPC_POSIX_SOCKET_TCP_CLIENT -#include "src/core/lib/iomgr/tcp_client.h" - #include #include #include @@ -37,6 +35,7 @@ #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/socket_utils_posix.h" +#include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/iomgr/timer.h" #include "test/core/util/resource_user_util.h" #include "test/core/util/test_config.h" diff --git a/test/core/iomgr/tcp_posix_test.cc b/test/core/iomgr/tcp_posix_test.cc index 77fbc20d5b6..26ca18228a5 100644 --- a/test/core/iomgr/tcp_posix_test.cc +++ b/test/core/iomgr/tcp_posix_test.cc @@ -21,8 +21,6 @@ // This test won't work except with posix sockets enabled #ifdef GRPC_POSIX_SOCKET_TCP -#include "src/core/lib/iomgr/tcp_posix.h" - #include #include #include @@ -39,6 +37,7 @@ #include "src/core/lib/iomgr/buffer_list.h" #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/sockaddr_posix.h" +#include "src/core/lib/iomgr/tcp_posix.h" #include "src/core/lib/slice/slice_internal.h" #include "test/core/iomgr/endpoint_tests.h" #include "test/core/util/resource_user_util.h" diff --git a/test/core/iomgr/tcp_server_posix_test.cc b/test/core/iomgr/tcp_server_posix_test.cc index 29ace086e21..9c116d14825 100644 --- a/test/core/iomgr/tcp_server_posix_test.cc +++ b/test/core/iomgr/tcp_server_posix_test.cc @@ -21,8 +21,6 @@ // This test won't work except with posix sockets enabled #ifdef GRPC_POSIX_SOCKET_TCP_SERVER -#include "src/core/lib/iomgr/tcp_server.h" - #include #include #include @@ -44,6 +42,7 @@ #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/resolve_address.h" +#include "src/core/lib/iomgr/tcp_server.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/iomgr/time_averaged_stats_test.cc b/test/core/iomgr/time_averaged_stats_test.cc index 2923a35d1b6..685135336c8 100644 --- a/test/core/iomgr/time_averaged_stats_test.cc +++ b/test/core/iomgr/time_averaged_stats_test.cc @@ -21,6 +21,7 @@ #include #include + #include "test/core/util/test_config.h" #define EXPECT_EQ(a, b) GPR_ASSERT((a) == (b)) diff --git a/test/core/iomgr/timer_heap_test.cc b/test/core/iomgr/timer_heap_test.cc index b574e0a680e..60f4bdd27eb 100644 --- a/test/core/iomgr/timer_heap_test.cc +++ b/test/core/iomgr/timer_heap_test.cc @@ -16,8 +16,6 @@ * */ -#include "src/core/lib/iomgr/port.h" - #include "src/core/lib/iomgr/timer_heap.h" #include @@ -27,6 +25,7 @@ #include #include "src/core/lib/gpr/useful.h" +#include "src/core/lib/iomgr/port.h" #include "test/core/util/test_config.h" static gpr_atm random_deadline(void) { return rand(); } diff --git a/test/core/iomgr/timer_list_test.cc b/test/core/iomgr/timer_list_test.cc index f4a1b20316d..311390782e5 100644 --- a/test/core/iomgr/timer_list_test.cc +++ b/test/core/iomgr/timer_list_test.cc @@ -21,14 +21,14 @@ // This test only works with the generic timer implementation #ifndef GRPC_CUSTOM_SOCKET -#include "src/core/lib/iomgr/iomgr_internal.h" -#include "src/core/lib/iomgr/timer.h" - #include #include #include + #include "src/core/lib/debug/trace.h" +#include "src/core/lib/iomgr/iomgr_internal.h" +#include "src/core/lib/iomgr/timer.h" #include "test/core/util/test_config.h" #include "test/core/util/tracer_util.h" diff --git a/test/core/iomgr/udp_server_test.cc b/test/core/iomgr/udp_server_test.cc index a036b0c1018..6eb1232c08f 100644 --- a/test/core/iomgr/udp_server_test.cc +++ b/test/core/iomgr/udp_server_test.cc @@ -21,8 +21,6 @@ // This test won't work except with posix sockets enabled #ifdef GRPC_POSIX_SOCKET_UDP_SERVER -#include "src/core/lib/iomgr/udp_server.h" - #include #include #include @@ -43,6 +41,7 @@ #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/socket_factory_posix.h" #include "src/core/lib/iomgr/socket_utils_posix.h" +#include "src/core/lib/iomgr/udp_server.h" #include "test/core/util/test_config.h" #define LOG_TEST(x) gpr_log(GPR_INFO, "%s", #x) diff --git a/test/core/iomgr/work_serializer_test.cc b/test/core/iomgr/work_serializer_test.cc index bbc9e3f74ab..7a5ce5b4e5e 100644 --- a/test/core/iomgr/work_serializer_test.cc +++ b/test/core/iomgr/work_serializer_test.cc @@ -16,19 +16,20 @@ * */ +#include "src/core/lib/iomgr/work_serializer.h" + #include #include +#include "absl/memory/memory.h" + #include #include #include -#include "absl/memory/memory.h" - #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/thd.h" -#include "src/core/lib/iomgr/work_serializer.h" #include "test/core/util/test_config.h" namespace { diff --git a/test/core/json/json_test.cc b/test/core/json/json_test.cc index c724f1b6342..6821648c52c 100644 --- a/test/core/json/json_test.cc +++ b/test/core/json/json_test.cc @@ -16,19 +16,19 @@ * */ +#include "src/core/lib/json/json.h" + #include +#include +#include + #include #include #include -#include -#include - #include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" -#include "src/core/lib/json/json.h" - #include "test/core/util/test_config.h" namespace grpc_core { diff --git a/test/core/promise/activity_test.cc b/test/core/promise/activity_test.cc index af2347f4a9a..3375b2f4632 100644 --- a/test/core/promise/activity_test.cc +++ b/test/core/promise/activity_test.cc @@ -13,8 +13,10 @@ // limitations under the License. #include "src/core/lib/promise/activity.h" + #include #include + #include "src/core/lib/promise/join.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/promise/seq.h" diff --git a/test/core/promise/context_test.cc b/test/core/promise/context_test.cc index 4d7a3da4e79..b4f4afe9fb4 100644 --- a/test/core/promise/context_test.cc +++ b/test/core/promise/context_test.cc @@ -13,6 +13,7 @@ // limitations under the License. #include "src/core/lib/promise/context.h" + #include namespace grpc_core { diff --git a/test/core/promise/if_test.cc b/test/core/promise/if_test.cc index 99ad2d2efc4..f0ec4379f63 100644 --- a/test/core/promise/if_test.cc +++ b/test/core/promise/if_test.cc @@ -13,6 +13,7 @@ // limitations under the License. #include "src/core/lib/promise/if.h" + #include namespace grpc_core { diff --git a/test/core/promise/join_test.cc b/test/core/promise/join_test.cc index 1a45b62ac69..df3ab83a7cd 100644 --- a/test/core/promise/join_test.cc +++ b/test/core/promise/join_test.cc @@ -13,6 +13,7 @@ // limitations under the License. #include "src/core/lib/promise/join.h" + #include namespace grpc_core { diff --git a/test/core/promise/latch_test.cc b/test/core/promise/latch_test.cc index 913025ae6f3..c1032df6d16 100644 --- a/test/core/promise/latch_test.cc +++ b/test/core/promise/latch_test.cc @@ -13,8 +13,10 @@ // limitations under the License. #include "src/core/lib/promise/latch.h" + #include #include + #include "src/core/lib/promise/join.h" #include "src/core/lib/promise/seq.h" diff --git a/test/core/promise/loop_test.cc b/test/core/promise/loop_test.cc index 31f973c394a..4d7b846f32b 100644 --- a/test/core/promise/loop_test.cc +++ b/test/core/promise/loop_test.cc @@ -13,6 +13,7 @@ // limitations under the License. #include "src/core/lib/promise/loop.h" + #include namespace grpc_core { diff --git a/test/core/promise/map_test.cc b/test/core/promise/map_test.cc index 51bf047459e..d60d83640ac 100644 --- a/test/core/promise/map_test.cc +++ b/test/core/promise/map_test.cc @@ -13,7 +13,9 @@ // limitations under the License. #include "src/core/lib/promise/map.h" + #include + #include "src/core/lib/promise/promise.h" namespace grpc_core { diff --git a/test/core/promise/observable_test.cc b/test/core/promise/observable_test.cc index d46d367989c..90443665283 100644 --- a/test/core/promise/observable_test.cc +++ b/test/core/promise/observable_test.cc @@ -13,8 +13,10 @@ // limitations under the License. #include "src/core/lib/promise/observable.h" + #include #include + #include "src/core/lib/promise/promise.h" #include "src/core/lib/promise/seq.h" diff --git a/test/core/promise/pipe_test.cc b/test/core/promise/pipe_test.cc index 89f1f8f6603..c6c699e7e35 100644 --- a/test/core/promise/pipe_test.cc +++ b/test/core/promise/pipe_test.cc @@ -13,9 +13,12 @@ // limitations under the License. #include "src/core/lib/promise/pipe.h" + #include #include + #include "absl/memory/memory.h" + #include "src/core/lib/promise/join.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/promise/seq.h" diff --git a/test/core/promise/poll_test.cc b/test/core/promise/poll_test.cc index 9222d88a865..3a44f503553 100644 --- a/test/core/promise/poll_test.cc +++ b/test/core/promise/poll_test.cc @@ -13,6 +13,7 @@ // limitations under the License. #include "src/core/lib/promise/poll.h" + #include namespace grpc_core { diff --git a/test/core/promise/promise_factory_test.cc b/test/core/promise/promise_factory_test.cc index 9911b65c6d0..b354dbe2fe5 100644 --- a/test/core/promise/promise_factory_test.cc +++ b/test/core/promise/promise_factory_test.cc @@ -13,8 +13,11 @@ // limitations under the License. #include "src/core/lib/promise/detail/promise_factory.h" + #include + #include "absl/functional/bind_front.h" + #include "src/core/lib/gprpp/capture.h" #include "src/core/lib/promise/promise.h" diff --git a/test/core/promise/promise_test.cc b/test/core/promise/promise_test.cc index ad070febe10..aa1a814481f 100644 --- a/test/core/promise/promise_test.cc +++ b/test/core/promise/promise_test.cc @@ -13,6 +13,7 @@ // limitations under the License. #include "src/core/lib/promise/promise.h" + #include namespace grpc_core { diff --git a/test/core/promise/race_test.cc b/test/core/promise/race_test.cc index d7086d26b66..7928b9f8e3e 100644 --- a/test/core/promise/race_test.cc +++ b/test/core/promise/race_test.cc @@ -13,6 +13,7 @@ // limitations under the License. #include "src/core/lib/promise/race.h" + #include namespace grpc_core { diff --git a/test/core/promise/seq_test.cc b/test/core/promise/seq_test.cc index 620c326fc4b..15b2fd323ff 100644 --- a/test/core/promise/seq_test.cc +++ b/test/core/promise/seq_test.cc @@ -13,6 +13,7 @@ // limitations under the License. #include "src/core/lib/promise/seq.h" + #include namespace grpc_core { diff --git a/test/core/promise/try_join_test.cc b/test/core/promise/try_join_test.cc index 64af30458b3..2f880ad7b81 100644 --- a/test/core/promise/try_join_test.cc +++ b/test/core/promise/try_join_test.cc @@ -13,6 +13,7 @@ // limitations under the License. #include "src/core/lib/promise/try_join.h" + #include namespace grpc_core { diff --git a/test/core/promise/try_seq_test.cc b/test/core/promise/try_seq_test.cc index ef93ab43c3d..97034b52f84 100644 --- a/test/core/promise/try_seq_test.cc +++ b/test/core/promise/try_seq_test.cc @@ -13,6 +13,7 @@ // limitations under the License. #include "src/core/lib/promise/try_seq.h" + #include namespace grpc_core { diff --git a/test/core/security/alts_credentials_fuzzer.cc b/test/core/security/alts_credentials_fuzzer.cc index 42e683f64b2..1f2aa6059ac 100644 --- a/test/core/security/alts_credentials_fuzzer.cc +++ b/test/core/security/alts_credentials_fuzzer.cc @@ -23,12 +23,12 @@ #include #include #include -#include "test/core/util/fuzzer_util.h" #include "src/core/lib/gpr/env.h" #include "src/core/lib/security/credentials/alts/alts_credentials.h" #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" #include "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h" +#include "test/core/util/fuzzer_util.h" using grpc_core::testing::grpc_fuzzer_get_next_byte; using grpc_core::testing::grpc_fuzzer_get_next_string; diff --git a/test/core/security/alts_security_connector_test.cc b/test/core/security/alts_security_connector_test.cc index ec1b1d31bb3..becd4e6315d 100644 --- a/test/core/security/alts_security_connector_test.cc +++ b/test/core/security/alts_security_connector_test.cc @@ -16,6 +16,8 @@ * */ +#include "src/core/lib/security/security_connector/alts/alts_security_connector.h" + #include #include #include @@ -24,7 +26,6 @@ #include #include -#include "src/core/lib/security/security_connector/alts/alts_security_connector.h" #include "src/core/lib/transport/transport.h" #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h" #include "src/core/tsi/transport_security.h" diff --git a/test/core/security/auth_context_test.cc b/test/core/security/auth_context_test.cc index e7e0cb2ed94..142cc60f96a 100644 --- a/test/core/security/auth_context_test.cc +++ b/test/core/security/auth_context_test.cc @@ -18,13 +18,13 @@ #include +#include + #include "src/core/lib/gpr/string.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/context/security_context.h" #include "test/core/util/test_config.h" -#include - static void test_empty_context(void) { grpc_core::RefCountedPtr ctx = grpc_core::MakeRefCounted(nullptr); diff --git a/test/core/security/aws_request_signer_test.cc b/test/core/security/aws_request_signer_test.cc index bc5780fadb3..cb97292d7a0 100644 --- a/test/core/security/aws_request_signer_test.cc +++ b/test/core/security/aws_request_signer_test.cc @@ -17,6 +17,7 @@ #include "src/core/lib/security/credentials/external/aws_request_signer.h" #include + #include #include "test/core/util/test_config.h" diff --git a/test/core/security/check_gcp_environment_windows_test.cc b/test/core/security/check_gcp_environment_windows_test.cc index 20b6d547516..193417328c6 100644 --- a/test/core/security/check_gcp_environment_windows_test.cc +++ b/test/core/security/check_gcp_environment_windows_test.cc @@ -27,6 +27,7 @@ #include #include + #include "src/core/lib/gpr/tmpfile.h" namespace grpc_core { diff --git a/test/core/security/create_jwt.cc b/test/core/security/create_jwt.cc index 2ea640b605e..a82e07a86af 100644 --- a/test/core/security/create_jwt.cc +++ b/test/core/security/create_jwt.cc @@ -19,13 +19,12 @@ #include #include -#include "src/core/lib/iomgr/load_file.h" -#include "src/core/lib/security/credentials/jwt/jwt_credentials.h" - #include #include #include +#include "src/core/lib/iomgr/load_file.h" +#include "src/core/lib/security/credentials/jwt/jwt_credentials.h" #include "test/core/util/cmdline.h" void create_jwt(const char* json_key_file_path, const char* service_url, diff --git a/test/core/security/credentials_test.cc b/test/core/security/credentials_test.cc index a91827e8a84..688fa6a78a6 100644 --- a/test/core/security/credentials_test.cc +++ b/test/core/security/credentials_test.cc @@ -20,12 +20,13 @@ #include "src/core/lib/security/credentials/credentials.h" -#include #include #include #include +#include + #include "absl/strings/match.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" diff --git a/test/core/security/evaluate_args_test.cc b/test/core/security/evaluate_args_test.cc index c0d0a9e7efe..a8df9b30030 100644 --- a/test/core/security/evaluate_args_test.cc +++ b/test/core/security/evaluate_args_test.cc @@ -14,11 +14,12 @@ #include +#include "src/core/lib/security/authorization/evaluate_args.h" + #include #include #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/security/authorization/evaluate_args.h" #include "test/core/util/evaluate_args_test_util.h" #include "test/core/util/test_config.h" diff --git a/test/core/security/fetch_oauth2.cc b/test/core/security/fetch_oauth2.cc index 70812dca834..b9f08dcda21 100644 --- a/test/core/security/fetch_oauth2.cc +++ b/test/core/security/fetch_oauth2.cc @@ -25,8 +25,8 @@ #include #include #include - #include + #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/load_file.h" #include "src/core/lib/security/credentials/credentials.h" diff --git a/test/core/security/grpc_alts_credentials_options_test.cc b/test/core/security/grpc_alts_credentials_options_test.cc index d33b59191d2..0e4c2fe22ac 100644 --- a/test/core/security/grpc_alts_credentials_options_test.cc +++ b/test/core/security/grpc_alts_credentials_options_test.cc @@ -16,6 +16,8 @@ * */ +#include "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h" + #include #include #include @@ -23,8 +25,6 @@ #include #include -#include "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h" - #define ALTS_CLIENT_OPTIONS_TEST_TARGET_SERVICE_ACCOUNT_1 "abc@google.com" #define ALTS_CLIENT_OPTIONS_TEST_TARGET_SERVICE_ACCOUNT_2 "def@google.com" diff --git a/test/core/security/grpc_authorization_engine_test.cc b/test/core/security/grpc_authorization_engine_test.cc index e6dd4add847..f85482e19c9 100644 --- a/test/core/security/grpc_authorization_engine_test.cc +++ b/test/core/security/grpc_authorization_engine_test.cc @@ -14,11 +14,11 @@ #include +#include "src/core/lib/security/authorization/grpc_authorization_engine.h" + #include #include -#include "src/core/lib/security/authorization/grpc_authorization_engine.h" - namespace grpc_core { TEST(GrpcAuthorizationEngineTest, AllowEngineWithMatchingPolicy) { diff --git a/test/core/security/grpc_authorization_policy_provider_test.cc b/test/core/security/grpc_authorization_policy_provider_test.cc index f58cf089e84..f298a352239 100644 --- a/test/core/security/grpc_authorization_policy_provider_test.cc +++ b/test/core/security/grpc_authorization_policy_provider_test.cc @@ -14,12 +14,14 @@ #include +#include "src/core/lib/security/authorization/grpc_authorization_policy_provider.h" + #include -#include #include +#include + #include "src/core/lib/security/authorization/grpc_authorization_engine.h" -#include "src/core/lib/security/authorization/grpc_authorization_policy_provider.h" #include "test/core/util/test_config.h" namespace grpc_core { diff --git a/test/core/security/grpc_tls_certificate_distributor_test.cc b/test/core/security/grpc_tls_certificate_distributor_test.cc index 92123a182c1..17aac541276 100644 --- a/test/core/security/grpc_tls_certificate_distributor_test.cc +++ b/test/core/security/grpc_tls_certificate_distributor_test.cc @@ -16,17 +16,18 @@ #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h" -#include -#include -#include -#include -#include - #include #include #include #include +#include +#include + +#include +#include +#include + #include "src/core/lib/slice/slice_internal.h" #include "test/core/util/test_config.h" #include "test/core/util/tls_utils.h" diff --git a/test/core/security/grpc_tls_certificate_provider_test.cc b/test/core/security/grpc_tls_certificate_provider_test.cc index fe65c60de79..40e6f03ccd4 100644 --- a/test/core/security/grpc_tls_certificate_provider_test.cc +++ b/test/core/security/grpc_tls_certificate_provider_test.cc @@ -16,15 +16,15 @@ #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" +#include +#include + #include +#include #include #include #include -#include - -#include -#include #include "src/core/lib/gpr/tmpfile.h" #include "src/core/lib/iomgr/load_file.h" diff --git a/test/core/security/grpc_tls_credentials_options_test.cc b/test/core/security/grpc_tls_credentials_options_test.cc index c5736ca1d77..761effd9700 100644 --- a/test/core/security/grpc_tls_credentials_options_test.cc +++ b/test/core/security/grpc_tls_credentials_options_test.cc @@ -19,10 +19,11 @@ #include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h" #include +#include + #include #include #include -#include #include "src/core/lib/gpr/tmpfile.h" #include "src/core/lib/iomgr/load_file.h" diff --git a/test/core/security/insecure_security_connector_test.cc b/test/core/security/insecure_security_connector_test.cc index dfdb28b91a5..0955eeb8621 100644 --- a/test/core/security/insecure_security_connector_test.cc +++ b/test/core/security/insecure_security_connector_test.cc @@ -16,12 +16,13 @@ // // +#include "src/core/lib/security/security_connector/insecure/insecure_security_connector.h" + #include #include #include -#include "src/core/lib/security/security_connector/insecure/insecure_security_connector.h" #include "src/core/lib/security/security_connector/ssl_utils.h" #include "src/core/tsi/transport_security.h" #include "test/core/util/test_config.h" diff --git a/test/core/security/json_token_test.cc b/test/core/security/json_token_test.cc index 1ded259b7f4..9f855a8d19e 100644 --- a/test/core/security/json_token_test.cc +++ b/test/core/security/json_token_test.cc @@ -18,9 +18,10 @@ #include "src/core/lib/security/credentials/jwt/json_token.h" -#include #include +#include + #include #include #include diff --git a/test/core/security/jwt_verifier_test.cc b/test/core/security/jwt_verifier_test.cc index 21ed63fcfd1..933c413a9a0 100644 --- a/test/core/security/jwt_verifier_test.cc +++ b/test/core/security/jwt_verifier_test.cc @@ -21,7 +21,6 @@ #include #include - #include #include #include diff --git a/test/core/security/linux_system_roots_test.cc b/test/core/security/linux_system_roots_test.cc index cd8bd3beb77..318f27de621 100644 --- a/test/core/security/linux_system_roots_test.cc +++ b/test/core/security/linux_system_roots_test.cc @@ -17,15 +17,19 @@ */ #include + #include #ifdef GPR_LINUX +#include +#include + +#include "gtest/gtest.h" + #include #include #include #include -#include -#include #include "src/core/lib/gpr/env.h" #include "src/core/lib/gpr/tmpfile.h" @@ -39,8 +43,6 @@ #include "src/core/tsi/transport_security.h" #include "test/core/util/test_config.h" -#include "gtest/gtest.h" - namespace grpc { namespace { diff --git a/test/core/security/secure_endpoint_test.cc b/test/core/security/secure_endpoint_test.cc index a5d57c6772b..0b3e98c0535 100644 --- a/test/core/security/secure_endpoint_test.cc +++ b/test/core/security/secure_endpoint_test.cc @@ -16,7 +16,7 @@ * */ -#include "test/core/iomgr/endpoint_tests.h" +#include "src/core/lib/security/transport/secure_endpoint.h" #include #include @@ -24,12 +24,13 @@ #include #include #include + #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/endpoint_pair.h" #include "src/core/lib/iomgr/iomgr.h" -#include "src/core/lib/security/transport/secure_endpoint.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/tsi/fake_transport_security.h" +#include "test/core/iomgr/endpoint_tests.h" #include "test/core/util/resource_user_util.h" #include "test/core/util/test_config.h" diff --git a/test/core/security/security_connector_test.cc b/test/core/security/security_connector_test.cc index 5e9bf0ad114..fd0555ba331 100644 --- a/test/core/security/security_connector_test.cc +++ b/test/core/security/security_connector_test.cc @@ -18,12 +18,13 @@ #include "src/core/lib/security/security_connector/security_connector.h" +#include +#include + #include #include #include #include -#include -#include #include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/tmpfile.h" diff --git a/test/core/security/ssl_credentials_test.cc b/test/core/security/ssl_credentials_test.cc index 7c9f5616654..a9833013f74 100644 --- a/test/core/security/ssl_credentials_test.cc +++ b/test/core/security/ssl_credentials_test.cc @@ -16,6 +16,8 @@ * */ +#include "src/core/lib/security/credentials/ssl/ssl_credentials.h" + #include #include @@ -23,7 +25,6 @@ #include #include -#include "src/core/lib/security/credentials/ssl/ssl_credentials.h" #include "src/core/tsi/ssl_transport_security.h" #include "test/core/util/test_config.h" diff --git a/test/core/security/tls_security_connector_test.cc b/test/core/security/tls_security_connector_test.cc index c041fd9242c..1ede0536854 100644 --- a/test/core/security/tls_security_connector_test.cc +++ b/test/core/security/tls_security_connector_test.cc @@ -18,13 +18,15 @@ #include "src/core/lib/security/security_connector/tls/tls_security_connector.h" +#include +#include + #include +#include + #include #include #include -#include -#include -#include #include "src/core/lib/iomgr/load_file.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" diff --git a/test/core/slice/b64_encode_fuzzer.cc b/test/core/slice/b64_encode_fuzzer.cc index 8a57a7301e7..5b62fde5951 100644 --- a/test/core/slice/b64_encode_fuzzer.cc +++ b/test/core/slice/b64_encode_fuzzer.cc @@ -20,6 +20,7 @@ #include #include + #include "src/core/lib/slice/b64.h" bool squelch = true; diff --git a/test/core/slice/b64_test.cc b/test/core/slice/b64_test.cc index 6677150c231..28c299f46dc 100644 --- a/test/core/slice/b64_test.cc +++ b/test/core/slice/b64_test.cc @@ -24,6 +24,7 @@ #include #include #include + #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice_internal.h" #include "test/core/util/test_config.h" diff --git a/test/core/slice/slice_buffer_test.cc b/test/core/slice/slice_buffer_test.cc index 7d4acfed003..ffa2c7fddc5 100644 --- a/test/core/slice/slice_buffer_test.cc +++ b/test/core/slice/slice_buffer_test.cc @@ -19,6 +19,7 @@ #include #include #include + #include "src/core/lib/slice/slice_internal.h" #include "test/core/util/test_config.h" diff --git a/test/core/slice/slice_test.cc b/test/core/slice/slice_test.cc index 975bedfcd47..c5c8c5c67cf 100644 --- a/test/core/slice/slice_test.cc +++ b/test/core/slice/slice_test.cc @@ -18,12 +18,11 @@ #include -#include - #include #include #include +#include #include #include diff --git a/test/core/surface/byte_buffer_reader_test.cc b/test/core/surface/byte_buffer_reader_test.cc index 47d76f49277..89f508240e4 100644 --- a/test/core/surface/byte_buffer_reader_test.cc +++ b/test/core/surface/byte_buffer_reader_test.cc @@ -16,11 +16,12 @@ * */ +#include + #include #include #include #include - #include #include #include @@ -29,8 +30,6 @@ #include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/util/test_config.h" -#include - #define LOG_TEST(x) gpr_log(GPR_INFO, "%s", x) static void test_read_one_slice(void) { diff --git a/test/core/surface/completion_queue_test.cc b/test/core/surface/completion_queue_test.cc index e3001c7a8d5..0a8bee78c4b 100644 --- a/test/core/surface/completion_queue_test.cc +++ b/test/core/surface/completion_queue_test.cc @@ -21,6 +21,7 @@ #include #include #include + #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/memory.h" #include "src/core/lib/gprpp/sync.h" diff --git a/test/core/surface/completion_queue_threading_test.cc b/test/core/surface/completion_queue_threading_test.cc index a466cd22d8c..c7379dccd26 100644 --- a/test/core/surface/completion_queue_threading_test.cc +++ b/test/core/surface/completion_queue_threading_test.cc @@ -16,8 +16,6 @@ * */ -#include "src/core/lib/surface/completion_queue.h" - #include #include #include @@ -25,6 +23,7 @@ #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/iomgr.h" +#include "src/core/lib/surface/completion_queue.h" #include "test/core/util/test_config.h" #define LOG_TEST(x) gpr_log(GPR_INFO, "%s", x) diff --git a/test/core/surface/concurrent_connectivity_test.cc b/test/core/surface/concurrent_connectivity_test.cc index cb02011b1b3..f63ee879817 100644 --- a/test/core/surface/concurrent_connectivity_test.cc +++ b/test/core/surface/concurrent_connectivity_test.cc @@ -16,8 +16,6 @@ * */ -#include "src/core/lib/iomgr/sockaddr.h" - #include #include @@ -35,8 +33,8 @@ #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/resolve_address.h" +#include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/tcp_server.h" - #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/surface/init_test.cc b/test/core/surface/init_test.cc index 4862e3af9f8..f99ba1e48d0 100644 --- a/test/core/surface/init_test.cc +++ b/test/core/surface/init_test.cc @@ -18,10 +18,11 @@ #include "src/core/lib/surface/init.h" +#include + #include #include #include -#include #include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/util/test_config.h" diff --git a/test/core/surface/lame_client_test.cc b/test/core/surface/lame_client_test.cc index bd443a769c9..7b89ab33490 100644 --- a/test/core/surface/lame_client_test.cc +++ b/test/core/surface/lame_client_test.cc @@ -21,6 +21,7 @@ #include #include #include + #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/surface/channel.h" diff --git a/test/core/surface/secure_channel_create_test.cc b/test/core/surface/secure_channel_create_test.cc index e9bb815f6ee..a0d5a54b609 100644 --- a/test/core/surface/secure_channel_create_test.cc +++ b/test/core/surface/secure_channel_create_test.cc @@ -21,6 +21,7 @@ #include #include #include + #include "src/core/ext/filters/client_channel/resolver_registry.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" diff --git a/test/core/transport/bdp_estimator_test.cc b/test/core/transport/bdp_estimator_test.cc index c6426febc6b..1f1e226a9a4 100644 --- a/test/core/transport/bdp_estimator_test.cc +++ b/test/core/transport/bdp_estimator_test.cc @@ -18,14 +18,15 @@ #include "src/core/lib/transport/bdp_estimator.h" +#include + +#include + #include #include #include #include -#include -#include - #include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/timer_manager.h" diff --git a/test/core/transport/binder/binder_transport_test.cc b/test/core/transport/binder/binder_transport_test.cc index cb0e9bebe27..4130ee8cfb2 100644 --- a/test/core/transport/binder/binder_transport_test.cc +++ b/test/core/transport/binder/binder_transport_test.cc @@ -18,14 +18,17 @@ // transform into the correct sequence of binder transactions. #include "src/core/ext/transport/binder/transport/binder_transport.h" -#include -#include #include #include #include +#include + #include "absl/memory/memory.h" #include "absl/strings/match.h" + +#include + #include "src/core/ext/transport/binder/transport/binder_stream.h" #include "test/core/transport/binder/mock_objects.h" #include "test/core/util/test_config.h" diff --git a/test/core/transport/binder/end2end/binder_server_test.cc b/test/core/transport/binder/end2end/binder_server_test.cc index e70d0522f3e..46f5d1b8361 100644 --- a/test/core/transport/binder/end2end/binder_server_test.cc +++ b/test/core/transport/binder/end2end/binder_server_test.cc @@ -14,14 +14,17 @@ #include "src/core/ext/transport/binder/server/binder_server.h" -#include -#include -#include #include #include #include +#include + #include "absl/memory/memory.h" + +#include +#include + #include "src/core/ext/transport/binder/client/channel_create_impl.h" #include "src/core/ext/transport/binder/server/binder_server.h" #include "src/core/ext/transport/binder/server/binder_server_credentials.h" diff --git a/test/core/transport/binder/end2end/echo_service.h b/test/core/transport/binder/end2end/echo_service.h index 8d86ca1579b..1dbfe394601 100644 --- a/test/core/transport/binder/end2end/echo_service.h +++ b/test/core/transport/binder/end2end/echo_service.h @@ -16,6 +16,7 @@ #define TEST_CORE_TRANSPORT_BINDER_END2END_ECHO_SERVICE_H #include "absl/strings/string_view.h" + #include "test/core/transport/binder/end2end/echo.grpc.pb.h" namespace grpc_binder { diff --git a/test/core/transport/binder/end2end/end2end_binder_transport_test.cc b/test/core/transport/binder/end2end/end2end_binder_transport_test.cc index 8ca18c96b2d..d8bfc2141f5 100644 --- a/test/core/transport/binder/end2end/end2end_binder_transport_test.cc +++ b/test/core/transport/binder/end2end/end2end_binder_transport_test.cc @@ -12,16 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - -#include #include #include #include +#include +#include + #include "absl/memory/memory.h" #include "absl/time/time.h" + +#include + #include "src/core/ext/transport/binder/transport/binder_transport.h" #include "src/core/ext/transport/binder/wire_format/wire_reader_impl.h" #include "test/core/transport/binder/end2end/echo_service.h" diff --git a/test/core/transport/binder/end2end/fake_binder.cc b/test/core/transport/binder/end2end/fake_binder.cc index d670b965851..8427be4a1b5 100644 --- a/test/core/transport/binder/end2end/fake_binder.cc +++ b/test/core/transport/binder/end2end/fake_binder.cc @@ -14,11 +14,11 @@ #include "test/core/transport/binder/end2end/fake_binder.h" -#include - #include #include +#include + namespace grpc_binder { namespace end2end_testing { diff --git a/test/core/transport/binder/end2end/fake_binder.h b/test/core/transport/binder/end2end/fake_binder.h index 03f4025910d..80613ac6394 100644 --- a/test/core/transport/binder/end2end/fake_binder.h +++ b/test/core/transport/binder/end2end/fake_binder.h @@ -63,6 +63,7 @@ #include "absl/strings/string_view.h" #include "absl/time/time.h" #include "absl/types/variant.h" + #include "src/core/ext/transport/binder/wire_format/binder.h" #include "src/core/ext/transport/binder/wire_format/wire_reader.h" #include "src/core/lib/gprpp/sync.h" diff --git a/test/core/transport/binder/end2end/fake_binder_test.cc b/test/core/transport/binder/end2end/fake_binder_test.cc index ef52ef2a31e..b02e8bca7c6 100644 --- a/test/core/transport/binder/end2end/fake_binder_test.cc +++ b/test/core/transport/binder/end2end/fake_binder_test.cc @@ -14,15 +14,17 @@ #include "test/core/transport/binder/end2end/fake_binder.h" -#include -#include #include #include #include #include +#include +#include + #include "absl/strings/str_format.h" #include "absl/time/time.h" + #include "test/core/util/test_config.h" namespace grpc_binder { diff --git a/test/core/transport/binder/end2end/testing_channel_create.h b/test/core/transport/binder/end2end/testing_channel_create.h index 321e633f3f2..97058c330d0 100644 --- a/test/core/transport/binder/end2end/testing_channel_create.h +++ b/test/core/transport/binder/end2end/testing_channel_create.h @@ -15,9 +15,10 @@ #ifndef GRPC_TEST_CORE_TRANSPORT_BINDER_END2END_TESTING_CHANNEL_CREATE_H #define GRPC_TEST_CORE_TRANSPORT_BINDER_END2END_TESTING_CHANNEL_CREATE_H -#include #include +#include + #include "src/core/ext/transport/binder/transport/binder_transport.h" #include "src/core/lib/surface/server.h" #include "test/core/transport/binder/end2end/fake_binder.h" diff --git a/test/core/transport/binder/transport_stream_receiver_test.cc b/test/core/transport/binder/transport_stream_receiver_test.cc index 1659783a840..134a27a93a4 100644 --- a/test/core/transport/binder/transport_stream_receiver_test.cc +++ b/test/core/transport/binder/transport_stream_receiver_test.cc @@ -12,15 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - #include #include #include #include +#include +#include + #include "absl/memory/memory.h" + #include "src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h" #include "test/core/util/test_config.h" diff --git a/test/core/transport/binder/wire_reader_test.cc b/test/core/transport/binder/wire_reader_test.cc index e42acf9f01f..ede9086b7c7 100644 --- a/test/core/transport/binder/wire_reader_test.cc +++ b/test/core/transport/binder/wire_reader_test.cc @@ -18,13 +18,14 @@ // top-level metadata. The following tests verify that the interactions between // WireReaderImpl and both the output (readable) parcel and the transport stream // receiver are correct in all possible situations. -#include - #include #include #include +#include + #include "absl/memory/memory.h" + #include "src/core/ext/transport/binder/wire_format/wire_reader_impl.h" #include "test/core/transport/binder/mock_objects.h" #include "test/core/util/test_config.h" diff --git a/test/core/transport/binder/wire_writer_test.cc b/test/core/transport/binder/wire_writer_test.cc index 129a68c4474..939a713669b 100644 --- a/test/core/transport/binder/wire_writer_test.cc +++ b/test/core/transport/binder/wire_writer_test.cc @@ -14,11 +14,13 @@ #include "src/core/ext/transport/binder/wire_format/wire_writer.h" -#include #include #include +#include + #include "absl/memory/memory.h" + #include "test/core/transport/binder/mock_objects.h" #include "test/core/util/test_config.h" diff --git a/test/core/transport/byte_stream_test.cc b/test/core/transport/byte_stream_test.cc index 32ee73f39b7..014bb1d0cad 100644 --- a/test/core/transport/byte_stream_test.cc +++ b/test/core/transport/byte_stream_test.cc @@ -18,6 +18,8 @@ #include "src/core/lib/transport/byte_stream.h" +#include + #include #include #include @@ -25,11 +27,8 @@ #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice_internal.h" - #include "test/core/util/test_config.h" -#include - namespace grpc_core { namespace { diff --git a/test/core/transport/chttp2/alpn_test.cc b/test/core/transport/chttp2/alpn_test.cc index 6da5299363b..ffd1f66466b 100644 --- a/test/core/transport/chttp2/alpn_test.cc +++ b/test/core/transport/chttp2/alpn_test.cc @@ -19,6 +19,7 @@ #include "src/core/ext/transport/chttp2/alpn/alpn.h" #include + #include "test/core/util/test_config.h" static void test_alpn_success(void) { diff --git a/test/core/transport/chttp2/bin_decoder_test.cc b/test/core/transport/chttp2/bin_decoder_test.cc index 17e7943742c..3db0fff7826 100644 --- a/test/core/transport/chttp2/bin_decoder_test.cc +++ b/test/core/transport/chttp2/bin_decoder_test.cc @@ -23,6 +23,7 @@ #include #include #include + #include "src/core/ext/transport/chttp2/transport/bin_encoder.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/test/core/transport/chttp2/bin_encoder_test.cc b/test/core/transport/chttp2/bin_encoder_test.cc index b7fe0962f29..6cf53be7e67 100644 --- a/test/core/transport/chttp2/bin_encoder_test.cc +++ b/test/core/transport/chttp2/bin_encoder_test.cc @@ -26,6 +26,7 @@ #include #include #include + #include "src/core/lib/gpr/string.h" #include "src/core/lib/slice/slice_string_helpers.h" #include "test/core/util/test_config.h" diff --git a/test/core/transport/chttp2/context_list_test.cc b/test/core/transport/chttp2/context_list_test.cc index 753034103d9..89ac6ac36bd 100644 --- a/test/core/transport/chttp2/context_list_test.cc +++ b/test/core/transport/chttp2/context_list_test.cc @@ -16,20 +16,21 @@ * */ -#include "src/core/lib/iomgr/port.h" +#include "src/core/ext/transport/chttp2/transport/context_list.h" -#include #include #include +#include + +#include + #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" -#include "src/core/ext/transport/chttp2/transport/context_list.h" +#include "src/core/lib/iomgr/port.h" #include "src/core/lib/transport/transport.h" #include "test/core/util/mock_endpoint.h" #include "test/core/util/test_config.h" -#include - namespace grpc_core { namespace testing { namespace { diff --git a/test/core/transport/chttp2/flow_control_test.cc b/test/core/transport/chttp2/flow_control_test.cc index e9d97ec4678..54ef1d8f643 100644 --- a/test/core/transport/chttp2/flow_control_test.cc +++ b/test/core/transport/chttp2/flow_control_test.cc @@ -18,6 +18,8 @@ #include +#include "src/core/ext/transport/chttp2/transport/flow_control.h" + #include #include @@ -36,11 +38,9 @@ #include #include "src/core/ext/filters/client_channel/backup_poller.h" -#include "src/core/ext/transport/chttp2/transport/flow_control.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/surface/channel.h" - #include "test/core/end2end/cq_verifier.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/transport/chttp2/hpack_encoder_index_test.cc b/test/core/transport/chttp2/hpack_encoder_index_test.cc index 2222b81b60b..e7286fbdea9 100644 --- a/test/core/transport/chttp2/hpack_encoder_index_test.cc +++ b/test/core/transport/chttp2/hpack_encoder_index_test.cc @@ -18,10 +18,12 @@ #include -#include +#include "src/core/ext/transport/chttp2/transport/hpack_encoder_index.h" + #include #include -#include "src/core/ext/transport/chttp2/transport/hpack_encoder_index.h" + +#include namespace grpc_core { namespace testing { diff --git a/test/core/transport/chttp2/hpack_utils_test.cc b/test/core/transport/chttp2/hpack_utils_test.cc index 635ec7ee31e..5cb89488bce 100644 --- a/test/core/transport/chttp2/hpack_utils_test.cc +++ b/test/core/transport/chttp2/hpack_utils_test.cc @@ -14,9 +14,11 @@ #include -#include #include #include + +#include + #include "src/core/ext/transport/chttp2/transport/hpack_encoder_index.h" namespace grpc_core { diff --git a/test/core/transport/chttp2/popularity_count_test.cc b/test/core/transport/chttp2/popularity_count_test.cc index 60d22269ab5..bcd03f11185 100644 --- a/test/core/transport/chttp2/popularity_count_test.cc +++ b/test/core/transport/chttp2/popularity_count_test.cc @@ -18,10 +18,12 @@ #include -#include -#include #include "src/core/ext/transport/chttp2/transport/popularity_count.h" +#include + +#include + namespace grpc_core { namespace testing { diff --git a/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc b/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc index 47b6ba2d308..8de38613743 100644 --- a/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc +++ b/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc @@ -39,7 +39,6 @@ #include "src/core/ext/transport/chttp2/transport/flow_control.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/host_port.h" - #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/transport/chttp2/settings_timeout_test.cc b/test/core/transport/chttp2/settings_timeout_test.cc index b7c015f19c3..7696d0415cd 100644 --- a/test/core/transport/chttp2/settings_timeout_test.cc +++ b/test/core/transport/chttp2/settings_timeout_test.cc @@ -37,7 +37,6 @@ #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/slice/slice_internal.h" - #include "test/core/util/port.h" #include "test/core/util/resource_user_util.h" #include "test/core/util/test_config.h" diff --git a/test/core/transport/chttp2/stream_map_test.cc b/test/core/transport/chttp2/stream_map_test.cc index fb03732c91b..3f63709ccc1 100644 --- a/test/core/transport/chttp2/stream_map_test.cc +++ b/test/core/transport/chttp2/stream_map_test.cc @@ -17,7 +17,9 @@ */ #include "src/core/ext/transport/chttp2/transport/stream_map.h" + #include + #include "test/core/util/test_config.h" #define LOG_TEST(x) gpr_log(GPR_INFO, "%s", x) diff --git a/test/core/transport/chttp2/too_many_pings_test.cc b/test/core/transport/chttp2/too_many_pings_test.cc index 57e5fa87c78..d1a6ec7c415 100644 --- a/test/core/transport/chttp2/too_many_pings_test.cc +++ b/test/core/transport/chttp2/too_many_pings_test.cc @@ -18,13 +18,15 @@ #include -#include #include #include + #include #include #include +#include + #include "absl/strings/str_cat.h" #include @@ -35,7 +37,6 @@ #include #include #include - #include #include @@ -51,13 +52,11 @@ #include "src/core/lib/security/security_connector/alts/alts_security_connector.h" #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/lib/surface/channel.h" - +#include "test/core/end2end/cq_verifier.h" #include "test/core/util/memory_counters.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" -#include "test/core/end2end/cq_verifier.h" - namespace { class TransportCounter { diff --git a/test/core/transport/error_utils_test.cc b/test/core/transport/error_utils_test.cc index 909a5b8a70a..d42a575009b 100644 --- a/test/core/transport/error_utils_test.cc +++ b/test/core/transport/error_utils_test.cc @@ -17,6 +17,7 @@ #include "src/core/lib/transport/error_utils.h" #include + #include "absl/status/status.h" #include "src/core/lib/slice/slice_internal.h" diff --git a/test/core/transport/pid_controller_test.cc b/test/core/transport/pid_controller_test.cc index ddc20daac60..b41a9b02941 100644 --- a/test/core/transport/pid_controller_test.cc +++ b/test/core/transport/pid_controller_test.cc @@ -21,11 +21,12 @@ #include #include +#include + #include #include #include -#include #include "src/core/lib/gpr/string.h" #include "test/core/util/test_config.h" diff --git a/test/core/transport/static_metadata_test.cc b/test/core/transport/static_metadata_test.cc index c0943905d60..bf225dcc747 100644 --- a/test/core/transport/static_metadata_test.cc +++ b/test/core/transport/static_metadata_test.cc @@ -16,12 +16,13 @@ * */ +#include "src/core/lib/transport/static_metadata.h" + #include #include #include "src/core/lib/transport/metadata.h" -#include "src/core/lib/transport/static_metadata.h" #include "test/core/util/test_config.h" namespace grpc_core { diff --git a/test/core/transport/status_conversion_test.cc b/test/core/transport/status_conversion_test.cc index 06deb1f8ccd..ef7e61703da 100644 --- a/test/core/transport/status_conversion_test.cc +++ b/test/core/transport/status_conversion_test.cc @@ -17,7 +17,9 @@ */ #include "src/core/lib/transport/status_conversion.h" + #include + #include "test/core/util/test_config.h" #define GRPC_STATUS_TO_HTTP2_ERROR(a, b) \ diff --git a/test/core/transport/status_metadata_test.cc b/test/core/transport/status_metadata_test.cc index d2e2631757d..720c3eb74d5 100644 --- a/test/core/transport/status_metadata_test.cc +++ b/test/core/transport/status_metadata_test.cc @@ -17,11 +17,12 @@ */ #include "src/core/lib/transport/status_metadata.h" -#include "src/core/lib/transport/static_metadata.h" -#include "test/core/util/test_config.h" #include +#include "src/core/lib/transport/static_metadata.h" +#include "test/core/util/test_config.h" + namespace { TEST(GetStatusCodeFromMetadata, OK) { diff --git a/test/core/transport/stream_owned_slice_test.cc b/test/core/transport/stream_owned_slice_test.cc index ca8140ca388..e7b76042f0c 100644 --- a/test/core/transport/stream_owned_slice_test.cc +++ b/test/core/transport/stream_owned_slice_test.cc @@ -16,13 +16,12 @@ * */ -#include "src/core/lib/transport/transport.h" - -#include "test/core/util/test_config.h" - #include #include +#include "src/core/lib/transport/transport.h" +#include "test/core/util/test_config.h" + static void do_nothing(void* /*arg*/, grpc_error_handle /*error*/) {} int main(int argc, char** argv) { diff --git a/test/core/tsi/alts/crypt/aes_gcm_test.cc b/test/core/tsi/alts/crypt/aes_gcm_test.cc index bfe4a8889bf..c7c86fb3ae3 100644 --- a/test/core/tsi/alts/crypt/aes_gcm_test.cc +++ b/test/core/tsi/alts/crypt/aes_gcm_test.cc @@ -16,13 +16,13 @@ * */ +#include +#include + #include "src/core/tsi/alts/crypt/gsec.h" #include "test/core/tsi/alts/crypt/gsec_test_util.h" #include "test/core/util/test_config.h" -#include -#include - const size_t kTestMinTagLengthForCorruption = 8; const size_t kTestNumCrypters = 3; const size_t kTestMaxSlices = 5; diff --git a/test/core/tsi/alts/fake_handshaker/fake_handshaker_server_main.cc b/test/core/tsi/alts/fake_handshaker/fake_handshaker_server_main.cc index 9e444e3124f..5f24e9a2729 100644 --- a/test/core/tsi/alts/fake_handshaker/fake_handshaker_server_main.cc +++ b/test/core/tsi/alts/fake_handshaker/fake_handshaker_server_main.cc @@ -15,13 +15,14 @@ * limitations under the License. * */ +#include + +#include "absl/flags/flag.h" + #include #include #include -#include - -#include "absl/flags/flag.h" #include "test/core/tsi/alts/fake_handshaker/fake_handshaker_server.h" #include "test/core/util/test_config.h" #include "test/cpp/util/test_config.h" diff --git a/test/core/tsi/alts/frame_protector/alts_counter_test.cc b/test/core/tsi/alts/frame_protector/alts_counter_test.cc index 9c5b790fa12..80fd95fb195 100644 --- a/test/core/tsi/alts/frame_protector/alts_counter_test.cc +++ b/test/core/tsi/alts/frame_protector/alts_counter_test.cc @@ -16,10 +16,11 @@ * */ +#include "src/core/tsi/alts/frame_protector/alts_counter.h" + #include #include -#include "src/core/tsi/alts/frame_protector/alts_counter.h" #include "test/core/tsi/alts/crypt/gsec_test_util.h" const size_t kSmallCounterSize = 4; diff --git a/test/core/tsi/alts/frame_protector/alts_crypter_test.cc b/test/core/tsi/alts/frame_protector/alts_crypter_test.cc index 02b7ebd77c1..05285442e71 100644 --- a/test/core/tsi/alts/frame_protector/alts_crypter_test.cc +++ b/test/core/tsi/alts/frame_protector/alts_crypter_test.cc @@ -16,6 +16,8 @@ * */ +#include "src/core/tsi/alts/frame_protector/alts_crypter.h" + #include #include #include @@ -23,7 +25,6 @@ #include #include -#include "src/core/tsi/alts/frame_protector/alts_crypter.h" #include "test/core/tsi/alts/crypt/gsec_test_util.h" static void alts_crypter_test_random_seal_unseal(alts_crypter* server_seal, diff --git a/test/core/tsi/alts/frame_protector/alts_frame_protector_test.cc b/test/core/tsi/alts/frame_protector/alts_frame_protector_test.cc index 7cca2c279db..3b75ecf66c5 100644 --- a/test/core/tsi/alts/frame_protector/alts_frame_protector_test.cc +++ b/test/core/tsi/alts/frame_protector/alts_frame_protector_test.cc @@ -16,13 +16,14 @@ * */ -#include -#include +#include "src/core/tsi/alts/frame_protector/alts_frame_protector.h" #include +#include +#include + #include "src/core/tsi/alts/crypt/gsec.h" -#include "src/core/tsi/alts/frame_protector/alts_frame_protector.h" #include "src/core/tsi/transport_security_interface.h" #include "test/core/tsi/alts/crypt/gsec_test_util.h" #include "test/core/tsi/transport_security_test_lib.h" diff --git a/test/core/tsi/alts/frame_protector/frame_handler_test.cc b/test/core/tsi/alts/frame_protector/frame_handler_test.cc index 8bfa5306cfd..0dee7c26500 100644 --- a/test/core/tsi/alts/frame_protector/frame_handler_test.cc +++ b/test/core/tsi/alts/frame_protector/frame_handler_test.cc @@ -16,6 +16,8 @@ * */ +#include "src/core/tsi/alts/frame_protector/frame_handler.h" + #include #include #include @@ -24,7 +26,6 @@ #include #include "src/core/lib/gpr/useful.h" -#include "src/core/tsi/alts/frame_protector/frame_handler.h" #include "test/core/tsi/alts/crypt/gsec_test_util.h" const size_t kFrameHandlerTestBufferSize = 1024; diff --git a/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc b/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc index 4cd87825f36..a5a12698db0 100644 --- a/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc +++ b/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc @@ -19,7 +19,6 @@ #include #include -#include #include #include #include @@ -27,10 +26,13 @@ #include #include #include + #include #include #include +#include + #include "absl/memory/memory.h" #include "absl/strings/str_cat.h" @@ -41,7 +43,6 @@ #include #include #include - #include #include @@ -53,14 +54,12 @@ #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/alts/alts_security_connector.h" #include "src/core/lib/slice/slice_string_helpers.h" - +#include "test/core/end2end/cq_verifier.h" #include "test/core/tsi/alts/fake_handshaker/fake_handshaker_server.h" #include "test/core/util/memory_counters.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" -#include "test/core/end2end/cq_verifier.h" - namespace { const int kFakeHandshakeServerMaxConcurrentStreams = 40; diff --git a/test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc b/test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc index 80c0b5d89e8..2a36f0aa368 100644 --- a/test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc +++ b/test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc @@ -16,11 +16,12 @@ * */ +#include "src/core/tsi/alts/handshaker/alts_handshaker_client.h" + #include "upb/upb.hpp" #include -#include "src/core/tsi/alts/handshaker/alts_handshaker_client.h" #include "src/core/tsi/alts/handshaker/alts_shared_resource.h" #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h" #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker_private.h" diff --git a/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc b/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc index 95a3dce71a6..0e373a0b88c 100644 --- a/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc +++ b/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc @@ -16,6 +16,8 @@ * */ +#include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h" + #include #include @@ -27,7 +29,6 @@ #include "src/core/lib/gprpp/thd.h" #include "src/core/tsi/alts/handshaker/alts_handshaker_client.h" #include "src/core/tsi/alts/handshaker/alts_shared_resource.h" -#include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h" #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker_private.h" #include "src/core/tsi/transport_security_grpc.h" #include "src/proto/grpc/gcp/altscontext.upb.h" diff --git a/test/core/tsi/alts/handshaker/alts_tsi_utils_test.cc b/test/core/tsi/alts/handshaker/alts_tsi_utils_test.cc index 528cb9b286b..54fb0cd6f5d 100644 --- a/test/core/tsi/alts/handshaker/alts_tsi_utils_test.cc +++ b/test/core/tsi/alts/handshaker/alts_tsi_utils_test.cc @@ -16,9 +16,10 @@ * */ +#include "src/core/tsi/alts/handshaker/alts_tsi_utils.h" + #include "upb/upb.hpp" -#include "src/core/tsi/alts/handshaker/alts_tsi_utils.h" #include "test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.h" #include "test/core/util/test_config.h" diff --git a/test/core/tsi/alts/handshaker/transport_security_common_api_test.cc b/test/core/tsi/alts/handshaker/transport_security_common_api_test.cc index bc147d24ebd..7579ed1014d 100644 --- a/test/core/tsi/alts/handshaker/transport_security_common_api_test.cc +++ b/test/core/tsi/alts/handshaker/transport_security_common_api_test.cc @@ -16,12 +16,12 @@ * */ +#include "src/core/tsi/alts/handshaker/transport_security_common_api.h" + #include #include #include -#include "src/core/tsi/alts/handshaker/transport_security_common_api.h" - const size_t kMaxRpcVersionMajor = 3; const size_t kMaxRpcVersionMinor = 2; const size_t kMinRpcVersionMajor = 2; diff --git a/test/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_test.cc b/test/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_test.cc index 7d7c518354c..8b14ea0ecfe 100644 --- a/test/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_test.cc +++ b/test/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_test.cc @@ -16,6 +16,8 @@ * */ +#include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol.h" + #include #include @@ -23,7 +25,6 @@ #include "src/core/lib/slice/slice_internal.h" #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h" #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h" -#include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol.h" #include "src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h" #include "test/core/tsi/alts/crypt/gsec_test_util.h" #include "test/core/util/test_config.h" diff --git a/test/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol_test.cc b/test/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol_test.cc index 8b0e39cbb34..9096b6627c5 100644 --- a/test/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol_test.cc +++ b/test/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol_test.cc @@ -16,10 +16,11 @@ * */ +#include "src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h" + #include #include -#include "src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h" #include "test/core/tsi/alts/crypt/gsec_test_util.h" constexpr size_t kMaxDataSize = 1024; diff --git a/test/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector_test.cc b/test/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector_test.cc index 8bd9eab14e6..62b3a4b767f 100644 --- a/test/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector_test.cc +++ b/test/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector_test.cc @@ -16,6 +16,8 @@ * */ +#include "src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h" + #include #include #include @@ -23,7 +25,6 @@ #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/tsi/alts/crypt/gsec.h" -#include "src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h" #include "src/core/tsi/transport_security_grpc.h" #include "test/core/tsi/alts/crypt/gsec_test_util.h" #include "test/core/util/test_config.h" diff --git a/test/core/tsi/fake_transport_security_test.cc b/test/core/tsi/fake_transport_security_test.cc index ac491ab07f7..9e1aaf20b3f 100644 --- a/test/core/tsi/fake_transport_security_test.cc +++ b/test/core/tsi/fake_transport_security_test.cc @@ -16,20 +16,21 @@ * */ +#include "src/core/tsi/fake_transport_security.h" + #include #include #include +#include +#include +#include + #include "src/core/lib/security/security_connector/security_connector.h" -#include "src/core/tsi/fake_transport_security.h" #include "src/core/tsi/transport_security.h" #include "test/core/tsi/transport_security_test_lib.h" #include "test/core/util/test_config.h" -#include -#include -#include - typedef struct fake_tsi_test_fixture { tsi_test_fixture base; } fake_tsi_test_fixture; diff --git a/test/core/tsi/ssl_session_cache_test.cc b/test/core/tsi/ssl_session_cache_test.cc index 33f3467c9c8..353d75f8f49 100644 --- a/test/core/tsi/ssl_session_cache_test.cc +++ b/test/core/tsi/ssl_session_cache_test.cc @@ -16,15 +16,17 @@ * */ +#include "src/core/tsi/ssl/session_cache/ssl_session_cache.h" + #include #include -#include "src/core/tsi/ssl/session_cache/ssl_session_cache.h" -#include "test/core/util/test_config.h" +#include #include #include -#include + +#include "test/core/util/test_config.h" namespace grpc_core { diff --git a/test/core/tsi/ssl_transport_security_test.cc b/test/core/tsi/ssl_transport_security_test.cc index 53bd59e55ed..eeec4693575 100644 --- a/test/core/tsi/ssl_transport_security_test.cc +++ b/test/core/tsi/ssl_transport_security_test.cc @@ -18,13 +18,14 @@ #include "src/core/tsi/ssl_transport_security.h" +#include +#include +#include + #include #include #include #include -#include -#include -#include #include "src/core/lib/iomgr/load_file.h" #include "src/core/lib/security/security_connector/security_connector.h" diff --git a/test/core/tsi/transport_security_test.cc b/test/core/tsi/transport_security_test.cc index eb88eaf4912..6000daed04a 100644 --- a/test/core/tsi/transport_security_test.cc +++ b/test/core/tsi/transport_security_test.cc @@ -22,14 +22,14 @@ #include +#include + #include "absl/strings/str_format.h" #include #include #include -#include - #include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" #include "src/core/tsi/fake_transport_security.h" diff --git a/test/core/tsi/transport_security_test_lib.cc b/test/core/tsi/transport_security_test_lib.cc index f0c428ab88b..307ca5711f6 100644 --- a/test/core/tsi/transport_security_test_lib.cc +++ b/test/core/tsi/transport_security_test_lib.cc @@ -16,6 +16,8 @@ * */ +#include "test/core/tsi/transport_security_test_lib.h" + #include #include #include @@ -25,7 +27,6 @@ #include #include "src/core/lib/security/transport/tsi_error.h" -#include "test/core/tsi/transport_security_test_lib.h" static void notification_signal(tsi_test_fixture* fixture) { gpr_mu_lock(&fixture->mu); diff --git a/test/core/tsi/transport_security_test_lib.h b/test/core/tsi/transport_security_test_lib.h index b6a431f5a03..358b94dbe5c 100644 --- a/test/core/tsi/transport_security_test_lib.h +++ b/test/core/tsi/transport_security_test_lib.h @@ -19,10 +19,10 @@ #ifndef GRPC_TEST_CORE_TSI_TRANSPORT_SECURITY_TEST_LIB_H_ #define GRPC_TEST_CORE_TSI_TRANSPORT_SECURITY_TEST_LIB_H_ -#include "src/core/tsi/transport_security_interface.h" - #include +#include "src/core/tsi/transport_security_interface.h" + #define TSI_TEST_TINY_HANDSHAKE_BUFFER_SIZE 32 #define TSI_TEST_SMALL_HANDSHAKE_BUFFER_SIZE 128 #define TSI_TEST_SMALL_READ_BUFFER_ALLOCATED_SIZE 41 diff --git a/test/core/uri/uri_parser_test.cc b/test/core/uri/uri_parser_test.cc index 5f8fceeb0cb..71b32b2b004 100644 --- a/test/core/uri/uri_parser_test.cc +++ b/test/core/uri/uri_parser_test.cc @@ -18,13 +18,14 @@ #include "src/core/lib/uri/uri_parser.h" +#include +#include + #include "absl/strings/str_join.h" #include "absl/strings/str_split.h" -#include #include #include -#include #include "test/core/util/test_config.h" diff --git a/test/core/util/cmdline.cc b/test/core/util/cmdline.cc index 23e52e6f8f4..c91a2f652bf 100644 --- a/test/core/util/cmdline.cc +++ b/test/core/util/cmdline.cc @@ -31,6 +31,7 @@ #include #include #include + #include "src/core/lib/gpr/string.h" typedef enum { ARGTYPE_INT, ARGTYPE_BOOL, ARGTYPE_STRING } argtype; diff --git a/test/core/util/cmdline_test.cc b/test/core/util/cmdline_test.cc index c1eb5e39a0f..3a1e6e710d8 100644 --- a/test/core/util/cmdline_test.cc +++ b/test/core/util/cmdline_test.cc @@ -16,13 +16,14 @@ * */ +#include "test/core/util/cmdline.h" + #include #include #include #include "src/core/lib/gpr/useful.h" -#include "test/core/util/cmdline.h" #include "test/core/util/test_config.h" #define LOG_TEST() gpr_log(GPR_INFO, "test at %s:%d", __FILE__, __LINE__) diff --git a/test/core/util/fuzzer_corpus_test.cc b/test/core/util/fuzzer_corpus_test.cc index ca5201ed0ac..d2180c26706 100644 --- a/test/core/util/fuzzer_corpus_test.cc +++ b/test/core/util/fuzzer_corpus_test.cc @@ -17,15 +17,18 @@ */ #include -#include -#include -#include -#include #include #include #include +#include + #include "absl/flags/flag.h" + +#include +#include +#include + #include "src/core/lib/gpr/env.h" #include "src/core/lib/iomgr/load_file.h" #include "test/core/util/test_config.h" diff --git a/test/core/util/histogram.cc b/test/core/util/histogram.cc index afb2c16c91e..f60f705136b 100644 --- a/test/core/util/histogram.cc +++ b/test/core/util/histogram.cc @@ -16,6 +16,8 @@ * */ +#include + #include "test/core/util/histogram.h" #include @@ -24,7 +26,6 @@ #include #include -#include #include "src/core/lib/gpr/useful.h" diff --git a/test/core/util/histogram.h b/test/core/util/histogram.h index 9d4985e64fb..9e872869bf3 100644 --- a/test/core/util/histogram.h +++ b/test/core/util/histogram.h @@ -20,6 +20,7 @@ #define GRPC_SUPPORT_HISTOGRAM_H #include + #include #ifdef __cplusplus diff --git a/test/core/util/histogram_test.cc b/test/core/util/histogram_test.cc index b96ac7d8419..3ff92a31e1f 100644 --- a/test/core/util/histogram_test.cc +++ b/test/core/util/histogram_test.cc @@ -17,6 +17,7 @@ */ #include "test/core/util/histogram.h" + #include #define LOG_TEST(x) gpr_log(GPR_INFO, "%s", x); diff --git a/test/core/util/memory_counters.cc b/test/core/util/memory_counters.cc index ddd8d2f283f..0deb1a4d37c 100644 --- a/test/core/util/memory_counters.cc +++ b/test/core/util/memory_counters.cc @@ -16,8 +16,11 @@ * */ +#include "test/core/util/memory_counters.h" + #include #include +#include #include #include @@ -28,9 +31,6 @@ #include "src/core/lib/gpr/alloc.h" #include "src/core/lib/surface/init.h" -#include "test/core/util/memory_counters.h" - -#include static struct grpc_memory_counters g_memory_counters; static bool g_memory_counter_enabled; diff --git a/test/core/util/mock_endpoint.cc b/test/core/util/mock_endpoint.cc index 204a9b8ef42..f3fa7a3e8d0 100644 --- a/test/core/util/mock_endpoint.cc +++ b/test/core/util/mock_endpoint.cc @@ -16,7 +16,7 @@ * */ -#include "src/core/lib/iomgr/sockaddr.h" +#include "test/core/util/mock_endpoint.h" #include @@ -24,10 +24,9 @@ #include "absl/strings/str_format.h" -#include "test/core/util/mock_endpoint.h" - #include #include + #include "src/core/lib/iomgr/sockaddr.h" typedef struct mock_endpoint { diff --git a/test/core/util/one_corpus_entry_fuzzer.cc b/test/core/util/one_corpus_entry_fuzzer.cc index 2f376d6853f..fa0f04f0255 100644 --- a/test/core/util/one_corpus_entry_fuzzer.cc +++ b/test/core/util/one_corpus_entry_fuzzer.cc @@ -19,8 +19,8 @@ #include #include - #include + #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/load_file.h" diff --git a/test/core/util/parse_hexstring.cc b/test/core/util/parse_hexstring.cc index cd64843bd32..a65ef999511 100644 --- a/test/core/util/parse_hexstring.cc +++ b/test/core/util/parse_hexstring.cc @@ -17,6 +17,7 @@ */ #include "test/core/util/parse_hexstring.h" + #include grpc_slice parse_hexstring(const char* hexstring) { diff --git a/test/core/util/passthru_endpoint.cc b/test/core/util/passthru_endpoint.cc index 7bc40f78624..50534f7ae9d 100644 --- a/test/core/util/passthru_endpoint.cc +++ b/test/core/util/passthru_endpoint.cc @@ -16,8 +16,6 @@ * */ -#include "src/core/lib/iomgr/sockaddr.h" - #include "test/core/util/passthru_endpoint.h" #include @@ -29,8 +27,8 @@ #include #include -#include "src/core/lib/iomgr/sockaddr.h" +#include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/slice/slice_internal.h" #include "test/core/util/resource_user_util.h" diff --git a/test/core/util/port.cc b/test/core/util/port.cc index 391f472ac68..5a2e06266e5 100644 --- a/test/core/util/port.cc +++ b/test/core/util/port.cc @@ -17,11 +17,10 @@ */ #include "src/core/lib/iomgr/port.h" + #include "test/core/util/test_config.h" #if defined(GRPC_TEST_PICK_PORT) -#include "test/core/util/port.h" - #include #include #include @@ -34,6 +33,7 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/http/httpcli.h" #include "src/core/lib/iomgr/resolve_address.h" +#include "test/core/util/port.h" #include "test/core/util/port_server_client.h" static int* chosen_ports = nullptr; diff --git a/test/core/util/port_isolated_runtime_environment.cc b/test/core/util/port_isolated_runtime_environment.cc index 5e043e7f970..6d32aeb4cd1 100644 --- a/test/core/util/port_isolated_runtime_environment.cc +++ b/test/core/util/port_isolated_runtime_environment.cc @@ -20,10 +20,12 @@ * runs in a separate container) the framework takes a round-robin pick of a * port within certain range. There is no need to recycle ports. */ +#include + #include #include #include -#include + #include "src/core/lib/iomgr/port.h" #include "test/core/util/test_config.h" #if defined(GRPC_PORT_ISOLATED_RUNTIME) diff --git a/test/core/util/port_server_client.cc b/test/core/util/port_server_client.cc index 50d238075a1..70a253f17c2 100644 --- a/test/core/util/port_server_client.cc +++ b/test/core/util/port_server_client.cc @@ -17,11 +17,10 @@ */ #include + #include "test/core/util/test_config.h" #ifdef GRPC_TEST_PICK_PORT -#include "test/core/util/port_server_client.h" - #include #include @@ -33,6 +32,7 @@ #include #include "src/core/lib/http/httpcli.h" +#include "test/core/util/port_server_client.h" typedef struct freereq { gpr_mu* mu = nullptr; diff --git a/test/core/util/reconnect_server.cc b/test/core/util/reconnect_server.cc index d23eb100f5f..93a149bf6fd 100644 --- a/test/core/util/reconnect_server.cc +++ b/test/core/util/reconnect_server.cc @@ -18,15 +18,17 @@ #include "test/core/util/reconnect_server.h" +#include + +#include "absl/strings/string_view.h" + #include #include #include #include #include #include -#include -#include "absl/strings/string_view.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/tcp_server.h" diff --git a/test/core/util/reconnect_server.h b/test/core/util/reconnect_server.h index f7264dd156f..912624fa5e8 100644 --- a/test/core/util/reconnect_server.h +++ b/test/core/util/reconnect_server.h @@ -21,6 +21,7 @@ #include #include + #include "test/core/util/test_tcp_server.h" typedef struct timestamp_list { diff --git a/test/core/util/stack_tracer_test.cc b/test/core/util/stack_tracer_test.cc index d75df70d3ad..3687fdde467 100644 --- a/test/core/util/stack_tracer_test.cc +++ b/test/core/util/stack_tracer_test.cc @@ -18,9 +18,10 @@ #include "test/core/util/stack_tracer.h" -#include #include +#include + #include "absl/debugging/symbolize.h" #include "absl/strings/match.h" diff --git a/test/core/util/subprocess_windows.cc b/test/core/util/subprocess_windows.cc index d3295244eac..7d69af1368f 100644 --- a/test/core/util/subprocess_windows.cc +++ b/test/core/util/subprocess_windows.cc @@ -26,6 +26,7 @@ #include #include + #include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/string_windows.h" #include "test/core/util/subprocess.h" diff --git a/test/core/util/test_config.cc b/test/core/util/test_config.cc index 15166153812..09952c0b349 100644 --- a/test/core/util/test_config.cc +++ b/test/core/util/test_config.cc @@ -18,7 +18,6 @@ #include "test/core/util/test_config.h" -#include #include #include #include @@ -26,7 +25,11 @@ #include #include +#include "absl/debugging/failure_signal_handler.h" +#include "absl/debugging/symbolize.h" + #include +#include #include #include @@ -36,9 +39,6 @@ #include "src/core/lib/surface/init.h" #include "test/core/util/stack_tracer.h" -#include "absl/debugging/failure_signal_handler.h" -#include "absl/debugging/symbolize.h" - int64_t g_fixture_slowdown_factor = 1; int64_t g_poller_slowdown_factor = 1; diff --git a/test/core/util/test_tcp_server.cc b/test/core/util/test_tcp_server.cc index 1baa1e75390..048d2f9d946 100644 --- a/test/core/util/test_tcp_server.cc +++ b/test/core/util/test_tcp_server.cc @@ -16,20 +16,20 @@ * */ -#include "src/core/lib/iomgr/sockaddr.h" -#include "src/core/lib/iomgr/socket_utils.h" - #include "test/core/util/test_tcp_server.h" +#include + #include #include #include #include #include -#include #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/resolve_address.h" +#include "src/core/lib/iomgr/sockaddr.h" +#include "src/core/lib/iomgr/socket_utils.h" #include "src/core/lib/iomgr/tcp_server.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/util/test_tcp_server.h b/test/core/util/test_tcp_server.h index 549b47b259b..a06dde8ace8 100644 --- a/test/core/util/test_tcp_server.h +++ b/test/core/util/test_tcp_server.h @@ -22,6 +22,7 @@ #include #include + #include "src/core/lib/iomgr/tcp_server.h" // test_tcp_server should be stack-allocated or new'ed, never gpr_malloc'ed diff --git a/test/core/util/tracer_util.cc b/test/core/util/tracer_util.cc index dc5a45568cb..e48ae0cc9be 100644 --- a/test/core/util/tracer_util.cc +++ b/test/core/util/tracer_util.cc @@ -16,9 +16,8 @@ * */ -#include "test/core/util/test_config.h" - #include "src/core/lib/debug/trace.h" +#include "test/core/util/test_config.h" namespace grpc_core { namespace testing { diff --git a/test/core/util/trickle_endpoint.cc b/test/core/util/trickle_endpoint.cc index f88212f1f92..f0e872a07ab 100644 --- a/test/core/util/trickle_endpoint.cc +++ b/test/core/util/trickle_endpoint.cc @@ -16,10 +16,6 @@ * */ -#include "src/core/lib/iomgr/sockaddr.h" - -#include "test/core/util/passthru_endpoint.h" - #include #include @@ -28,7 +24,9 @@ #include #include "src/core/lib/gpr/useful.h" +#include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/slice/slice_internal.h" +#include "test/core/util/passthru_endpoint.h" #define WRITE_BUFFER_SIZE (2 * 1024 * 1024) diff --git a/test/core/xds/certificate_provider_store_test.cc b/test/core/xds/certificate_provider_store_test.cc index 211e46ed357..b82bf0a8ef7 100644 --- a/test/core/xds/certificate_provider_store_test.cc +++ b/test/core/xds/certificate_provider_store_test.cc @@ -16,13 +16,13 @@ // // +#include "src/core/ext/xds/certificate_provider_store.h" + #include #include #include "src/core/ext/xds/certificate_provider_registry.h" -#include "src/core/ext/xds/certificate_provider_store.h" - #include "test/core/util/test_config.h" namespace grpc_core { diff --git a/test/core/xds/file_watcher_certificate_provider_factory_test.cc b/test/core/xds/file_watcher_certificate_provider_factory_test.cc index 5157634ec7f..bba2f3749bd 100644 --- a/test/core/xds/file_watcher_certificate_provider_factory_test.cc +++ b/test/core/xds/file_watcher_certificate_provider_factory_test.cc @@ -18,11 +18,11 @@ #include "src/core/ext/xds/file_watcher_certificate_provider_factory.h" -#include "absl/strings/str_format.h" - #include #include +#include "absl/strings/str_format.h" + #include #include "test/core/util/test_config.h" diff --git a/test/core/xds/google_mesh_ca_certificate_provider_factory_test.cc b/test/core/xds/google_mesh_ca_certificate_provider_factory_test.cc index bf72df295b4..8c6af3e1f64 100644 --- a/test/core/xds/google_mesh_ca_certificate_provider_factory_test.cc +++ b/test/core/xds/google_mesh_ca_certificate_provider_factory_test.cc @@ -16,12 +16,13 @@ // // +#include "src/core/ext/xds/google_mesh_ca_certificate_provider_factory.h" + #include #include #include -#include "src/core/ext/xds/google_mesh_ca_certificate_provider_factory.h" #include "test/core/util/test_config.h" namespace grpc_core { diff --git a/test/core/xds/xds_bootstrap_test.cc b/test/core/xds/xds_bootstrap_test.cc index 2b90a5fd2a2..55b94fd2f30 100644 --- a/test/core/xds/xds_bootstrap_test.cc +++ b/test/core/xds/xds_bootstrap_test.cc @@ -14,19 +14,20 @@ // limitations under the License. // -#include +#include "src/core/ext/xds/xds_bootstrap.h" -#include "absl/strings/numbers.h" -#include "absl/strings/str_format.h" +#include #include #include +#include "absl/strings/numbers.h" +#include "absl/strings/str_format.h" + #include #include #include "src/core/ext/xds/certificate_provider_registry.h" -#include "src/core/ext/xds/xds_bootstrap.h" #include "src/core/lib/gpr/env.h" #include "src/core/lib/gpr/tmpfile.h" #include "test/core/util/test_config.h" diff --git a/test/core/xds/xds_certificate_provider_test.cc b/test/core/xds/xds_certificate_provider_test.cc index 32e2bcb1697..147eff3d0f8 100644 --- a/test/core/xds/xds_certificate_provider_test.cc +++ b/test/core/xds/xds_certificate_provider_test.cc @@ -16,10 +16,11 @@ // // +#include "src/core/ext/xds/xds_certificate_provider.h" + #include #include -#include "src/core/ext/xds/xds_certificate_provider.h" #include "test/core/util/test_config.h" #include "test/core/util/tls_utils.h" diff --git a/test/cpp/client/client_channel_stress_test.cc b/test/cpp/client/client_channel_stress_test.cc index a3c5ed2d151..6a1b2efc835 100644 --- a/test/cpp/client/client_channel_stress_test.cc +++ b/test/cpp/client/client_channel_stress_test.cc @@ -46,14 +46,12 @@ #include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/transport/authority_override.h" - +#include "src/proto/grpc/lb/v1/load_balancer.grpc.pb.h" +#include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" #include "test/cpp/end2end/test_service_impl.h" -#include "src/proto/grpc/lb/v1/load_balancer.grpc.pb.h" -#include "src/proto/grpc/testing/echo.grpc.pb.h" - using grpc::lb::v1::LoadBalancer; using grpc::lb::v1::LoadBalanceRequest; using grpc::lb::v1::LoadBalanceResponse; diff --git a/test/cpp/client/credentials_test.cc b/test/cpp/client/credentials_test.cc index 122ba929274..cc140da29e7 100644 --- a/test/cpp/client/credentials_test.cc +++ b/test/cpp/client/credentials_test.cc @@ -16,16 +16,17 @@ * */ +#include + #include +#include + #include #include #include #include #include #include -#include - -#include #include "src/core/lib/gpr/env.h" #include "src/core/lib/gpr/tmpfile.h" diff --git a/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc b/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc index ab458d45ec5..7b5fa992ba4 100644 --- a/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc +++ b/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc @@ -44,7 +44,6 @@ #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/sockaddr.h" - #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/cpp/codegen/codegen_test_full.cc b/test/cpp/codegen/codegen_test_full.cc index a61e24baa7c..b0b46b63e36 100644 --- a/test/cpp/codegen/codegen_test_full.cc +++ b/test/cpp/codegen/codegen_test_full.cc @@ -16,9 +16,10 @@ * */ +#include + #include #include -#include #include "test/core/util/test_config.h" diff --git a/test/cpp/codegen/golden_file_test.cc b/test/cpp/codegen/golden_file_test.cc index bc87cc2aa5d..9af017e2f1e 100644 --- a/test/cpp/codegen/golden_file_test.cc +++ b/test/cpp/codegen/golden_file_test.cc @@ -16,12 +16,13 @@ * */ -#include - #include #include +#include + #include "absl/flags/flag.h" + #include "test/core/util/test_config.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/codegen/proto_utils_test.cc b/test/cpp/codegen/proto_utils_test.cc index 1013ccef10b..da2ec6371e3 100644 --- a/test/cpp/codegen/proto_utils_test.cc +++ b/test/cpp/codegen/proto_utils_test.cc @@ -16,12 +16,13 @@ * */ +#include + #include #include #include #include #include -#include #include "test/core/util/test_config.h" diff --git a/test/cpp/common/alarm_test.cc b/test/cpp/common/alarm_test.cc index 6238caaa020..4a347f138c2 100644 --- a/test/cpp/common/alarm_test.cc +++ b/test/cpp/common/alarm_test.cc @@ -21,11 +21,11 @@ #include #include +#include + #include #include -#include - #include "test/core/util/test_config.h" namespace grpc { diff --git a/test/cpp/common/alts_util_test.cc b/test/cpp/common/alts_util_test.cc index 67c24b2818c..f22385aa251 100644 --- a/test/cpp/common/alts_util_test.cc +++ b/test/cpp/common/alts_util_test.cc @@ -16,12 +16,13 @@ * */ +#include + #include "upb/upb.hpp" #include #include #include -#include #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h" #include "src/cpp/common/secure_auth_context.h" diff --git a/test/cpp/common/auth_property_iterator_test.cc b/test/cpp/common/auth_property_iterator_test.cc index 5a2844d518a..5a6084be7f0 100644 --- a/test/cpp/common/auth_property_iterator_test.cc +++ b/test/cpp/common/auth_property_iterator_test.cc @@ -16,13 +16,14 @@ * */ +#include + #include #include -#include -#include "src/cpp/common/secure_auth_context.h" -#include "test/cpp/util/string_ref_helper.h" #include "src/core/lib/security/context/security_context.h" +#include "src/cpp/common/secure_auth_context.h" +#include "test/cpp/util/string_ref_helper.h" using ::grpc::testing::ToString; diff --git a/test/cpp/common/channel_arguments_test.cc b/test/cpp/common/channel_arguments_test.cc index 6765bb31afb..b1e7ee1eb3e 100644 --- a/test/cpp/common/channel_arguments_test.cc +++ b/test/cpp/common/channel_arguments_test.cc @@ -16,11 +16,11 @@ * */ -#include +#include #include #include -#include +#include #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/test/cpp/common/channel_filter_test.cc b/test/cpp/common/channel_filter_test.cc index c077930be7a..139c0313ad7 100644 --- a/test/cpp/common/channel_filter_test.cc +++ b/test/cpp/common/channel_filter_test.cc @@ -18,9 +18,10 @@ #include -#include #include +#include + namespace grpc { namespace testing { diff --git a/test/cpp/common/secure_auth_context_test.cc b/test/cpp/common/secure_auth_context_test.cc index 03b3a9fdd8e..fcae9ba1bfe 100644 --- a/test/cpp/common/secure_auth_context_test.cc +++ b/test/cpp/common/secure_auth_context_test.cc @@ -17,12 +17,14 @@ */ #include "src/cpp/common/secure_auth_context.h" + +#include + #include #include -#include -#include "test/cpp/util/string_ref_helper.h" #include "src/core/lib/security/context/security_context.h" +#include "test/cpp/util/string_ref_helper.h" using grpc::testing::ToString; diff --git a/test/cpp/common/time_jump_test.cc b/test/cpp/common/time_jump_test.cc index f6ff40feb69..91643a7501b 100644 --- a/test/cpp/common/time_jump_test.cc +++ b/test/cpp/common/time_jump_test.cc @@ -17,14 +17,18 @@ */ #include + #include #include #include #include +#include + +#include "absl/time/time.h" + #include #include -#include #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/closure.h" @@ -34,8 +38,6 @@ #include "src/core/lib/iomgr/timer_manager.h" #include "test/core/util/test_config.h" -#include "absl/time/time.h" - extern char** environ; #ifdef GPR_ANDROID diff --git a/test/cpp/common/timer_test.cc b/test/cpp/common/timer_test.cc index dca02156820..2a802461010 100644 --- a/test/cpp/common/timer_test.cc +++ b/test/cpp/common/timer_test.cc @@ -16,14 +16,16 @@ * */ +#include "src/core/lib/iomgr/timer.h" + +#include + #include #include -#include #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/lib/iomgr/timer.h" #include "src/core/lib/iomgr/timer_manager.h" #include "test/core/util/test_config.h" diff --git a/test/cpp/end2end/admin_services_end2end_test.cc b/test/cpp/end2end/admin_services_end2end_test.cc index 4d9c3892d1b..b1baccc83e8 100644 --- a/test/cpp/end2end/admin_services_end2end_test.cc +++ b/test/cpp/end2end/admin_services_end2end_test.cc @@ -21,6 +21,7 @@ #include "absl/strings/str_cat.h" +#include #include #include @@ -28,8 +29,6 @@ #include "test/core/util/port.h" #include "test/core/util/test_config.h" -#include - namespace grpc { namespace testing { diff --git a/test/cpp/end2end/async_end2end_test.cc b/test/cpp/end2end/async_end2end_test.cc index c97bd8a4af5..71e8d2e5eeb 100644 --- a/test/cpp/end2end/async_end2end_test.cc +++ b/test/cpp/end2end/async_end2end_test.cc @@ -20,6 +20,8 @@ #include #include +#include "absl/memory/memory.h" + #include #include #include @@ -32,8 +34,6 @@ #include #include -#include "absl/memory/memory.h" - #include "src/core/ext/filters/client_channel/backup_poller.h" #include "src/core/lib/gpr/tls.h" #include "src/core/lib/iomgr/port.h" diff --git a/test/cpp/end2end/cfstream_test.cc b/test/cpp/end2end/cfstream_test.cc index 9d04020ad29..a5e65cb2f65 100644 --- a/test/cpp/end2end/cfstream_test.cc +++ b/test/cpp/end2end/cfstream_test.cc @@ -16,14 +16,14 @@ * */ -#include "src/core/lib/iomgr/port.h" - #include #include #include #include #include +#include + #include #include #include @@ -36,11 +36,10 @@ #include #include #include -#include #include "src/core/lib/backoff/backoff.h" #include "src/core/lib/gpr/env.h" - +#include "src/core/lib/iomgr/port.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/cpp/end2end/channelz_service_test.cc b/test/cpp/end2end/channelz_service_test.cc index 3b5aa508c90..6395f7a43d0 100644 --- a/test/cpp/end2end/channelz_service_test.cc +++ b/test/cpp/end2end/channelz_service_test.cc @@ -18,6 +18,10 @@ #include +#include + +#include "absl/memory/memory.h" + #include #include #include @@ -30,8 +34,6 @@ #include #include -#include "absl/memory/memory.h" - #include "src/core/lib/gpr/env.h" #include "src/core/lib/iomgr/load_file.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" @@ -45,8 +47,6 @@ #include "test/cpp/end2end/test_service_impl.h" #include "test/cpp/util/test_credentials_provider.h" -#include - using grpc::channelz::v1::Address; using grpc::channelz::v1::GetChannelRequest; using grpc::channelz::v1::GetChannelResponse; diff --git a/test/cpp/end2end/client_callback_end2end_test.cc b/test/cpp/end2end/client_callback_end2end_test.cc index f4338e1aaaa..9118d96a07f 100644 --- a/test/cpp/end2end/client_callback_end2end_test.cc +++ b/test/cpp/end2end/client_callback_end2end_test.cc @@ -16,6 +16,17 @@ * */ +#include +#include +#include +#include +#include +#include + +#include + +#include "absl/memory/memory.h" + #include #include #include @@ -25,16 +36,7 @@ #include #include #include -#include - -#include -#include -#include -#include -#include -#include -#include "absl/memory/memory.h" #include "src/core/lib/gpr/env.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/end2end/client_crash_test.cc b/test/cpp/end2end/client_crash_test.cc index 5ac8f2ec041..e34186bedb3 100644 --- a/test/cpp/end2end/client_crash_test.cc +++ b/test/cpp/end2end/client_crash_test.cc @@ -16,6 +16,10 @@ * */ +#include + +#include "absl/memory/memory.h" + #include #include #include @@ -26,16 +30,12 @@ #include #include -#include "absl/memory/memory.h" - #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" #include "test/cpp/util/subprocess.h" -#include - using grpc::testing::EchoRequest; using grpc::testing::EchoResponse; diff --git a/test/cpp/end2end/client_crash_test_server.cc b/test/cpp/end2end/client_crash_test_server.cc index 1adf98d1461..5b8a533f2bc 100644 --- a/test/cpp/end2end/client_crash_test_server.cc +++ b/test/cpp/end2end/client_crash_test_server.cc @@ -16,16 +16,17 @@ * */ -#include -#include -#include -#include - #include #include #include #include "absl/flags/flag.h" + +#include +#include +#include +#include + #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/end2end/client_interceptors_end2end_test.cc b/test/cpp/end2end/client_interceptors_end2end_test.cc index 8035134ab2c..9a792ca7e6d 100644 --- a/test/cpp/end2end/client_interceptors_end2end_test.cc +++ b/test/cpp/end2end/client_interceptors_end2end_test.cc @@ -19,6 +19,8 @@ #include #include +#include + #include "absl/memory/memory.h" #include @@ -44,11 +46,10 @@ #ifdef GRPC_POSIX_SOCKET #include + #include "src/core/lib/iomgr/socket_utils_posix.h" #endif /* GRPC_POSIX_SOCKET */ -#include - namespace grpc { namespace testing { namespace { diff --git a/test/cpp/end2end/client_lb_end2end_test.cc b/test/cpp/end2end/client_lb_end2end_test.cc index 761dd49fc2d..90f633d5934 100644 --- a/test/cpp/end2end/client_lb_end2end_test.cc +++ b/test/cpp/end2end/client_lb_end2end_test.cc @@ -24,6 +24,9 @@ #include #include +#include +#include + #include "absl/memory/memory.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" @@ -57,7 +60,6 @@ #include "src/core/lib/security/credentials/fake/fake_credentials.h" #include "src/cpp/client/secure_credentials.h" #include "src/cpp/server/secure_server_credentials.h" - #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "src/proto/grpc/testing/xds/orca_load_report_for_test.pb.h" #include "test/core/util/port.h" @@ -66,9 +68,6 @@ #include "test/core/util/test_lb_policies.h" #include "test/cpp/end2end/test_service_impl.h" -#include -#include - using grpc::testing::EchoRequest; using grpc::testing::EchoResponse; diff --git a/test/cpp/end2end/context_allocator_end2end_test.cc b/test/cpp/end2end/context_allocator_end2end_test.cc index a2e202da116..67e8cddbc47 100644 --- a/test/cpp/end2end/context_allocator_end2end_test.cc +++ b/test/cpp/end2end/context_allocator_end2end_test.cc @@ -16,6 +16,17 @@ * */ +#include +#include +#include +#include +#include +#include +#include +#include + +#include + #include #include #include @@ -25,16 +36,6 @@ #include #include #include -#include - -#include -#include -#include -#include -#include -#include -#include -#include #include "src/core/lib/iomgr/iomgr.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/end2end/delegating_channel_test.cc b/test/cpp/end2end/delegating_channel_test.cc index 5ff66d8ffd1..0c065e630a6 100644 --- a/test/cpp/end2end/delegating_channel_test.cc +++ b/test/cpp/end2end/delegating_channel_test.cc @@ -19,6 +19,8 @@ #include #include +#include + #include #include #include @@ -37,8 +39,6 @@ #include "test/cpp/util/byte_buffer_proto_helper.h" #include "test/cpp/util/string_ref_helper.h" -#include - namespace grpc { namespace testing { namespace { diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc index 34183f2f426..c4a287ee6c4 100644 --- a/test/cpp/end2end/end2end_test.cc +++ b/test/cpp/end2end/end2end_test.cc @@ -16,6 +16,13 @@ * */ +#include +#include + +#include "absl/memory/memory.h" +#include "absl/strings/match.h" +#include "absl/strings/str_format.h" + #include #include #include @@ -33,13 +40,6 @@ #include #include -#include -#include - -#include "absl/memory/memory.h" -#include "absl/strings/match.h" -#include "absl/strings/str_format.h" - #include "src/core/ext/filters/client_channel/backup_poller.h" #include "src/core/lib/gpr/env.h" #include "src/core/lib/iomgr/iomgr.h" diff --git a/test/cpp/end2end/exception_test.cc b/test/cpp/end2end/exception_test.cc index 404abfad376..1a4c418beda 100644 --- a/test/cpp/end2end/exception_test.cc +++ b/test/cpp/end2end/exception_test.cc @@ -16,10 +16,13 @@ * */ +#include + #include #include -#include +#include + #include #include #include @@ -29,8 +32,6 @@ #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/util/test_config.h" -#include - namespace grpc { namespace testing { diff --git a/test/cpp/end2end/filter_end2end_test.cc b/test/cpp/end2end/filter_end2end_test.cc index 535ee295a62..93f07b0a149 100644 --- a/test/cpp/end2end/filter_end2end_test.cc +++ b/test/cpp/end2end/filter_end2end_test.cc @@ -20,6 +20,10 @@ #include #include +#include + +#include "absl/memory/memory.h" + #include #include #include @@ -34,16 +38,12 @@ #include #include -#include "absl/memory/memory.h" - #include "src/cpp/common/channel_filter.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" #include "test/cpp/util/byte_buffer_proto_helper.h" -#include - using grpc::testing::EchoRequest; using grpc::testing::EchoResponse; diff --git a/test/cpp/end2end/flaky_network_test.cc b/test/cpp/end2end/flaky_network_test.cc index 805770d0810..890d4a78353 100644 --- a/test/cpp/end2end/flaky_network_test.cc +++ b/test/cpp/end2end/flaky_network_test.cc @@ -16,11 +16,23 @@ * */ +#include + +#include +#include +#include +#include +#include +#include + +#include + +#include "absl/memory/memory.h" + #include #include #include #include -#include #include #include #include @@ -29,16 +41,6 @@ #include #include #include -#include - -#include -#include -#include -#include -#include -#include - -#include "absl/memory/memory.h" #include "src/core/lib/backoff/backoff.h" #include "src/core/lib/gpr/env.h" diff --git a/test/cpp/end2end/generic_end2end_test.cc b/test/cpp/end2end/generic_end2end_test.cc index cff1cf8b829..0ebc863ad2e 100644 --- a/test/cpp/end2end/generic_end2end_test.cc +++ b/test/cpp/end2end/generic_end2end_test.cc @@ -19,6 +19,10 @@ #include #include +#include + +#include "absl/memory/memory.h" + #include #include #include @@ -32,15 +36,11 @@ #include #include -#include "absl/memory/memory.h" - #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" #include "test/cpp/util/byte_buffer_proto_helper.h" -#include - using grpc::testing::EchoRequest; using grpc::testing::EchoResponse; diff --git a/test/cpp/end2end/grpclb_end2end_test.cc b/test/cpp/end2end/grpclb_end2end_test.cc index 5159c032ffb..9f0dddb769d 100644 --- a/test/cpp/end2end/grpclb_end2end_test.cc +++ b/test/cpp/end2end/grpclb_end2end_test.cc @@ -26,6 +26,7 @@ #include #include + #include "absl/memory/memory.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" @@ -54,16 +55,14 @@ #include "src/core/lib/transport/authority_override.h" #include "src/cpp/client/secure_credentials.h" #include "src/cpp/server/secure_server_credentials.h" - +#include "src/proto/grpc/lb/v1/load_balancer.grpc.pb.h" +#include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/util/port.h" #include "test/core/util/resolve_localhost_ip46.h" #include "test/core/util/test_config.h" #include "test/cpp/end2end/test_service_impl.h" #include "test/cpp/util/test_config.h" -#include "src/proto/grpc/lb/v1/load_balancer.grpc.pb.h" -#include "src/proto/grpc/testing/echo.grpc.pb.h" - // TODO(dgq): Other scenarios in need of testing: // - Send a serverlist with faulty ip:port addresses (port > 2^16, etc). // - Test reception of invalid serverlist diff --git a/test/cpp/end2end/health_service_end2end_test.cc b/test/cpp/end2end/health_service_end2end_test.cc index c36a7cd607e..efbdc36bd88 100644 --- a/test/cpp/end2end/health_service_end2end_test.cc +++ b/test/cpp/end2end/health_service_end2end_test.cc @@ -21,6 +21,8 @@ #include #include +#include + #include #include #include @@ -40,8 +42,6 @@ #include "test/cpp/end2end/test_health_check_service_impl.h" #include "test/cpp/end2end/test_service_impl.h" -#include - using grpc::health::v1::Health; using grpc::health::v1::HealthCheckRequest; using grpc::health::v1::HealthCheckResponse; diff --git a/test/cpp/end2end/hybrid_end2end_test.cc b/test/cpp/end2end/hybrid_end2end_test.cc index c3999303997..70c82c8d37f 100644 --- a/test/cpp/end2end/hybrid_end2end_test.cc +++ b/test/cpp/end2end/hybrid_end2end_test.cc @@ -19,6 +19,8 @@ #include #include +#include + #include #include #include @@ -37,8 +39,6 @@ #include "test/cpp/end2end/test_service_impl.h" #include "test/cpp/util/byte_buffer_proto_helper.h" -#include - namespace grpc { namespace testing { namespace { diff --git a/test/cpp/end2end/interceptors_util.h b/test/cpp/end2end/interceptors_util.h index 2c394bf6182..14f42e3536a 100644 --- a/test/cpp/end2end/interceptors_util.h +++ b/test/cpp/end2end/interceptors_util.h @@ -18,13 +18,13 @@ #include +#include + #include #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/cpp/util/string_ref_helper.h" -#include - namespace grpc { namespace testing { /* This interceptor does nothing. Just keeps a global count on the number of diff --git a/test/cpp/end2end/message_allocator_end2end_test.cc b/test/cpp/end2end/message_allocator_end2end_test.cc index 7924715af13..f42ac3a1174 100644 --- a/test/cpp/end2end/message_allocator_end2end_test.cc +++ b/test/cpp/end2end/message_allocator_end2end_test.cc @@ -26,10 +26,9 @@ #include #include - -#include #include +#include #include #include #include diff --git a/test/cpp/end2end/mock_test.cc b/test/cpp/end2end/mock_test.cc index 40a8b137a9a..144315400fe 100644 --- a/test/cpp/end2end/mock_test.cc +++ b/test/cpp/end2end/mock_test.cc @@ -17,6 +17,12 @@ */ #include +#include + +#include +#include + +#include "absl/types/optional.h" #include #include @@ -28,8 +34,7 @@ #include #include #include - -#include "absl/types/optional.h" +#include #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" @@ -37,13 +42,6 @@ #include "test/core/util/port.h" #include "test/core/util/test_config.h" -#include - -#include -#include - -#include - using grpc::testing::DefaultReactorTestPeer; using grpc::testing::EchoRequest; using grpc::testing::EchoResponse; diff --git a/test/cpp/end2end/nonblocking_test.cc b/test/cpp/end2end/nonblocking_test.cc index 7be3078b8e9..cb00810dcc9 100644 --- a/test/cpp/end2end/nonblocking_test.cc +++ b/test/cpp/end2end/nonblocking_test.cc @@ -18,6 +18,8 @@ #include +#include "absl/memory/memory.h" + #include #include #include @@ -25,8 +27,6 @@ #include #include -#include "absl/memory/memory.h" - #include "src/core/lib/gpr/tls.h" #include "src/core/lib/iomgr/port.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/end2end/port_sharing_end2end_test.cc b/test/cpp/end2end/port_sharing_end2end_test.cc index e9fa8269bf9..1bc7a01f679 100644 --- a/test/cpp/end2end/port_sharing_end2end_test.cc +++ b/test/cpp/end2end/port_sharing_end2end_test.cc @@ -16,6 +16,11 @@ * */ +#include +#include + +#include + #include #include #include @@ -28,10 +33,6 @@ #include #include #include -#include - -#include -#include #include "src/core/lib/gpr/env.h" #include "src/core/lib/iomgr/endpoint.h" diff --git a/test/cpp/end2end/proto_server_reflection_test.cc b/test/cpp/end2end/proto_server_reflection_test.cc index b3b68beea15..b9d14e4757a 100644 --- a/test/cpp/end2end/proto_server_reflection_test.cc +++ b/test/cpp/end2end/proto_server_reflection_test.cc @@ -16,6 +16,10 @@ * */ +#include + +#include "absl/memory/memory.h" + #include #include #include @@ -27,16 +31,12 @@ #include #include -#include "absl/memory/memory.h" - #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" #include "test/cpp/end2end/test_service_impl.h" #include "test/cpp/util/proto_reflection_descriptor_database.h" -#include - namespace grpc { namespace testing { diff --git a/test/cpp/end2end/raw_end2end_test.cc b/test/cpp/end2end/raw_end2end_test.cc index d6300ecad66..e0c29cd61bb 100644 --- a/test/cpp/end2end/raw_end2end_test.cc +++ b/test/cpp/end2end/raw_end2end_test.cc @@ -20,6 +20,8 @@ #include #include +#include + #include #include #include @@ -40,8 +42,6 @@ #include "test/cpp/util/byte_buffer_proto_helper.h" #include "test/cpp/util/string_ref_helper.h" -#include - using grpc::testing::EchoRequest; using grpc::testing::EchoResponse; diff --git a/test/cpp/end2end/server_builder_plugin_test.cc b/test/cpp/end2end/server_builder_plugin_test.cc index 8f36d0ce167..4aaf0183d4c 100644 --- a/test/cpp/end2end/server_builder_plugin_test.cc +++ b/test/cpp/end2end/server_builder_plugin_test.cc @@ -18,6 +18,10 @@ #include +#include + +#include "absl/memory/memory.h" + #include #include #include @@ -31,15 +35,11 @@ #include #include -#include "absl/memory/memory.h" - #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" #include "test/cpp/end2end/test_service_impl.h" -#include - #define PLUGIN_NAME "TestServerBuilderPlugin" namespace grpc { diff --git a/test/cpp/end2end/server_crash_test.cc b/test/cpp/end2end/server_crash_test.cc index b26ddaa1b09..5b5d90b6bb8 100644 --- a/test/cpp/end2end/server_crash_test.cc +++ b/test/cpp/end2end/server_crash_test.cc @@ -16,6 +16,10 @@ * */ +#include + +#include "absl/memory/memory.h" + #include #include #include @@ -26,16 +30,12 @@ #include #include -#include "absl/memory/memory.h" - #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" #include "test/cpp/util/subprocess.h" -#include - using grpc::testing::EchoRequest; using grpc::testing::EchoResponse; diff --git a/test/cpp/end2end/server_crash_test_client.cc b/test/cpp/end2end/server_crash_test_client.cc index e13bd4e8885..102df3c5409 100644 --- a/test/cpp/end2end/server_crash_test_client.cc +++ b/test/cpp/end2end/server_crash_test_client.cc @@ -16,17 +16,18 @@ * */ -#include -#include -#include -#include - #include #include #include #include #include "absl/flags/flag.h" + +#include +#include +#include +#include + #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/end2end/server_early_return_test.cc b/test/cpp/end2end/server_early_return_test.cc index c8c5bbe7d0f..b318a26661f 100644 --- a/test/cpp/end2end/server_early_return_test.cc +++ b/test/cpp/end2end/server_early_return_test.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include #include @@ -34,8 +36,6 @@ #include "test/core/util/test_config.h" #include "test/cpp/util/string_ref_helper.h" -#include - namespace grpc { namespace testing { namespace { diff --git a/test/cpp/end2end/server_interceptors_end2end_test.cc b/test/cpp/end2end/server_interceptors_end2end_test.cc index 8145c8ca4f6..3f303cdc5db 100644 --- a/test/cpp/end2end/server_interceptors_end2end_test.cc +++ b/test/cpp/end2end/server_interceptors_end2end_test.cc @@ -19,6 +19,11 @@ #include #include +#include + +#include "absl/memory/memory.h" +#include "absl/strings/match.h" + #include #include #include @@ -29,9 +34,6 @@ #include #include -#include "absl/memory/memory.h" -#include "absl/strings/match.h" - #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" @@ -39,8 +41,6 @@ #include "test/cpp/end2end/test_service_impl.h" #include "test/cpp/util/byte_buffer_proto_helper.h" -#include - namespace grpc { namespace testing { namespace { diff --git a/test/cpp/end2end/service_config_end2end_test.cc b/test/cpp/end2end/service_config_end2end_test.cc index 5b3f2f71a47..bd64e1722f8 100644 --- a/test/cpp/end2end/service_config_end2end_test.cc +++ b/test/cpp/end2end/service_config_end2end_test.cc @@ -24,6 +24,9 @@ #include #include +#include +#include + #include "absl/memory/memory.h" #include "absl/strings/str_cat.h" @@ -54,16 +57,12 @@ #include "src/core/lib/security/credentials/fake/fake_credentials.h" #include "src/cpp/client/secure_credentials.h" #include "src/cpp/server/secure_server_credentials.h" - #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/util/port.h" #include "test/core/util/resolve_localhost_ip46.h" #include "test/core/util/test_config.h" #include "test/cpp/end2end/test_service_impl.h" -#include -#include - using grpc::testing::EchoRequest; using grpc::testing::EchoResponse; diff --git a/test/cpp/end2end/shutdown_test.cc b/test/cpp/end2end/shutdown_test.cc index ed86f8a9135..384b2e8bad1 100644 --- a/test/cpp/end2end/shutdown_test.cc +++ b/test/cpp/end2end/shutdown_test.cc @@ -18,6 +18,8 @@ #include +#include + #include #include #include @@ -34,8 +36,6 @@ #include "test/core/util/test_config.h" #include "test/cpp/util/test_credentials_provider.h" -#include - using grpc::testing::EchoRequest; using grpc::testing::EchoResponse; diff --git a/test/cpp/end2end/streaming_throughput_test.cc b/test/cpp/end2end/streaming_throughput_test.cc index bfc0d1e370c..41721957e5f 100644 --- a/test/cpp/end2end/streaming_throughput_test.cc +++ b/test/cpp/end2end/streaming_throughput_test.cc @@ -17,9 +17,12 @@ */ #include + #include #include +#include + #include #include #include @@ -38,8 +41,6 @@ #include "test/core/util/port.h" #include "test/core/util/test_config.h" -#include - using grpc::testing::EchoRequest; using grpc::testing::EchoResponse; diff --git a/test/cpp/end2end/test_service_impl.cc b/test/cpp/end2end/test_service_impl.cc index d8d85fb4500..6bc18e1ac86 100644 --- a/test/cpp/end2end/test_service_impl.cc +++ b/test/cpp/end2end/test_service_impl.cc @@ -18,14 +18,15 @@ #include "test/cpp/end2end/test_service_impl.h" +#include +#include + +#include + #include #include #include #include -#include - -#include -#include #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/cpp/util/string_ref_helper.h" diff --git a/test/cpp/end2end/test_service_impl.h b/test/cpp/end2end/test_service_impl.h index ad10734ddb8..2b6c41ac1bb 100644 --- a/test/cpp/end2end/test_service_impl.h +++ b/test/cpp/end2end/test_service_impl.h @@ -22,16 +22,16 @@ #include #include #include +#include +#include + +#include #include #include #include #include #include -#include - -#include -#include #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/cpp/util/string_ref_helper.h" diff --git a/test/cpp/end2end/thread_stress_test.cc b/test/cpp/end2end/thread_stress_test.cc index 0e7da2e01ed..8b5170b9645 100644 --- a/test/cpp/end2end/thread_stress_test.cc +++ b/test/cpp/end2end/thread_stress_test.cc @@ -20,6 +20,8 @@ #include #include +#include + #include #include #include @@ -38,8 +40,6 @@ #include "test/core/util/port.h" #include "test/core/util/test_config.h" -#include - using grpc::testing::EchoRequest; using grpc::testing::EchoResponse; diff --git a/test/cpp/end2end/time_change_test.cc b/test/cpp/end2end/time_change_test.cc index 1d4efcf3368..0ea080e6c05 100644 --- a/test/cpp/end2end/time_change_test.cc +++ b/test/cpp/end2end/time_change_test.cc @@ -16,6 +16,14 @@ * */ +#include + +#include + +#include + +#include "absl/memory/memory.h" + #include #include #include @@ -26,8 +34,6 @@ #include #include -#include "absl/memory/memory.h" - #include "src/core/lib/iomgr/timer.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/util/port.h" @@ -35,10 +41,6 @@ #include "test/cpp/end2end/test_service_impl.h" #include "test/cpp/util/subprocess.h" -#include -#include -#include - using grpc::testing::EchoRequest; using grpc::testing::EchoResponse; diff --git a/test/cpp/ext/filters/census/stats_plugin_end2end_test.cc b/test/cpp/ext/filters/census/stats_plugin_end2end_test.cc index 42bc4dddfd0..a39ae72f04c 100644 --- a/test/cpp/ext/filters/census/stats_plugin_end2end_test.cc +++ b/test/cpp/ext/filters/census/stats_plugin_end2end_test.cc @@ -20,8 +20,6 @@ #include // NOLINT #include -#include -#include #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "gmock/gmock.h" @@ -31,6 +29,10 @@ #include "opencensus/stats/testing/test_utils.h" #include "opencensus/tags/tag_map.h" #include "opencensus/tags/with_tag_map.h" + +#include +#include + #include "src/cpp/ext/filters/census/context.h" #include "src/cpp/ext/filters/census/grpc_plugin.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/grpclb/grpclb_api_test.cc b/test/cpp/grpclb/grpclb_api_test.cc index 412bbed195e..6e2d19f3cf9 100644 --- a/test/cpp/grpclb/grpclb_api_test.cc +++ b/test/cpp/grpclb/grpclb_api_test.cc @@ -16,19 +16,19 @@ * */ +#include + #include "google/protobuf/duration.upb.h" #include "upb/upb.hpp" #include #include -#include #include "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/event_engine/sockaddr.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/proto/grpc/lb/v1/load_balancer.pb.h" // C++ version - #include "test/core/util/test_config.h" namespace grpc { diff --git a/test/cpp/interop/client.cc b/test/cpp/interop/client.cc index a2f79037478..ce7b14990b4 100644 --- a/test/cpp/interop/client.cc +++ b/test/cpp/interop/client.cc @@ -16,16 +16,17 @@ * */ +#include +#include + +#include "absl/flags/flag.h" + #include #include #include #include #include -#include -#include - -#include "absl/flags/flag.h" #include "src/core/lib/gpr/string.h" #include "test/core/util/test_config.h" #include "test/cpp/interop/client_helper.h" diff --git a/test/cpp/interop/client_helper.cc b/test/cpp/interop/client_helper.cc index 4d25411d922..17f2ad25131 100644 --- a/test/cpp/interop/client_helper.cc +++ b/test/cpp/interop/client_helper.cc @@ -18,6 +18,13 @@ #include "test/cpp/interop/client_helper.h" +#include +#include +#include + +#include "absl/flags/declare.h" +#include "absl/flags/flag.h" + #include #include #include @@ -25,12 +32,6 @@ #include #include -#include -#include -#include - -#include "absl/flags/declare.h" -#include "absl/flags/flag.h" #include "src/cpp/client/secure_credentials.h" #include "test/core/security/oauth2_utils.h" #include "test/cpp/util/create_test_channel.h" diff --git a/test/cpp/interop/grpclb_fallback_test.cc b/test/cpp/interop/grpclb_fallback_test.cc index 1cee4eb180b..dc4c08a743b 100644 --- a/test/cpp/interop/grpclb_fallback_test.cc +++ b/test/cpp/interop/grpclb_fallback_test.cc @@ -16,15 +16,10 @@ * */ +#include + #include #include -#include -#include -#include -#include -#include -#include -#include #include #include #include @@ -38,6 +33,14 @@ #include #include "absl/flags/flag.h" + +#include +#include +#include +#include +#include +#include + #include "src/core/lib/gpr/string.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/socket_mutator.h" diff --git a/test/cpp/interop/http2_client.cc b/test/cpp/interop/http2_client.cc index 5422fc82606..d890d6a3ac1 100644 --- a/test/cpp/interop/http2_client.cc +++ b/test/cpp/interop/http2_client.cc @@ -18,14 +18,15 @@ #include "test/cpp/interop/http2_client.h" +#include + +#include "absl/flags/flag.h" + #include #include #include #include -#include - -#include "absl/flags/flag.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" #include "src/core/lib/transport/byte_stream.h" diff --git a/test/cpp/interop/http2_client.h b/test/cpp/interop/http2_client.h index 42728fc52e0..35783927301 100644 --- a/test/cpp/interop/http2_client.h +++ b/test/cpp/interop/http2_client.h @@ -23,6 +23,7 @@ #include #include + #include "src/proto/grpc/testing/messages.pb.h" #include "src/proto/grpc/testing/test.grpc.pb.h" diff --git a/test/cpp/interop/interop_client.cc b/test/cpp/interop/interop_client.cc index 3c2da20c284..c29f6eb9793 100644 --- a/test/cpp/interop/interop_client.cc +++ b/test/cpp/interop/interop_client.cc @@ -16,6 +16,8 @@ * */ +#include "test/cpp/interop/interop_client.h" + #include #include #include @@ -40,7 +42,6 @@ #include "src/proto/grpc/testing/test.grpc.pb.h" #include "test/core/util/histogram.h" #include "test/cpp/interop/client_helper.h" -#include "test/cpp/interop/interop_client.h" namespace grpc { namespace testing { diff --git a/test/cpp/interop/interop_client.h b/test/cpp/interop/interop_client.h index de564ca61bc..8975815fb05 100644 --- a/test/cpp/interop/interop_client.h +++ b/test/cpp/interop/interop_client.h @@ -23,6 +23,7 @@ #include #include + #include "src/proto/grpc/testing/messages.pb.h" #include "src/proto/grpc/testing/test.grpc.pb.h" diff --git a/test/cpp/interop/interop_server.cc b/test/cpp/interop/interop_server.cc index 51f66d482a2..106614656ba 100644 --- a/test/cpp/interop/interop_server.cc +++ b/test/cpp/interop/interop_server.cc @@ -16,6 +16,13 @@ * */ +#include +#include +#include +#include + +#include "absl/flags/flag.h" + #include #include #include @@ -24,12 +31,6 @@ #include #include -#include -#include -#include -#include - -#include "absl/flags/flag.h" #include "src/core/lib/gpr/string.h" #include "src/proto/grpc/testing/empty.pb.h" #include "src/proto/grpc/testing/messages.pb.h" diff --git a/test/cpp/interop/interop_test.cc b/test/cpp/interop/interop_test.cc index 8a92892cc66..f0985e7b131 100644 --- a/test/cpp/interop/interop_test.cc +++ b/test/cpp/interop/interop_test.cc @@ -17,8 +17,6 @@ */ #include -#include -#include #include #include #include @@ -32,6 +30,10 @@ #include "absl/flags/flag.h" #include "absl/strings/str_cat.h" + +#include +#include + #include "src/core/lib/gpr/string.h" #include "src/core/lib/iomgr/socket_utils_posix.h" #include "test/core/util/port.h" diff --git a/test/cpp/interop/metrics_client.cc b/test/cpp/interop/metrics_client.cc index 736182c950f..f733dfc27fb 100644 --- a/test/cpp/interop/metrics_client.cc +++ b/test/cpp/interop/metrics_client.cc @@ -16,13 +16,14 @@ *is % allowed in string */ -#include -#include - #include #include #include "absl/flags/flag.h" + +#include +#include + #include "src/proto/grpc/testing/metrics.grpc.pb.h" #include "src/proto/grpc/testing/metrics.pb.h" #include "test/cpp/util/metrics_server.h" diff --git a/test/cpp/interop/reconnect_interop_client.cc b/test/cpp/interop/reconnect_interop_client.cc index f24b841fdab..9554c17b04b 100644 --- a/test/cpp/interop/reconnect_interop_client.cc +++ b/test/cpp/interop/reconnect_interop_client.cc @@ -16,16 +16,17 @@ * */ +#include +#include + +#include "absl/flags/flag.h" + #include #include #include #include #include -#include -#include - -#include "absl/flags/flag.h" #include "src/proto/grpc/testing/empty.pb.h" #include "src/proto/grpc/testing/messages.pb.h" #include "src/proto/grpc/testing/test.grpc.pb.h" diff --git a/test/cpp/interop/reconnect_interop_server.cc b/test/cpp/interop/reconnect_interop_server.cc index 8e7ef413131..6496f8f4d90 100644 --- a/test/cpp/interop/reconnect_interop_server.cc +++ b/test/cpp/interop/reconnect_interop_server.cc @@ -18,11 +18,6 @@ // Test description at doc/connection-backoff-interop-test-description.md -#include -#include -#include -#include -#include #include #include @@ -31,6 +26,13 @@ #include #include "absl/flags/flag.h" + +#include +#include +#include +#include +#include + #include "src/proto/grpc/testing/empty.pb.h" #include "src/proto/grpc/testing/messages.pb.h" #include "src/proto/grpc/testing/test.grpc.pb.h" diff --git a/test/cpp/interop/server_helper.cc b/test/cpp/interop/server_helper.cc index 7da24a48330..4c7e7b55e39 100644 --- a/test/cpp/interop/server_helper.cc +++ b/test/cpp/interop/server_helper.cc @@ -18,12 +18,13 @@ #include "test/cpp/interop/server_helper.h" -#include - #include #include "absl/flags/declare.h" #include "absl/flags/flag.h" + +#include + #include "src/core/lib/surface/call_test_only.h" #include "src/core/lib/transport/byte_stream.h" #include "test/cpp/util/test_credentials_provider.h" diff --git a/test/cpp/interop/server_helper.h b/test/cpp/interop/server_helper.h index ee72697b5e9..65f6cfef898 100644 --- a/test/cpp/interop/server_helper.h +++ b/test/cpp/interop/server_helper.h @@ -24,7 +24,6 @@ #include #include - #include #include #include diff --git a/test/cpp/interop/stress_test.cc b/test/cpp/interop/stress_test.cc index cc7651e9764..1faed82820a 100644 --- a/test/cpp/interop/stress_test.cc +++ b/test/cpp/interop/stress_test.cc @@ -16,11 +16,6 @@ *is % allowed in string */ -#include -#include -#include -#include - #include #include #include @@ -28,6 +23,12 @@ #include #include "absl/flags/flag.h" + +#include +#include +#include +#include + #include "src/proto/grpc/testing/metrics.grpc.pb.h" #include "src/proto/grpc/testing/metrics.pb.h" #include "test/cpp/interop/interop_client.h" diff --git a/test/cpp/interop/xds_interop_client.cc b/test/cpp/interop/xds_interop_client.cc index 6249ff37ddf..c688a2e6df0 100644 --- a/test/cpp/interop/xds_interop_client.cc +++ b/test/cpp/interop/xds_interop_client.cc @@ -16,13 +16,6 @@ * */ -#include -#include -#include -#include -#include -#include - #include #include #include @@ -38,6 +31,14 @@ #include "absl/algorithm/container.h" #include "absl/flags/flag.h" #include "absl/strings/str_split.h" + +#include +#include +#include +#include +#include +#include + #include "src/core/lib/channel/status_util.h" #include "src/core/lib/gpr/env.h" #include "src/proto/grpc/testing/empty.pb.h" diff --git a/test/cpp/interop/xds_interop_server.cc b/test/cpp/interop/xds_interop_server.cc index ea7c6f23aa0..a3c039c379b 100644 --- a/test/cpp/interop/xds_interop_server.cc +++ b/test/cpp/interop/xds_interop_server.cc @@ -16,6 +16,12 @@ * */ +#include + +#include "absl/flags/flag.h" +#include "absl/strings/str_cat.h" +#include "absl/synchronization/mutex.h" + #include #include #include @@ -27,11 +33,6 @@ #include #include -#include - -#include "absl/flags/flag.h" -#include "absl/strings/str_cat.h" -#include "absl/synchronization/mutex.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/iomgr/gethostname.h" #include "src/core/lib/transport/byte_stream.h" diff --git a/test/cpp/ios/CronetTests/TestHelper.h b/test/cpp/ios/CronetTests/TestHelper.h index f24dcd63f5c..6c148094d54 100644 --- a/test/cpp/ios/CronetTests/TestHelper.h +++ b/test/cpp/ios/CronetTests/TestHelper.h @@ -20,6 +20,7 @@ #define TESTHELPER_H #import + #import #import @@ -27,7 +28,8 @@ #import #import #import -#import + +#import "src/proto/grpc/testing/echo.grpc.pb.h" const char* const kServerFinishAfterNReads = "server_finish_after_n_reads"; const char* const kServerResponseStreamsToSend = "server_responses_to_send"; diff --git a/test/cpp/microbenchmarks/bm_alarm.cc b/test/cpp/microbenchmarks/bm_alarm.cc index 3aaab53c57e..83899d1a922 100644 --- a/test/cpp/microbenchmarks/bm_alarm.cc +++ b/test/cpp/microbenchmarks/bm_alarm.cc @@ -19,10 +19,12 @@ /* This benchmark exists to ensure that immediately-firing alarms are fast */ #include + #include #include #include #include + #include "test/core/util/test_config.h" #include "test/cpp/microbenchmarks/helpers.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/microbenchmarks/bm_arena.cc b/test/cpp/microbenchmarks/bm_arena.cc index 90de5543661..aba5ceb68be 100644 --- a/test/cpp/microbenchmarks/bm_arena.cc +++ b/test/cpp/microbenchmarks/bm_arena.cc @@ -19,6 +19,7 @@ /* Benchmark arenas */ #include + #include "src/core/lib/gprpp/arena.h" #include "test/core/util/test_config.h" #include "test/cpp/microbenchmarks/helpers.h" diff --git a/test/cpp/microbenchmarks/bm_byte_buffer.cc b/test/cpp/microbenchmarks/bm_byte_buffer.cc index 3c416d87b4f..78d87c6874f 100644 --- a/test/cpp/microbenchmarks/bm_byte_buffer.cc +++ b/test/cpp/microbenchmarks/bm_byte_buffer.cc @@ -21,6 +21,7 @@ #include #include + #include #include diff --git a/test/cpp/microbenchmarks/bm_call_create.cc b/test/cpp/microbenchmarks/bm_call_create.cc index fdf9ec6efd4..c08643cc7b9 100644 --- a/test/cpp/microbenchmarks/bm_call_create.cc +++ b/test/cpp/microbenchmarks/bm_call_create.cc @@ -19,10 +19,12 @@ /* This benchmark exists to ensure that the benchmark integration is * working */ -#include #include + #include +#include + #include #include #include diff --git a/test/cpp/microbenchmarks/bm_channel.cc b/test/cpp/microbenchmarks/bm_channel.cc index 0e2bfc18020..b3e9b77b810 100644 --- a/test/cpp/microbenchmarks/bm_channel.cc +++ b/test/cpp/microbenchmarks/bm_channel.cc @@ -19,7 +19,9 @@ /* Benchmark channel */ #include + #include + #include "test/core/util/test_config.h" #include "test/cpp/microbenchmarks/helpers.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc index c555d07a19b..1615aa575f4 100644 --- a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc +++ b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc @@ -18,13 +18,16 @@ /* Microbenchmarks around CHTTP2 HPACK operations */ -#include -#include -#include #include + #include #include +#include + +#include +#include + #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" #include "src/core/ext/transport/chttp2/transport/incoming_metadata.h" @@ -32,7 +35,6 @@ #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/lib/transport/static_metadata.h" #include "src/core/lib/transport/timeout_encoding.h" - #include "test/core/util/test_config.h" #include "test/cpp/microbenchmarks/helpers.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/microbenchmarks/bm_chttp2_transport.cc b/test/cpp/microbenchmarks/bm_chttp2_transport.cc index a8f43ecbf29..2b992c1561f 100644 --- a/test/cpp/microbenchmarks/bm_chttp2_transport.cc +++ b/test/cpp/microbenchmarks/bm_chttp2_transport.cc @@ -18,15 +18,19 @@ /* Microbenchmarks around CHTTP2 transport operations */ +#include + +#include +#include +#include + #include + #include #include #include #include -#include -#include -#include -#include + #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/lib/iomgr/closure.h" diff --git a/test/cpp/microbenchmarks/bm_closure.cc b/test/cpp/microbenchmarks/bm_closure.cc index e38f95f742d..4c643fc5647 100644 --- a/test/cpp/microbenchmarks/bm_closure.cc +++ b/test/cpp/microbenchmarks/bm_closure.cc @@ -18,15 +18,16 @@ /* Test various closure related operations */ +#include + #include + #include -#include #include "src/core/lib/gpr/spinlock.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/iomgr/exec_ctx.h" - #include "test/core/util/test_config.h" #include "test/cpp/microbenchmarks/helpers.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/microbenchmarks/bm_cq.cc b/test/cpp/microbenchmarks/bm_cq.cc index 9a5c6e7ebbc..4b9aeefdfe2 100644 --- a/test/cpp/microbenchmarks/bm_cq.cc +++ b/test/cpp/microbenchmarks/bm_cq.cc @@ -20,6 +20,7 @@ * working */ #include + #include #include #include diff --git a/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc b/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc index d57a021cee7..66bc5d87d51 100644 --- a/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc +++ b/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc @@ -16,10 +16,12 @@ * */ -#include #include + #include +#include + #include #include #include diff --git a/test/cpp/microbenchmarks/bm_error.cc b/test/cpp/microbenchmarks/bm_error.cc index ecc39accfad..1559e9c1351 100644 --- a/test/cpp/microbenchmarks/bm_error.cc +++ b/test/cpp/microbenchmarks/bm_error.cc @@ -18,12 +18,12 @@ /* Test various operations on grpc_error */ -#include #include +#include + #include "src/core/lib/iomgr/error.h" #include "src/core/lib/transport/error_utils.h" - #include "test/core/util/test_config.h" #include "test/cpp/microbenchmarks/helpers.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/microbenchmarks/bm_fullstack_trickle.cc b/test/cpp/microbenchmarks/bm_fullstack_trickle.cc index 8701c5e374b..4c3a6a1c87e 100644 --- a/test/cpp/microbenchmarks/bm_fullstack_trickle.cc +++ b/test/cpp/microbenchmarks/bm_fullstack_trickle.cc @@ -18,12 +18,13 @@ /* Benchmark gRPC end2end in various configurations */ -#include - #include +#include + #include "absl/flags/flag.h" #include "absl/memory/memory.h" + #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/lib/iomgr/timer_manager.h" diff --git a/test/cpp/microbenchmarks/bm_metadata.cc b/test/cpp/microbenchmarks/bm_metadata.cc index b23918aa1f1..ac48c096a74 100644 --- a/test/cpp/microbenchmarks/bm_metadata.cc +++ b/test/cpp/microbenchmarks/bm_metadata.cc @@ -19,12 +19,12 @@ /* Test out various metadata handling primitives */ #include + #include #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/transport/metadata.h" #include "src/core/lib/transport/static_metadata.h" - #include "test/core/util/test_config.h" #include "test/cpp/microbenchmarks/helpers.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/microbenchmarks/bm_opencensus_plugin.cc b/test/cpp/microbenchmarks/bm_opencensus_plugin.cc index ad542fdf782..7a3aadb1c2f 100644 --- a/test/cpp/microbenchmarks/bm_opencensus_plugin.cc +++ b/test/cpp/microbenchmarks/bm_opencensus_plugin.cc @@ -16,15 +16,18 @@ * */ -#include #include #include // NOLINT -#include -#include +#include + #include "absl/base/call_once.h" #include "absl/strings/str_cat.h" #include "opencensus/stats/stats.h" + +#include +#include + #include "src/cpp/ext/filters/census/grpc_plugin.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/util/test_config.h" diff --git a/test/cpp/microbenchmarks/bm_pollset.cc b/test/cpp/microbenchmarks/bm_pollset.cc index ee813aa3970..beb38d62451 100644 --- a/test/cpp/microbenchmarks/bm_pollset.cc +++ b/test/cpp/microbenchmarks/bm_pollset.cc @@ -18,7 +18,10 @@ /* Test out pollset latencies */ +#include + #include + #include #include #include @@ -28,13 +31,10 @@ #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/wakeup_fd_posix.h" - #include "test/core/util/test_config.h" #include "test/cpp/microbenchmarks/helpers.h" #include "test/cpp/util/test_config.h" -#include - #ifdef GRPC_LINUX_MULTIPOLL_WITH_EPOLL #include #include diff --git a/test/cpp/microbenchmarks/bm_threadpool.cc b/test/cpp/microbenchmarks/bm_threadpool.cc index b06deeeb37c..dd57bce5377 100644 --- a/test/cpp/microbenchmarks/bm_threadpool.cc +++ b/test/cpp/microbenchmarks/bm_threadpool.cc @@ -16,12 +16,13 @@ * */ -#include -#include - #include #include +#include + +#include + #include "src/core/lib/iomgr/executor/threadpool.h" #include "test/core/util/test_config.h" #include "test/cpp/microbenchmarks/helpers.h" diff --git a/test/cpp/microbenchmarks/bm_timer.cc b/test/cpp/microbenchmarks/bm_timer.cc index 60bf65da661..8e3a74ab9da 100644 --- a/test/cpp/microbenchmarks/bm_timer.cc +++ b/test/cpp/microbenchmarks/bm_timer.cc @@ -16,11 +16,13 @@ * */ -#include #include + #include #include +#include + #include #include #include diff --git a/test/cpp/microbenchmarks/callback_streaming_ping_pong.h b/test/cpp/microbenchmarks/callback_streaming_ping_pong.h index dc8c1331758..f2e6657bb58 100644 --- a/test/cpp/microbenchmarks/callback_streaming_ping_pong.h +++ b/test/cpp/microbenchmarks/callback_streaming_ping_pong.h @@ -19,8 +19,10 @@ #ifndef TEST_CPP_MICROBENCHMARKS_CALLBACK_STREAMING_PING_PONG_H #define TEST_CPP_MICROBENCHMARKS_CALLBACK_STREAMING_PING_PONG_H -#include #include + +#include + #include "src/core/lib/profiling/timers.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/util/resource_user_util.h" diff --git a/test/cpp/microbenchmarks/callback_test_service.h b/test/cpp/microbenchmarks/callback_test_service.h index 010c8e86846..0268de6e47c 100644 --- a/test/cpp/microbenchmarks/callback_test_service.h +++ b/test/cpp/microbenchmarks/callback_test_service.h @@ -19,11 +19,13 @@ #ifndef TEST_CPP_MICROBENCHMARKS_CALLBACK_TEST_SERVICE_H #define TEST_CPP_MICROBENCHMARKS_CALLBACK_TEST_SERVICE_H -#include #include #include #include #include + +#include + #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/cpp/util/string_ref_helper.h" diff --git a/test/cpp/microbenchmarks/callback_unary_ping_pong.h b/test/cpp/microbenchmarks/callback_unary_ping_pong.h index bc632735f26..b058611f0be 100644 --- a/test/cpp/microbenchmarks/callback_unary_ping_pong.h +++ b/test/cpp/microbenchmarks/callback_unary_ping_pong.h @@ -21,8 +21,10 @@ #ifndef TEST_CPP_MICROBENCHMARKS_CALLBACK_UNARY_PING_PONG_H #define TEST_CPP_MICROBENCHMARKS_CALLBACK_UNARY_PING_PONG_H -#include #include + +#include + #include "src/core/lib/profiling/timers.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/util/resource_user_util.h" diff --git a/test/cpp/microbenchmarks/fullstack_fixtures.h b/test/cpp/microbenchmarks/fullstack_fixtures.h index 6b14c44f1e2..08ff75ad8f9 100644 --- a/test/cpp/microbenchmarks/fullstack_fixtures.h +++ b/test/cpp/microbenchmarks/fullstack_fixtures.h @@ -37,10 +37,9 @@ #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/completion_queue.h" #include "src/core/lib/surface/server.h" +#include "src/cpp/client/create_channel_internal.h" #include "test/core/util/passthru_endpoint.h" #include "test/core/util/port.h" - -#include "src/cpp/client/create_channel_internal.h" #include "test/cpp/microbenchmarks/helpers.h" namespace grpc { diff --git a/test/cpp/microbenchmarks/fullstack_streaming_ping_pong.h b/test/cpp/microbenchmarks/fullstack_streaming_ping_pong.h index 9ca213cee0d..a8f80b94595 100644 --- a/test/cpp/microbenchmarks/fullstack_streaming_ping_pong.h +++ b/test/cpp/microbenchmarks/fullstack_streaming_ping_pong.h @@ -21,8 +21,10 @@ #ifndef TEST_CPP_MICROBENCHMARKS_FULLSTACK_STREAMING_PING_PONG_H #define TEST_CPP_MICROBENCHMARKS_FULLSTACK_STREAMING_PING_PONG_H -#include #include + +#include + #include "src/core/lib/profiling/timers.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/cpp/microbenchmarks/fullstack_context_mutators.h" diff --git a/test/cpp/microbenchmarks/fullstack_streaming_pump.h b/test/cpp/microbenchmarks/fullstack_streaming_pump.h index d05258bb919..807e588f937 100644 --- a/test/cpp/microbenchmarks/fullstack_streaming_pump.h +++ b/test/cpp/microbenchmarks/fullstack_streaming_pump.h @@ -21,8 +21,10 @@ #ifndef TEST_CPP_MICROBENCHMARKS_FULLSTACK_STREAMING_PUMP_H #define TEST_CPP_MICROBENCHMARKS_FULLSTACK_STREAMING_PUMP_H -#include #include + +#include + #include "src/core/lib/profiling/timers.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/cpp/microbenchmarks/fullstack_context_mutators.h" diff --git a/test/cpp/microbenchmarks/fullstack_unary_ping_pong.h b/test/cpp/microbenchmarks/fullstack_unary_ping_pong.h index 604e0ed511e..677640833ae 100644 --- a/test/cpp/microbenchmarks/fullstack_unary_ping_pong.h +++ b/test/cpp/microbenchmarks/fullstack_unary_ping_pong.h @@ -21,8 +21,10 @@ #ifndef TEST_CPP_MICROBENCHMARKS_FULLSTACK_UNARY_PING_PONG_H #define TEST_CPP_MICROBENCHMARKS_FULLSTACK_UNARY_PING_PONG_H -#include #include + +#include + #include "src/core/lib/profiling/timers.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/cpp/microbenchmarks/fullstack_context_mutators.h" diff --git a/test/cpp/microbenchmarks/helpers.cc b/test/cpp/microbenchmarks/helpers.cc index 3bce93c95f9..d46321c2cce 100644 --- a/test/cpp/microbenchmarks/helpers.cc +++ b/test/cpp/microbenchmarks/helpers.cc @@ -16,10 +16,10 @@ * */ -#include - #include "test/cpp/microbenchmarks/helpers.h" +#include + static grpc::internal::GrpcLibraryInitializer g_gli_initializer; static LibraryInitializer* g_libraryInitializer; diff --git a/test/cpp/microbenchmarks/helpers.h b/test/cpp/microbenchmarks/helpers.h index c1b669ad296..f8faa23a49d 100644 --- a/test/cpp/microbenchmarks/helpers.h +++ b/test/cpp/microbenchmarks/helpers.h @@ -19,16 +19,18 @@ #ifndef TEST_CPP_MICROBENCHMARKS_COUNTERS_H #define TEST_CPP_MICROBENCHMARKS_COUNTERS_H +#include + #include #include -#include -#include "src/core/lib/debug/stats.h" -#include "test/core/util/memory_counters.h" - #include + #include +#include "src/core/lib/debug/stats.h" +#include "test/core/util/memory_counters.h" + class LibraryInitializer { public: LibraryInitializer(); diff --git a/test/cpp/naming/address_sorting_test.cc b/test/cpp/naming/address_sorting_test.cc index e2b56c98899..33603665b91 100644 --- a/test/cpp/naming/address_sorting_test.cc +++ b/test/cpp/naming/address_sorting_test.cc @@ -16,18 +16,20 @@ * */ +#include +#include + +#include + #include #include + #include #include #include #include #include #include -#include -#include - -#include #include "src/core/ext/filters/client_channel/client_channel.h" #include "src/core/ext/filters/client_channel/resolver.h" diff --git a/test/cpp/naming/cancel_ares_query_test.cc b/test/cpp/naming/cancel_ares_query_test.cc index 239d7d4429e..ff9ce38230b 100644 --- a/test/cpp/naming/cancel_ares_query_test.cc +++ b/test/cpp/naming/cancel_ares_query_test.cc @@ -16,19 +16,22 @@ * */ -#include -#include -#include -#include -#include -#include #include #include #include +#include + #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" + +#include +#include +#include +#include +#include + #include "src/core/ext/filters/client_channel/resolver.h" #include "src/core/ext/filters/client_channel/resolver/dns/dns_resolver_selection.h" #include "src/core/ext/filters/client_channel/resolver_registry.h" diff --git a/test/cpp/naming/dns_test_util.cc b/test/cpp/naming/dns_test_util.cc index 323079268cd..e0ea96fddb7 100644 --- a/test/cpp/naming/dns_test_util.cc +++ b/test/cpp/naming/dns_test_util.cc @@ -16,6 +16,8 @@ * */ +#include "test/cpp/naming/dns_test_util.h" + #include #include @@ -23,7 +25,6 @@ #include #include "src/core/lib/event_engine/sockaddr.h" -#include "test/cpp/naming/dns_test_util.h" #ifdef GPR_WINDOWS #include "src/core/lib/iomgr/sockaddr_windows.h" diff --git a/test/cpp/naming/resolver_component_test.cc b/test/cpp/naming/resolver_component_test.cc index a8c39fc3fd7..a230b5a49fe 100644 --- a/test/cpp/naming/resolver_component_test.cc +++ b/test/cpp/naming/resolver_component_test.cc @@ -16,26 +16,30 @@ * */ +#include + #include #include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include #include +#include + #include "absl/flags/flag.h" #include "absl/memory/memory.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" + +#include +#include +#include +#include +#include +#include + #include "src/core/ext/filters/client_channel/client_channel.h" #include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.h" #include "src/core/ext/filters/client_channel/resolver.h" diff --git a/test/cpp/naming/resolver_component_tests_runner_invoker.cc b/test/cpp/naming/resolver_component_tests_runner_invoker.cc index 2ae8da9fc75..d6f12171f2e 100644 --- a/test/cpp/naming/resolver_component_tests_runner_invoker.cc +++ b/test/cpp/naming/resolver_component_tests_runner_invoker.cc @@ -16,10 +16,6 @@ * */ -#include -#include -#include -#include #include #include #include @@ -30,6 +26,11 @@ #include "absl/flags/flag.h" +#include +#include +#include +#include + #ifdef __FreeBSD__ #include #endif diff --git a/test/cpp/performance/writes_per_rpc_test.cc b/test/cpp/performance/writes_per_rpc_test.cc index d37e6ec36ab..f49795e4bdd 100644 --- a/test/cpp/performance/writes_per_rpc_test.cc +++ b/test/cpp/performance/writes_per_rpc_test.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include #include @@ -24,7 +26,6 @@ #include #include #include -#include #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/channel/channel_args.h" @@ -35,11 +36,10 @@ #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/completion_queue.h" #include "src/core/lib/surface/server.h" -#include "test/core/util/passthru_endpoint.h" -#include "test/core/util/port.h" - #include "src/cpp/client/create_channel_internal.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" +#include "test/core/util/passthru_endpoint.h" +#include "test/core/util/port.h" #include "test/core/util/resource_user_util.h" #include "test/core/util/test_config.h" diff --git a/test/cpp/qps/benchmark_config.cc b/test/cpp/qps/benchmark_config.cc index 4ec07e9fde0..3a44eab8d77 100644 --- a/test/cpp/qps/benchmark_config.cc +++ b/test/cpp/qps/benchmark_config.cc @@ -18,11 +18,12 @@ #include "test/cpp/qps/benchmark_config.h" +#include "absl/flags/flag.h" + #include #include #include -#include "absl/flags/flag.h" #include "test/cpp/util/test_credentials_provider.h" ABSL_FLAG(bool, enable_log_reporter, true, diff --git a/test/cpp/qps/client.h b/test/cpp/qps/client.h index 5cb4d9dd1d6..9d2c7236649 100644 --- a/test/cpp/qps/client.h +++ b/test/cpp/qps/client.h @@ -27,6 +27,9 @@ #include #include +#include "absl/memory/memory.h" +#include "absl/strings/match.h" + #include #include #include @@ -34,14 +37,10 @@ #include #include -#include "absl/memory/memory.h" -#include "absl/strings/match.h" - -#include "src/proto/grpc/testing/benchmark_service.grpc.pb.h" -#include "src/proto/grpc/testing/payloads.pb.h" - #include "src/core/lib/gpr/env.h" #include "src/cpp/util/core_stats.h" +#include "src/proto/grpc/testing/benchmark_service.grpc.pb.h" +#include "src/proto/grpc/testing/payloads.pb.h" #include "test/cpp/qps/histogram.h" #include "test/cpp/qps/interarrival.h" #include "test/cpp/qps/qps_worker.h" diff --git a/test/cpp/qps/client_async.cc b/test/cpp/qps/client_async.cc index 2efdb76297b..4e57de3ad5b 100644 --- a/test/cpp/qps/client_async.cc +++ b/test/cpp/qps/client_async.cc @@ -27,6 +27,8 @@ #include #include +#include "absl/memory/memory.h" + #include #include #include @@ -35,8 +37,6 @@ #include #include -#include "absl/memory/memory.h" - #include "src/core/lib/surface/completion_queue.h" #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h" #include "test/cpp/qps/client.h" diff --git a/test/cpp/qps/client_callback.cc b/test/cpp/qps/client_callback.cc index 95e5a86b8c1..3119d2a1341 100644 --- a/test/cpp/qps/client_callback.cc +++ b/test/cpp/qps/client_callback.cc @@ -25,6 +25,8 @@ #include #include +#include "absl/memory/memory.h" + #include #include #include @@ -32,8 +34,6 @@ #include #include -#include "absl/memory/memory.h" - #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h" #include "test/cpp/qps/client.h" #include "test/cpp/qps/usage_timer.h" diff --git a/test/cpp/qps/driver.cc b/test/cpp/qps/driver.cc index 0ae85290d26..d2ecb63c189 100644 --- a/test/cpp/qps/driver.cc +++ b/test/cpp/qps/driver.cc @@ -16,6 +16,8 @@ * */ +#include "test/cpp/qps/driver.h" + #include #include #include @@ -37,7 +39,6 @@ #include "test/core/util/port.h" #include "test/core/util/test_config.h" #include "test/cpp/qps/client.h" -#include "test/cpp/qps/driver.h" #include "test/cpp/qps/histogram.h" #include "test/cpp/qps/qps_worker.h" #include "test/cpp/qps/stats.h" diff --git a/test/cpp/qps/qps_interarrival_test.cc b/test/cpp/qps/qps_interarrival_test.cc index 1f29cd72968..768c897d832 100644 --- a/test/cpp/qps/qps_interarrival_test.cc +++ b/test/cpp/qps/qps_interarrival_test.cc @@ -21,7 +21,6 @@ // Use the C histogram rather than C++ to avoid depending on proto #include "test/core/util/histogram.h" - #include "test/core/util/test_config.h" #include "test/cpp/qps/interarrival.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/qps/qps_json_driver.cc b/test/cpp/qps/qps_json_driver.cc index 6dcb73d3dc6..2e8cb42c44e 100644 --- a/test/cpp/qps/qps_json_driver.cc +++ b/test/cpp/qps/qps_json_driver.cc @@ -16,15 +16,16 @@ * */ -#include -#include - #include #include #include #include #include "absl/flags/flag.h" + +#include +#include + #include "test/core/util/test_config.h" #include "test/cpp/qps/benchmark_config.h" #include "test/cpp/qps/driver.h" diff --git a/test/cpp/qps/qps_worker.cc b/test/cpp/qps/qps_worker.cc index f403a6823e6..cd916bfaece 100644 --- a/test/cpp/qps/qps_worker.cc +++ b/test/cpp/qps/qps_worker.cc @@ -25,6 +25,8 @@ #include #include +#include "absl/memory/memory.h" + #include #include #include @@ -34,8 +36,6 @@ #include #include -#include "absl/memory/memory.h" - #include "src/core/lib/gprpp/host_port.h" #include "src/proto/grpc/testing/worker_service.grpc.pb.h" #include "test/core/util/grpc_profiler.h" diff --git a/test/cpp/qps/report.cc b/test/cpp/qps/report.cc index 858ccaa0f25..b4299d2f700 100644 --- a/test/cpp/qps/report.cc +++ b/test/cpp/qps/report.cc @@ -21,13 +21,13 @@ #include #include -#include "test/cpp/qps/driver.h" -#include "test/cpp/qps/parse_json.h" -#include "test/cpp/qps/stats.h" - #include + #include "src/cpp/util/core_stats.h" #include "src/proto/grpc/testing/report_qps_scenario_service.grpc.pb.h" +#include "test/cpp/qps/driver.h" +#include "test/cpp/qps/parse_json.h" +#include "test/cpp/qps/stats.h" namespace grpc { namespace testing { diff --git a/test/cpp/qps/report.h b/test/cpp/qps/report.h index d85dea4349b..9cb837dd80c 100644 --- a/test/cpp/qps/report.h +++ b/test/cpp/qps/report.h @@ -23,12 +23,11 @@ #include #include +#include #include -#include "test/cpp/qps/driver.h" - -#include #include "src/proto/grpc/testing/report_qps_scenario_service.grpc.pb.h" +#include "test/cpp/qps/driver.h" namespace grpc { namespace testing { diff --git a/test/cpp/qps/server.h b/test/cpp/qps/server.h index 9a90d1735e2..533361dbf7b 100644 --- a/test/cpp/qps/server.h +++ b/test/cpp/qps/server.h @@ -19,13 +19,14 @@ #ifndef TEST_QPS_SERVER_H #define TEST_QPS_SERVER_H +#include + #include #include #include #include #include #include -#include #include "src/cpp/util/core_stats.h" #include "src/proto/grpc/testing/control.pb.h" diff --git a/test/cpp/qps/worker.cc b/test/cpp/qps/worker.cc index 0a758a6dfeb..1314ab565bc 100644 --- a/test/cpp/qps/worker.cc +++ b/test/cpp/qps/worker.cc @@ -16,8 +16,6 @@ * */ -#include -#include #include #include @@ -25,6 +23,10 @@ #include #include "absl/flags/flag.h" + +#include +#include + #include "test/core/util/test_config.h" #include "test/cpp/qps/qps_worker.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/server/authorization_policy_provider_test.cc b/test/cpp/server/authorization_policy_provider_test.cc index 16e2a5dce5c..9b84af833e0 100644 --- a/test/cpp/server/authorization_policy_provider_test.cc +++ b/test/cpp/server/authorization_policy_provider_test.cc @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include #include +#include + #include "test/core/util/test_config.h" namespace grpc { diff --git a/test/cpp/server/credentials_test.cc b/test/cpp/server/credentials_test.cc index 3c8dcf7aff9..f0a6e099960 100644 --- a/test/cpp/server/credentials_test.cc +++ b/test/cpp/server/credentials_test.cc @@ -14,14 +14,15 @@ // limitations under the License. // +#include + #include +#include + #include #include #include #include -#include - -#include #include "src/cpp/client/secure_credentials.h" #include "test/core/util/port.h" diff --git a/test/cpp/server/load_reporter/get_cpu_stats_test.cc b/test/cpp/server/load_reporter/get_cpu_stats_test.cc index 98c15b2c69b..9b821d2c385 100644 --- a/test/cpp/server/load_reporter/get_cpu_stats_test.cc +++ b/test/cpp/server/load_reporter/get_cpu_stats_test.cc @@ -18,14 +18,15 @@ #include -#include +#include "src/cpp/server/load_reporter/get_cpu_stats.h" + #include +#include + #include "test/core/util/port.h" #include "test/core/util/test_config.h" -#include "src/cpp/server/load_reporter/get_cpu_stats.h" - namespace grpc { namespace testing { namespace { diff --git a/test/cpp/server/load_reporter/load_data_store_test.cc b/test/cpp/server/load_reporter/load_data_store_test.cc index 74fd3264351..4d5a877551b 100644 --- a/test/cpp/server/load_reporter/load_data_store_test.cc +++ b/test/cpp/server/load_reporter/load_data_store_test.cc @@ -18,13 +18,15 @@ #include +#include "src/cpp/server/load_reporter/load_data_store.h" + #include #include -#include #include -#include "src/cpp/server/load_reporter/load_data_store.h" +#include + #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/cpp/server/load_reporter/load_reporter_test.cc b/test/cpp/server/load_reporter/load_reporter_test.cc index 614a03bf0b3..9d84b045d83 100644 --- a/test/cpp/server/load_reporter/load_reporter_test.cc +++ b/test/cpp/server/load_reporter/load_reporter_test.cc @@ -18,24 +18,25 @@ #include +#include "src/cpp/server/load_reporter/load_reporter.h" + #include #include #include -#include #include #include "absl/memory/memory.h" +#include "opencensus/stats/testing/test_utils.h" + +#include #include "src/core/ext/filters/load_reporting/registered_opencensus_objects.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/cpp/server/load_reporter/constants.h" -#include "src/cpp/server/load_reporter/load_reporter.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" -#include "opencensus/stats/testing/test_utils.h" - namespace grpc { namespace testing { namespace { diff --git a/test/cpp/server/server_builder_test.cc b/test/cpp/server/server_builder_test.cc index 5d9fb06fd44..eb11e2d868b 100644 --- a/test/cpp/server/server_builder_test.cc +++ b/test/cpp/server/server_builder_test.cc @@ -16,14 +16,13 @@ * */ -#include #include +#include +#include #include #include -#include - #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/cpp/server/server_builder_with_socket_mutator_test.cc b/test/cpp/server/server_builder_with_socket_mutator_test.cc index 285f68b3aa9..8ed5372db9b 100644 --- a/test/cpp/server/server_builder_with_socket_mutator_test.cc +++ b/test/cpp/server/server_builder_with_socket_mutator_test.cc @@ -16,15 +16,15 @@ * */ -#include +#include + #include +#include +#include #include #include -#include -#include - #include "src/core/lib/iomgr/socket_mutator.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/util/port.h" diff --git a/test/cpp/server/server_request_call_test.cc b/test/cpp/server/server_request_call_test.cc index eaff0514907..a41d86c3fd3 100644 --- a/test/cpp/server/server_request_call_test.cc +++ b/test/cpp/server/server_request_call_test.cc @@ -18,22 +18,19 @@ #include -#include - -#include -#include +#include +#include #include +#include #include - -#include +#include +#include #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" -#include - namespace grpc { namespace { diff --git a/test/cpp/test/client_context_test_peer_test.cc b/test/cpp/test/client_context_test_peer_test.cc index 35f376fdd98..67ab62d6cb2 100644 --- a/test/cpp/test/client_context_test_peer_test.cc +++ b/test/cpp/test/client_context_test_peer_test.cc @@ -16,14 +16,14 @@ * */ -#include - #include #include -#include #include +#include +#include + namespace grpc { namespace testing { diff --git a/test/cpp/test/mock_stream_test.cc b/test/cpp/test/mock_stream_test.cc index 3338f32b750..646596b1177 100644 --- a/test/cpp/test/mock_stream_test.cc +++ b/test/cpp/test/mock_stream_test.cc @@ -16,11 +16,12 @@ * */ -#include #include #include "absl/memory/memory.h" +#include + #include "src/proto/grpc/testing/echo.grpc.pb.h" using grpc::testing::EchoRequest; diff --git a/test/cpp/test/server_context_test_spouse_test.cc b/test/cpp/test/server_context_test_spouse_test.cc index d4531a82c3f..42e9e89d001 100644 --- a/test/cpp/test/server_context_test_spouse_test.cc +++ b/test/cpp/test/server_context_test_spouse_test.cc @@ -16,14 +16,14 @@ * */ -#include - #include #include -#include #include +#include +#include + namespace grpc { namespace testing { diff --git a/test/cpp/thread_manager/thread_manager_test.cc b/test/cpp/thread_manager/thread_manager_test.cc index 31d6ad5029c..9d8db74d524 100644 --- a/test/cpp/thread_manager/thread_manager_test.cc +++ b/test/cpp/thread_manager/thread_manager_test.cc @@ -16,21 +16,23 @@ *is % allowed in string */ +#include + +#include "src/cpp/thread_manager/thread_manager.h" + #include #include #include #include #include +#include + #include -#include #include -#include "src/cpp/thread_manager/thread_manager.h" #include "test/core/util/test_config.h" -#include - namespace grpc { namespace { diff --git a/test/cpp/util/byte_buffer_test.cc b/test/cpp/util/byte_buffer_test.cc index 5d6c1837e4d..ab18b5ecc6b 100644 --- a/test/cpp/util/byte_buffer_test.cc +++ b/test/cpp/util/byte_buffer_test.cc @@ -16,16 +16,16 @@ * */ -#include -#include - #include #include +#include + +#include #include #include +#include #include -#include #include "test/core/util/test_config.h" diff --git a/test/cpp/util/channel_trace_proto_helper.cc b/test/cpp/util/channel_trace_proto_helper.cc index 2e1c7bee04c..770c9b00cb8 100644 --- a/test/cpp/util/channel_trace_proto_helper.cc +++ b/test/cpp/util/channel_trace_proto_helper.cc @@ -20,11 +20,12 @@ #include "test/cpp/util/channel_trace_proto_helper.h" +#include + #include #include #include #include -#include #include "src/core/lib/iomgr/error.h" #include "src/core/lib/json/json.h" diff --git a/test/cpp/util/channelz_sampler.cc b/test/cpp/util/channelz_sampler.cc index f62ae7f965b..a63e6b7105b 100644 --- a/test/cpp/util/channelz_sampler.cc +++ b/test/cpp/util/channelz_sampler.cc @@ -15,6 +15,8 @@ * limitations under the License. * */ +#include + #include #include @@ -25,8 +27,12 @@ #include #include +#include "absl/flags/flag.h" +#include "absl/strings/str_format.h" +#include "absl/strings/str_join.h" +#include "google/protobuf/text_format.h" + #include -#include #include #include #include @@ -37,10 +43,7 @@ #include #include #include -#include "absl/flags/flag.h" -#include "absl/strings/str_format.h" -#include "absl/strings/str_join.h" -#include "google/protobuf/text_format.h" + #include "src/core/lib/json/json.h" #include "src/cpp/server/channelz/channelz_service.h" #include "src/proto/grpc/channelz/channelz.pb.h" diff --git a/test/cpp/util/channelz_sampler_test.cc b/test/cpp/util/channelz_sampler_test.cc index d7543691334..c8519f66f95 100644 --- a/test/cpp/util/channelz_sampler_test.cc +++ b/test/cpp/util/channelz_sampler_test.cc @@ -15,6 +15,8 @@ * limitations under the License. * */ +#include + #include #include @@ -24,9 +26,10 @@ #include #include +#include "gtest/gtest.h" + #include #include -#include #include #include #include @@ -37,7 +40,7 @@ #include #include #include -#include "gtest/gtest.h" + #include "src/core/lib/gpr/env.h" #include "src/cpp/server/channelz/channelz_service.h" #include "src/proto/grpc/testing/test.grpc.pb.h" diff --git a/test/cpp/util/cli_call.cc b/test/cpp/util/cli_call.cc index 34def7a66f2..f1dc74133f5 100644 --- a/test/cpp/util/cli_call.cc +++ b/test/cpp/util/cli_call.cc @@ -18,6 +18,10 @@ #include "test/cpp/util/cli_call.h" +#include +#include +#include + #include #include #include @@ -25,10 +29,6 @@ #include #include -#include -#include -#include - namespace grpc { namespace testing { namespace { diff --git a/test/cpp/util/cli_call.h b/test/cpp/util/cli_call.h index 30271aef0e4..f5454a1e5a1 100644 --- a/test/cpp/util/cli_call.h +++ b/test/cpp/util/cli_call.h @@ -19,14 +19,14 @@ #ifndef GRPC_TEST_CPP_UTIL_CLI_CALL_H #define GRPC_TEST_CPP_UTIL_CLI_CALL_H +#include + #include #include #include #include #include -#include - namespace grpc { class ClientContext; diff --git a/test/cpp/util/cli_call_test.cc b/test/cpp/util/cli_call_test.cc index 51c2424bd71..9f8288af0e5 100644 --- a/test/cpp/util/cli_call_test.cc +++ b/test/cpp/util/cli_call_test.cc @@ -18,6 +18,8 @@ #include "test/cpp/util/cli_call.h" +#include + #include #include #include @@ -25,7 +27,6 @@ #include #include #include -#include #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/util/port.h" diff --git a/test/cpp/util/cli_credentials.cc b/test/cpp/util/cli_credentials.cc index 0c09872ff87..579276ab282 100644 --- a/test/cpp/util/cli_credentials.cc +++ b/test/cpp/util/cli_credentials.cc @@ -18,11 +18,12 @@ #include "test/cpp/util/cli_credentials.h" +#include "absl/flags/flag.h" + #include #include #include -#include "absl/flags/flag.h" #include "src/core/lib/iomgr/load_file.h" ABSL_RETIRED_FLAG(bool, enable_ssl, false, diff --git a/test/cpp/util/create_test_channel.cc b/test/cpp/util/create_test_channel.cc index 67b6bde58e4..a391532040a 100644 --- a/test/cpp/util/create_test_channel.cc +++ b/test/cpp/util/create_test_channel.cc @@ -18,11 +18,12 @@ #include "test/cpp/util/create_test_channel.h" +#include "absl/flags/flag.h" + #include #include #include -#include "absl/flags/flag.h" #include "test/cpp/util/test_credentials_provider.h" ABSL_FLAG(std::string, grpc_test_use_grpclb_with_child_policy, "", diff --git a/test/cpp/util/error_details_test.cc b/test/cpp/util/error_details_test.cc index 438f75f4cd4..cfb5a2af2a8 100644 --- a/test/cpp/util/error_details_test.cc +++ b/test/cpp/util/error_details_test.cc @@ -16,9 +16,10 @@ * */ -#include #include +#include + #include "src/proto/grpc/status/status.pb.h" #include "src/proto/grpc/testing/echo_messages.pb.h" #include "test/core/util/test_config.h" diff --git a/test/cpp/util/grpc_cli.cc b/test/cpp/util/grpc_cli.cc index a1b275a9b95..88ce1b76c31 100644 --- a/test/cpp/util/grpc_cli.cc +++ b/test/cpp/util/grpc_cli.cc @@ -60,13 +60,14 @@ address of the connection that each RPC is made on to stderr. */ -#include - #include #include #include #include "absl/flags/flag.h" + +#include + #include "test/cpp/util/cli_credentials.h" #include "test/cpp/util/grpc_tool.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/util/grpc_tool.cc b/test/cpp/util/grpc_tool.cc index 0175b0cf4e9..bcfbbbaf4c8 100644 --- a/test/cpp/util/grpc_tool.cc +++ b/test/cpp/util/grpc_tool.cc @@ -16,15 +16,9 @@ * */ -#include "test/cpp/util/grpc_tool.h" - -#include #include -#include -#include -#include -#include -#include + +#include "test/cpp/util/grpc_tool.h" #include #include @@ -36,6 +30,14 @@ #include "absl/flags/flag.h" #include "absl/memory/memory.h" + +#include +#include +#include +#include +#include +#include + #include "test/cpp/util/cli_call.h" #include "test/cpp/util/proto_file_parser.h" #include "test/cpp/util/proto_reflection_descriptor_database.h" diff --git a/test/cpp/util/grpc_tool_test.cc b/test/cpp/util/grpc_tool_test.cc index c1f158c5225..9dec8a22bf4 100644 --- a/test/cpp/util/grpc_tool_test.cc +++ b/test/cpp/util/grpc_tool_test.cc @@ -18,6 +18,14 @@ #include "test/cpp/util/grpc_tool.h" +#include +#include + +#include + +#include "absl/flags/declare.h" +#include "absl/flags/flag.h" + #include #include #include @@ -27,13 +35,7 @@ #include #include #include -#include -#include -#include - -#include "absl/flags/declare.h" -#include "absl/flags/flag.h" #include "src/core/lib/gpr/env.h" #include "src/core/lib/iomgr/load_file.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/util/proto_reflection_descriptor_database.h b/test/cpp/util/proto_reflection_descriptor_database.h index f1f752126e3..b8c9bab9fd7 100644 --- a/test/cpp/util/proto_reflection_descriptor_database.h +++ b/test/cpp/util/proto_reflection_descriptor_database.h @@ -25,6 +25,7 @@ #include #include + #include "src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h" namespace grpc { diff --git a/test/cpp/util/service_describer.h b/test/cpp/util/service_describer.h index b342d4d68ba..9e00eee1f56 100644 --- a/test/cpp/util/service_describer.h +++ b/test/cpp/util/service_describer.h @@ -20,6 +20,7 @@ #define GRPC_TEST_CPP_UTIL_SERVICE_DESCRIBER_H #include + #include "test/cpp/util/config_grpc_cli.h" namespace grpc { diff --git a/test/cpp/util/slice_test.cc b/test/cpp/util/slice_test.cc index 25041de4041..d74d3f8af69 100644 --- a/test/cpp/util/slice_test.cc +++ b/test/cpp/util/slice_test.cc @@ -16,12 +16,12 @@ * */ -#include -#include +#include +#include #include #include -#include +#include #include "test/core/util/test_config.h" diff --git a/test/cpp/util/string_ref_test.cc b/test/cpp/util/string_ref_test.cc index 8e3259b764b..1537e187e2e 100644 --- a/test/cpp/util/string_ref_test.cc +++ b/test/cpp/util/string_ref_test.cc @@ -16,12 +16,12 @@ * */ -#include - #include #include +#include + #include "test/core/util/test_config.h" namespace grpc { diff --git a/test/cpp/util/test_config_cc.cc b/test/cpp/util/test_config_cc.cc index d7d065c0927..866540d580f 100644 --- a/test/cpp/util/test_config_cc.cc +++ b/test/cpp/util/test_config_cc.cc @@ -19,6 +19,7 @@ #include #include "absl/flags/parse.h" + #include "test/cpp/util/test_config.h" namespace grpc { diff --git a/test/cpp/util/test_credentials_provider.cc b/test/cpp/util/test_credentials_provider.cc index 6ac77985380..b635e27cba1 100644 --- a/test/cpp/util/test_credentials_provider.cc +++ b/test/cpp/util/test_credentials_provider.cc @@ -19,10 +19,6 @@ #include "test/cpp/util/test_credentials_provider.h" -#include -#include -#include - #include #include #include @@ -30,6 +26,11 @@ #include #include "absl/flags/flag.h" + +#include +#include +#include + #include "test/core/end2end/data/ssl_test_data.h" ABSL_FLAG(std::string, tls_cert_file, "", diff --git a/test/cpp/util/time_test.cc b/test/cpp/util/time_test.cc index a64bec7f7e3..4970f4b56b4 100644 --- a/test/cpp/util/time_test.cc +++ b/test/cpp/util/time_test.cc @@ -16,9 +16,10 @@ * */ +#include + #include #include -#include #include "test/core/util/test_config.h" diff --git a/tools/distrib/python/grpcio_tools/grpc_tools/main.cc b/tools/distrib/python/grpcio_tools/grpc_tools/main.cc index d407f40eb66..2f1c70ffdfa 100644 --- a/tools/distrib/python/grpcio_tools/grpc_tools/main.cc +++ b/tools/distrib/python/grpcio_tools/grpc_tools/main.cc @@ -12,18 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - -#include "src/compiler/python_generator.h" - #include "grpc_tools/main.h" -#include -#include -#include -#include - #include #include #include @@ -31,6 +21,15 @@ #include #include +#include +#include +#include +#include +#include +#include + +#include "src/compiler/python_generator.h" + using ::google::protobuf::FileDescriptor; using ::google::protobuf::compiler::CodeGenerator; using ::google::protobuf::compiler::DiskSourceTree; diff --git a/tools/dockerfile/grpc_clang_format/clang_format_all_the_things.sh b/tools/dockerfile/grpc_clang_format/clang_format_all_the_things.sh index 7b3000fe360..e12d5f231e6 100755 --- a/tools/dockerfile/grpc_clang_format/clang_format_all_the_things.sh +++ b/tools/dockerfile/grpc_clang_format/clang_format_all_the_things.sh @@ -16,7 +16,7 @@ set -e # directories to run against -DIRS="examples/cpp examples/android/binder src/core/lib src/core/tsi src/core/ext src/cpp test/core test/cpp include src/compiler src/csharp src/ruby third_party/address_sorting src/objective-c tools/distrib/python" +DIRS="examples/cpp examples/android/binder src/core/lib src/core/tsi src/core/ext src/cpp test/core test/cpp include src/compiler src/csharp src/ruby src/objective-c tools/distrib/python" # file matching patterns to check GLOB="*.h *.c *.cc *.m *.mm"