From eca7775cb36e6ba49502042047e05b2f5ae4bba7 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Thu, 11 Apr 2024 04:43:32 +0000 Subject: [PATCH] Update src/core/ext/transport/.clang-format --- src/core/ext/transport/.clang-format | 3 --- src/core/ext/transport/chaotic_good/chaotic_good_transport.cc | 4 ++-- src/core/ext/transport/chaotic_good/chaotic_good_transport.h | 4 ++-- .../transport/chaotic_good/client/chaotic_good_connector.cc | 3 +-- .../transport/chaotic_good/client/chaotic_good_connector.h | 3 +-- src/core/ext/transport/chaotic_good/client_transport.cc | 3 +-- src/core/ext/transport/chaotic_good/client_transport.h | 3 +-- src/core/ext/transport/chaotic_good/frame.cc | 3 +-- src/core/ext/transport/chaotic_good/frame.h | 4 ++-- src/core/ext/transport/chaotic_good/frame_header.cc | 3 +-- src/core/ext/transport/chaotic_good/frame_header.h | 4 ++-- .../ext/transport/chaotic_good/server/chaotic_good_server.cc | 3 +-- .../ext/transport/chaotic_good/server/chaotic_good_server.h | 3 +-- src/core/ext/transport/chaotic_good/server_transport.cc | 3 +-- src/core/ext/transport/chaotic_good/server_transport.h | 3 +-- src/core/ext/transport/chaotic_good/settings_metadata.cc | 4 ++-- src/core/ext/transport/chaotic_good/settings_metadata.h | 4 ++-- src/core/ext/transport/chttp2/alpn/alpn.cc | 3 +-- src/core/ext/transport/chttp2/alpn/alpn.h | 4 ++-- src/core/ext/transport/chttp2/client/chttp2_connector.cc | 3 +-- src/core/ext/transport/chttp2/client/chttp2_connector.h | 3 +-- src/core/ext/transport/chttp2/server/chttp2_server.cc | 3 +-- src/core/ext/transport/chttp2/server/chttp2_server.h | 4 ++-- .../transport/cronet/client/secure/cronet_channel_create.cc | 3 +-- .../transport/cronet/client/secure/cronet_channel_create.h | 3 +-- src/core/ext/transport/cronet/transport/cronet_api_phony.cc | 3 +-- src/core/ext/transport/cronet/transport/cronet_status.cc | 4 ++-- src/core/ext/transport/cronet/transport/cronet_status.h | 3 +-- src/core/ext/transport/cronet/transport/cronet_transport.cc | 3 +-- src/core/ext/transport/cronet/transport/cronet_transport.h | 3 +-- src/core/ext/transport/inproc/inproc_transport.cc | 3 +-- src/core/ext/transport/inproc/inproc_transport.h | 3 +-- src/core/ext/transport/inproc/legacy_inproc_transport.cc | 3 +-- src/core/ext/transport/inproc/legacy_inproc_transport.h | 3 +-- 34 files changed, 42 insertions(+), 69 deletions(-) diff --git a/src/core/ext/transport/.clang-format b/src/core/ext/transport/.clang-format index 64387e9e515..5f150ef6edb 100644 --- a/src/core/ext/transport/.clang-format +++ b/src/core/ext/transport/.clang-format @@ -5,9 +5,6 @@ DerivePointerAlignment: false PointerAlignment: Left 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 diff --git a/src/core/ext/transport/chaotic_good/chaotic_good_transport.cc b/src/core/ext/transport/chaotic_good/chaotic_good_transport.cc index 655f7fd00aa..214907cf2f2 100644 --- a/src/core/ext/transport/chaotic_good/chaotic_good_transport.cc +++ b/src/core/ext/transport/chaotic_good/chaotic_good_transport.cc @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/ext/transport/chaotic_good/chaotic_good_transport.h" +#include + grpc_core::TraceFlag grpc_chaotic_good_trace(false, "chaotic_good"); namespace grpc_core {} // namespace grpc_core diff --git a/src/core/ext/transport/chaotic_good/chaotic_good_transport.h b/src/core/ext/transport/chaotic_good/chaotic_good_transport.h index 40a216c1d9f..f89d2d66282 100644 --- a/src/core/ext/transport/chaotic_good/chaotic_good_transport.h +++ b/src/core/ext/transport/chaotic_good/chaotic_good_transport.h @@ -15,13 +15,13 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_CHAOTIC_GOOD_TRANSPORT_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_CHAOTIC_GOOD_TRANSPORT_H -#include - #include #include #include "absl/random/random.h" +#include + #include "src/core/ext/transport/chaotic_good/frame.h" #include "src/core/ext/transport/chaotic_good/frame_header.h" #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" diff --git a/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc b/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc index 0eb354e5e6c..95caa424eeb 100644 --- a/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc +++ b/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h" #include @@ -25,6 +23,7 @@ #include "absl/status/statusor.h" #include +#include #include "src/core/client_channel/client_channel_factory.h" #include "src/core/client_channel/client_channel_filter.h" diff --git a/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h b/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h index b89af9766c4..826b6365e6f 100644 --- a/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h +++ b/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_CLIENT_CHAOTIC_GOOD_CONNECTOR_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_CLIENT_CHAOTIC_GOOD_CONNECTOR_H -#include - #include #include #include @@ -25,6 +23,7 @@ #include "absl/status/statusor.h" #include +#include #include "src/core/client_channel/connector.h" #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" diff --git a/src/core/ext/transport/chaotic_good/client_transport.cc b/src/core/ext/transport/chaotic_good/client_transport.cc index 22f15d026ad..14be491f0ee 100644 --- a/src/core/ext/transport/chaotic_good/client_transport.cc +++ b/src/core/ext/transport/chaotic_good/client_transport.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/ext/transport/chaotic_good/client_transport.h" #include @@ -30,6 +28,7 @@ #include #include #include +#include #include "src/core/ext/transport/chaotic_good/chaotic_good_transport.h" #include "src/core/ext/transport/chaotic_good/frame.h" diff --git a/src/core/ext/transport/chaotic_good/client_transport.h b/src/core/ext/transport/chaotic_good/client_transport.h index cfa41c5b7bd..89acb5f8d47 100644 --- a/src/core/ext/transport/chaotic_good/client_transport.h +++ b/src/core/ext/transport/chaotic_good/client_transport.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_CLIENT_TRANSPORT_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_CLIENT_TRANSPORT_H -#include - #include #include @@ -38,6 +36,7 @@ #include #include #include +#include #include "src/core/ext/transport/chaotic_good/chaotic_good_transport.h" #include "src/core/ext/transport/chaotic_good/frame.h" diff --git a/src/core/ext/transport/chaotic_good/frame.cc b/src/core/ext/transport/chaotic_good/frame.cc index eca4a02a419..a8aa5f18cad 100644 --- a/src/core/ext/transport/chaotic_good/frame.cc +++ b/src/core/ext/transport/chaotic_good/frame.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/ext/transport/chaotic_good/frame.h" #include @@ -27,6 +25,7 @@ #include #include +#include #include "src/core/ext/transport/chaotic_good/frame_header.h" #include "src/core/lib/gprpp/bitset.h" diff --git a/src/core/ext/transport/chaotic_good/frame.h b/src/core/ext/transport/chaotic_good/frame.h index 44989b7cbf3..2d820e85cce 100644 --- a/src/core/ext/transport/chaotic_good/frame.h +++ b/src/core/ext/transport/chaotic_good/frame.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_FRAME_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_FRAME_H -#include - #include #include #include @@ -25,6 +23,8 @@ #include "absl/status/status.h" #include "absl/types/variant.h" +#include + #include "src/core/ext/transport/chaotic_good/frame_header.h" #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" diff --git a/src/core/ext/transport/chaotic_good/frame_header.cc b/src/core/ext/transport/chaotic_good/frame_header.cc index d6672685383..b4c27074ce1 100644 --- a/src/core/ext/transport/chaotic_good/frame_header.cc +++ b/src/core/ext/transport/chaotic_good/frame_header.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/ext/transport/chaotic_good/frame_header.h" #include @@ -22,6 +20,7 @@ #include "absl/strings/str_cat.h" #include +#include namespace grpc_core { namespace chaotic_good { diff --git a/src/core/ext/transport/chaotic_good/frame_header.h b/src/core/ext/transport/chaotic_good/frame_header.h index 62f3088f58e..8bfbe3effb1 100644 --- a/src/core/ext/transport/chaotic_good/frame_header.h +++ b/src/core/ext/transport/chaotic_good/frame_header.h @@ -15,14 +15,14 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_FRAME_HEADER_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_FRAME_HEADER_H -#include - #include #include #include "absl/status/statusor.h" +#include + #include "src/core/lib/gprpp/bitset.h" namespace grpc_core { diff --git a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc index 8c172bd87ef..c1022e95c43 100644 --- a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc +++ b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/ext/transport/chaotic_good/server/chaotic_good_server.h" #include @@ -31,6 +29,7 @@ #include #include #include +#include #include "src/core/ext/transport/chaotic_good/frame.h" #include "src/core/ext/transport/chaotic_good/frame_header.h" diff --git a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h index a925e10218e..ed90dd45d1d 100644 --- a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h +++ b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_SERVER_CHAOTIC_GOOD_SERVER_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_SERVER_CHAOTIC_GOOD_SERVER_H -#include - #include #include #include @@ -29,6 +27,7 @@ #include "absl/status/statusor.h" #include +#include #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" diff --git a/src/core/ext/transport/chaotic_good/server_transport.cc b/src/core/ext/transport/chaotic_good/server_transport.cc index 50e6ee3f9dd..05edb2d0eb3 100644 --- a/src/core/ext/transport/chaotic_good/server_transport.cc +++ b/src/core/ext/transport/chaotic_good/server_transport.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/ext/transport/chaotic_good/server_transport.h" #include @@ -29,6 +27,7 @@ #include #include #include +#include #include "src/core/ext/transport/chaotic_good/chaotic_good_transport.h" #include "src/core/ext/transport/chaotic_good/frame.h" diff --git a/src/core/ext/transport/chaotic_good/server_transport.h b/src/core/ext/transport/chaotic_good/server_transport.h index 385dc6cf0b7..94b6d5b4aae 100644 --- a/src/core/ext/transport/chaotic_good/server_transport.h +++ b/src/core/ext/transport/chaotic_good/server_transport.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_SERVER_TRANSPORT_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_SERVER_TRANSPORT_H -#include - #include #include @@ -45,6 +43,7 @@ #include #include #include +#include #include "src/core/ext/transport/chaotic_good/chaotic_good_transport.h" #include "src/core/ext/transport/chaotic_good/frame.h" diff --git a/src/core/ext/transport/chaotic_good/settings_metadata.cc b/src/core/ext/transport/chaotic_good/settings_metadata.cc index af2e648c7fb..9d395e8ae25 100644 --- a/src/core/ext/transport/chaotic_good/settings_metadata.cc +++ b/src/core/ext/transport/chaotic_good/settings_metadata.cc @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/ext/transport/chaotic_good/settings_metadata.h" #include "absl/status/status.h" +#include + #include "src/core/lib/gprpp/crash.h" namespace grpc_core { diff --git a/src/core/ext/transport/chaotic_good/settings_metadata.h b/src/core/ext/transport/chaotic_good/settings_metadata.h index f092e6c265d..fab73696446 100644 --- a/src/core/ext/transport/chaotic_good/settings_metadata.h +++ b/src/core/ext/transport/chaotic_good/settings_metadata.h @@ -15,10 +15,10 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_SETTINGS_METADATA_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_SETTINGS_METADATA_H -#include - #include "absl/types/optional.h" +#include + #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/transport/metadata_batch.h" diff --git a/src/core/ext/transport/chttp2/alpn/alpn.cc b/src/core/ext/transport/chttp2/alpn/alpn.cc index be9c617a14f..1525e0b26c6 100644 --- a/src/core/ext/transport/chttp2/alpn/alpn.cc +++ b/src/core/ext/transport/chttp2/alpn/alpn.cc @@ -16,11 +16,10 @@ // // -#include - #include "src/core/ext/transport/chttp2/alpn/alpn.h" #include +#include #include "src/core/lib/gpr/useful.h" diff --git a/src/core/ext/transport/chttp2/alpn/alpn.h b/src/core/ext/transport/chttp2/alpn/alpn.h index 2f81d443465..9c381f8b3b2 100644 --- a/src/core/ext/transport/chttp2/alpn/alpn.h +++ b/src/core/ext/transport/chttp2/alpn/alpn.h @@ -19,10 +19,10 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_ALPN_ALPN_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_ALPN_ALPN_H -#include - #include +#include + // Returns 1 if the version is supported, 0 otherwise. int grpc_chttp2_is_alpn_version_supported(const char* version, size_t size); diff --git a/src/core/ext/transport/chttp2/client/chttp2_connector.cc b/src/core/ext/transport/chttp2/client/chttp2_connector.cc index 93940b5091e..4914ea75a78 100644 --- a/src/core/ext/transport/chttp2/client/chttp2_connector.cc +++ b/src/core/ext/transport/chttp2/client/chttp2_connector.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/ext/transport/chttp2/client/chttp2_connector.h" #include @@ -37,6 +35,7 @@ #include #include #include +#include #include #include "src/core/client_channel/client_channel_factory.h" diff --git a/src/core/ext/transport/chttp2/client/chttp2_connector.h b/src/core/ext/transport/chttp2/client/chttp2_connector.h index adf8d8f5c5c..f12090b01bc 100644 --- a/src/core/ext/transport/chttp2/client/chttp2_connector.h +++ b/src/core/ext/transport/chttp2/client/chttp2_connector.h @@ -19,12 +19,11 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_CLIENT_CHTTP2_CONNECTOR_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_CLIENT_CHTTP2_CONNECTOR_H -#include - #include "absl/base/thread_annotations.h" #include "absl/types/optional.h" #include +#include #include "src/core/client_channel/connector.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc index d55590e30e0..2e97b207ed2 100644 --- a/src/core/ext/transport/chttp2/server/chttp2_server.cc +++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/ext/transport/chttp2/server/chttp2_server.h" #include @@ -46,6 +44,7 @@ #include #include #include +#include #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/ext/transport/chttp2/transport/internal.h" diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.h b/src/core/ext/transport/chttp2/server/chttp2_server.h index e587c851e26..f7eb7a23c66 100644 --- a/src/core/ext/transport/chttp2/server/chttp2_server.h +++ b/src/core/ext/transport/chttp2/server/chttp2_server.h @@ -19,10 +19,10 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_SERVER_CHTTP2_SERVER_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_SERVER_CHTTP2_SERVER_H -#include - #include +#include + #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/surface/server.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 5431c576eda..60e277cb710 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 @@ -16,14 +16,13 @@ // // -#include - #include "src/core/ext/transport/cronet/client/secure/cronet_channel_create.h" #include "absl/status/statusor.h" #include #include +#include #include "src/core/ext/transport/cronet/transport/cronet_transport.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/ext/transport/cronet/client/secure/cronet_channel_create.h b/src/core/ext/transport/cronet/client/secure/cronet_channel_create.h index 5024c2ba190..9e14dd787fa 100644 --- a/src/core/ext/transport/cronet/client/secure/cronet_channel_create.h +++ b/src/core/ext/transport/cronet/client/secure/cronet_channel_create.h @@ -18,9 +18,8 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CRONET_CLIENT_SECURE_CRONET_CHANNEL_CREATE_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CRONET_CLIENT_SECURE_CRONET_CHANNEL_CREATE_H -#include - #include +#include #ifdef __cplusplus extern "C" { 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 024c3245b26..c0f245c5a73 100644 --- a/src/core/ext/transport/cronet/transport/cronet_api_phony.cc +++ b/src/core/ext/transport/cronet/transport/cronet_api_phony.cc @@ -19,11 +19,10 @@ // This file has empty implementation of all the functions exposed by the cronet // library, so we can build it in all environments -#include - #include "third_party/objective_c/Cronet/bidirectional_stream_c.h" #include +#include #ifdef GRPC_COMPILE_WITH_CRONET // link with the real CRONET library in the build system diff --git a/src/core/ext/transport/cronet/transport/cronet_status.cc b/src/core/ext/transport/cronet/transport/cronet_status.cc index 322dfdd9643..c2b51db2b0b 100644 --- a/src/core/ext/transport/cronet/transport/cronet_status.cc +++ b/src/core/ext/transport/cronet/transport/cronet_status.cc @@ -16,10 +16,10 @@ // // -#include - #include "src/core/ext/transport/cronet/transport/cronet_status.h" +#include + const char* cronet_net_error_as_string(cronet_net_error_code net_error) { switch (net_error) { case OK: diff --git a/src/core/ext/transport/cronet/transport/cronet_status.h b/src/core/ext/transport/cronet/transport/cronet_status.h index e1717f8e042..776df717de9 100644 --- a/src/core/ext/transport/cronet/transport/cronet_status.h +++ b/src/core/ext/transport/cronet/transport/cronet_status.h @@ -19,9 +19,8 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CRONET_TRANSPORT_CRONET_STATUS_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CRONET_TRANSPORT_CRONET_STATUS_H -#include - #include +#include enum cronet_net_error_code { // diff --git a/src/core/ext/transport/cronet/transport/cronet_transport.cc b/src/core/ext/transport/cronet/transport/cronet_transport.cc index 6a2678bcc2c..d215ed860c5 100644 --- a/src/core/ext/transport/cronet/transport/cronet_transport.cc +++ b/src/core/ext/transport/cronet/transport/cronet_transport.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/ext/transport/cronet/transport/cronet_transport.h" #include @@ -41,6 +39,7 @@ #include #include #include +#include #include #include "src/core/ext/transport/chttp2/transport/bin_decoder.h" diff --git a/src/core/ext/transport/cronet/transport/cronet_transport.h b/src/core/ext/transport/cronet/transport/cronet_transport.h index c3659bce1e3..e63a2c4c000 100644 --- a/src/core/ext/transport/cronet/transport/cronet_transport.h +++ b/src/core/ext/transport/cronet/transport/cronet_transport.h @@ -19,9 +19,8 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CRONET_TRANSPORT_CRONET_TRANSPORT_H #define GRPC_SRC_CORE_EXT_TRANSPORT_CRONET_TRANSPORT_CRONET_TRANSPORT_H -#include - #include +#include #include "src/core/lib/transport/transport_fwd.h" diff --git a/src/core/ext/transport/inproc/inproc_transport.cc b/src/core/ext/transport/inproc/inproc_transport.cc index 049735a4b08..7be425993e1 100644 --- a/src/core/ext/transport/inproc/inproc_transport.cc +++ b/src/core/ext/transport/inproc/inproc_transport.cc @@ -12,14 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/ext/transport/inproc/inproc_transport.h" #include #include #include +#include #include "src/core/ext/transport/inproc/legacy_inproc_transport.h" #include "src/core/lib/config/core_configuration.h" diff --git a/src/core/ext/transport/inproc/inproc_transport.h b/src/core/ext/transport/inproc/inproc_transport.h index fe41ed023c6..676b5f1fa32 100644 --- a/src/core/ext/transport/inproc/inproc_transport.h +++ b/src/core/ext/transport/inproc/inproc_transport.h @@ -15,9 +15,8 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_INPROC_INPROC_TRANSPORT_H #define GRPC_SRC_CORE_EXT_TRANSPORT_INPROC_INPROC_TRANSPORT_H -#include - #include +#include #include "src/core/lib/debug/trace.h" #include "src/core/lib/transport/transport.h" diff --git a/src/core/ext/transport/inproc/legacy_inproc_transport.cc b/src/core/ext/transport/inproc/legacy_inproc_transport.cc index 6373d77b35c..4106c7ade7c 100644 --- a/src/core/ext/transport/inproc/legacy_inproc_transport.cc +++ b/src/core/ext/transport/inproc/legacy_inproc_transport.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/ext/transport/inproc/legacy_inproc_transport.h" #include @@ -41,6 +39,7 @@ #include #include #include +#include #include #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/ext/transport/inproc/legacy_inproc_transport.h b/src/core/ext/transport/inproc/legacy_inproc_transport.h index e2cddf2b918..b50355ae905 100644 --- a/src/core/ext/transport/inproc/legacy_inproc_transport.h +++ b/src/core/ext/transport/inproc/legacy_inproc_transport.h @@ -15,9 +15,8 @@ #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_INPROC_LEGACY_INPROC_TRANSPORT_H #define GRPC_SRC_CORE_EXT_TRANSPORT_INPROC_LEGACY_INPROC_TRANSPORT_H -#include - #include +#include #include "src/core/lib/debug/trace.h"