From 2c467d1bcd86b38693a4d38f381176e782b06da4 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 9 Apr 2024 01:27:24 +0000 Subject: [PATCH] Update src/core/.clang-format --- src/core/.clang-format | 3 --- src/core/lib/address_utils/parse_address.cc | 4 ++-- src/core/lib/address_utils/parse_address.h | 4 ++-- src/core/lib/address_utils/sockaddr_utils.cc | 4 ++-- src/core/lib/address_utils/sockaddr_utils.h | 4 ++-- src/core/lib/avl/avl.h | 4 ++-- src/core/lib/backoff/backoff.cc | 4 ++-- src/core/lib/backoff/backoff.h | 4 ++-- src/core/lib/backoff/random_early_detection.cc | 4 ++-- src/core/lib/backoff/random_early_detection.h | 4 ++-- src/core/lib/channel/call_finalization.h | 4 ++-- src/core/lib/channel/call_tracer.cc | 3 +-- src/core/lib/channel/call_tracer.h | 3 +-- src/core/lib/channel/channel_args.cc | 3 +-- src/core/lib/channel/channel_args.h | 3 +-- src/core/lib/channel/channel_args_preconditioning.cc | 4 ++-- src/core/lib/channel/channel_args_preconditioning.h | 3 +-- src/core/lib/channel/channel_stack.cc | 3 +-- src/core/lib/channel/channel_stack.h | 3 +-- src/core/lib/channel/channel_stack_builder.cc | 4 ++-- src/core/lib/channel/channel_stack_builder.h | 4 ++-- src/core/lib/channel/channel_stack_builder_impl.cc | 3 +-- src/core/lib/channel/channel_stack_builder_impl.h | 4 ++-- src/core/lib/channel/channel_stack_trace.cc | 4 ++-- src/core/lib/channel/channel_trace.cc | 3 +-- src/core/lib/channel/channel_trace.h | 3 +-- src/core/lib/channel/channelz.cc | 3 +-- src/core/lib/channel/channelz.h | 3 +-- src/core/lib/channel/channelz_registry.cc | 3 +-- src/core/lib/channel/channelz_registry.h | 4 ++-- src/core/lib/channel/connected_channel.cc | 3 +-- src/core/lib/channel/metrics.cc | 4 ++-- src/core/lib/channel/metrics.h | 3 +-- src/core/lib/channel/promise_based_filter.cc | 3 +-- src/core/lib/channel/promise_based_filter.h | 3 +-- src/core/lib/channel/server_call_tracer_filter.cc | 4 ++-- src/core/lib/channel/status_util.cc | 4 ++-- src/core/lib/channel/status_util.h | 3 +-- src/core/lib/channel/tcp_tracer.h | 4 ++-- src/core/lib/compression/compression.cc | 3 +-- src/core/lib/compression/compression_internal.cc | 3 +-- src/core/lib/compression/compression_internal.h | 3 +-- src/core/lib/compression/message_compress.cc | 3 +-- src/core/lib/compression/message_compress.h | 3 +-- src/core/lib/config/config_vars.cc | 4 ++-- src/core/lib/config/config_vars.h | 4 ++-- src/core/lib/config/config_vars_non_generated.cc | 4 ++-- src/core/lib/config/core_configuration.cc | 3 +-- src/core/lib/config/core_configuration.h | 3 +-- src/core/lib/config/load_config.cc | 4 ++-- src/core/lib/config/load_config.h | 4 ++-- src/core/lib/debug/event_log.cc | 3 +-- src/core/lib/debug/event_log.h | 4 ++-- src/core/lib/debug/histogram_view.cc | 4 ++-- src/core/lib/debug/histogram_view.h | 4 ++-- src/core/lib/debug/stats.cc | 4 ++-- src/core/lib/debug/stats.h | 4 ++-- src/core/lib/debug/stats_data.cc | 4 ++-- src/core/lib/debug/stats_data.h | 4 ++-- src/core/lib/debug/trace.cc | 3 +-- src/core/lib/debug/trace.h | 4 ++-- src/core/lib/event_engine/ares_resolver.cc | 4 ++-- src/core/lib/event_engine/ares_resolver.h | 4 ++-- src/core/lib/event_engine/channel_args_endpoint_config.cc | 3 +-- src/core/lib/event_engine/channel_args_endpoint_config.h | 3 +-- src/core/lib/event_engine/common_closures.h | 3 +-- src/core/lib/event_engine/default_event_engine.cc | 3 +-- src/core/lib/event_engine/default_event_engine.h | 3 +-- src/core/lib/event_engine/default_event_engine_factory.cc | 3 +-- src/core/lib/event_engine/default_event_engine_factory.h | 3 +-- src/core/lib/event_engine/event_engine.cc | 3 +-- src/core/lib/event_engine/event_engine_context.h | 3 +-- src/core/lib/event_engine/extensions/can_track_errors.h | 4 ++-- src/core/lib/event_engine/extensions/chaotic_good_extension.h | 4 ++-- src/core/lib/event_engine/extensions/supports_fd.h | 3 +-- src/core/lib/event_engine/forkable.cc | 3 +-- src/core/lib/event_engine/forkable.h | 3 +-- src/core/lib/event_engine/grpc_polled_fd.h | 3 +-- src/core/lib/event_engine/handle_containers.h | 3 +-- src/core/lib/event_engine/memory_allocator_factory.h | 3 +-- src/core/lib/event_engine/poller.h | 3 +-- src/core/lib/event_engine/posix.h | 3 +-- src/core/lib/event_engine/query_extensions.h | 3 +-- .../lib/event_engine/ref_counted_dns_resolver_interface.h | 3 +-- src/core/lib/event_engine/resolved_address.cc | 3 +-- src/core/lib/event_engine/resolved_address_internal.h | 3 +-- src/core/lib/event_engine/shim.cc | 4 ++-- src/core/lib/event_engine/slice.cc | 3 +-- src/core/lib/event_engine/slice_buffer.cc | 3 +-- src/core/lib/event_engine/tcp_socket_utils.cc | 3 +-- src/core/lib/event_engine/tcp_socket_utils.h | 3 +-- src/core/lib/event_engine/thread_local.cc | 4 ++-- src/core/lib/event_engine/thread_pool/thread_count.cc | 3 +-- src/core/lib/event_engine/thread_pool/thread_count.h | 3 +-- src/core/lib/event_engine/thread_pool/thread_pool.h | 3 +-- src/core/lib/event_engine/thread_pool/thread_pool_factory.cc | 4 ++-- .../lib/event_engine/thread_pool/work_stealing_thread_pool.cc | 3 +-- .../lib/event_engine/thread_pool/work_stealing_thread_pool.h | 3 +-- .../event_engine/thready_event_engine/thready_event_engine.cc | 4 ++-- .../event_engine/thready_event_engine/thready_event_engine.h | 3 +-- src/core/lib/event_engine/time_util.cc | 3 +-- src/core/lib/event_engine/time_util.h | 3 +-- src/core/lib/event_engine/trace.cc | 4 ++-- src/core/lib/event_engine/trace.h | 3 +-- src/core/lib/event_engine/utils.cc | 3 +-- src/core/lib/event_engine/utils.h | 3 +-- src/core/lib/event_engine/work_queue/basic_work_queue.cc | 4 ++-- src/core/lib/event_engine/work_queue/basic_work_queue.h | 3 +-- src/core/lib/event_engine/work_queue/work_queue.h | 3 +-- src/core/lib/experiments/config.cc | 3 +-- src/core/lib/experiments/config.h | 4 ++-- src/core/lib/experiments/experiments.cc | 4 ++-- src/core/lib/handshaker/proxy_mapper.h | 4 ++-- src/core/lib/handshaker/proxy_mapper_registry.cc | 4 ++-- src/core/lib/handshaker/proxy_mapper_registry.h | 4 ++-- src/core/lib/http/format_request.cc | 3 +-- src/core/lib/http/format_request.h | 3 +-- src/core/lib/http/httpcli.cc | 3 +-- src/core/lib/http/httpcli.h | 3 +-- src/core/lib/http/httpcli_security_connector.cc | 3 +-- src/core/lib/http/httpcli_ssl_credentials.h | 3 +-- src/core/lib/http/parser.cc | 3 +-- src/core/lib/http/parser.h | 3 +-- src/core/lib/iomgr/buffer_list.cc | 3 +-- src/core/lib/iomgr/buffer_list.h | 3 +-- src/core/lib/iomgr/call_combiner.cc | 3 +-- src/core/lib/iomgr/call_combiner.h | 3 +-- src/core/lib/iomgr/closure.cc | 4 ++-- src/core/lib/iomgr/closure.h | 3 +-- src/core/lib/iomgr/combiner.cc | 3 +-- src/core/lib/iomgr/combiner.h | 3 +-- src/core/lib/iomgr/endpoint.cc | 4 ++-- src/core/lib/iomgr/endpoint.h | 3 +-- src/core/lib/iomgr/error.cc | 3 +-- src/core/lib/iomgr/error.h | 3 +-- src/core/lib/iomgr/ev_epoll1_linux.cc | 3 +-- src/core/lib/iomgr/ev_poll_posix.cc | 1 - src/core/lib/iomgr/ev_posix.cc | 3 +-- src/core/lib/iomgr/ev_posix.h | 4 ++-- src/core/lib/iomgr/event_engine_shims/closure.cc | 3 +-- src/core/lib/iomgr/event_engine_shims/closure.h | 3 +-- src/core/lib/iomgr/event_engine_shims/endpoint.cc | 3 +-- src/core/lib/iomgr/event_engine_shims/endpoint.h | 3 +-- src/core/lib/iomgr/event_engine_shims/tcp_client.cc | 3 +-- src/core/lib/iomgr/event_engine_shims/tcp_client.h | 3 +-- src/core/lib/iomgr/exec_ctx.cc | 3 +-- src/core/lib/iomgr/exec_ctx.h | 4 ++-- src/core/lib/iomgr/executor.cc | 3 +-- src/core/lib/iomgr/grpc_if_nametoindex.h | 4 ++-- src/core/lib/iomgr/internal_errqueue.cc | 3 +-- src/core/lib/iomgr/iocp_windows.h | 1 - src/core/lib/iomgr/iomgr.cc | 3 +-- src/core/lib/iomgr/iomgr.h | 4 ++-- src/core/lib/iomgr/iomgr_internal.cc | 4 ++-- src/core/lib/iomgr/iomgr_internal.h | 4 ++-- src/core/lib/iomgr/lockfree_event.cc | 3 +-- src/core/lib/iomgr/lockfree_event.h | 3 +-- src/core/lib/iomgr/polling_entity.cc | 3 +-- src/core/lib/iomgr/pollset.cc | 4 ++-- src/core/lib/iomgr/pollset.h | 1 - src/core/lib/iomgr/pollset_set.cc | 4 ++-- src/core/lib/iomgr/pollset_set_windows.cc | 4 ++-- src/core/lib/iomgr/pollset_windows.h | 1 - src/core/lib/iomgr/python_util.h | 3 +-- src/core/lib/iomgr/resolve_address.cc | 3 +-- src/core/lib/iomgr/resolve_address.h | 3 +-- src/core/lib/iomgr/resolve_address_impl.h | 4 ++-- src/core/lib/iomgr/resolve_address_posix.h | 4 ++-- src/core/lib/iomgr/resolve_address_windows.h | 4 ++-- src/core/lib/iomgr/resolved_address.h | 4 ++-- src/core/lib/iomgr/socket_factory_posix.h | 3 +-- src/core/lib/iomgr/socket_mutator.cc | 3 +-- src/core/lib/iomgr/socket_mutator.h | 3 +-- src/core/lib/iomgr/socket_utils.h | 4 ++-- src/core/lib/iomgr/socket_utils_posix.cc | 4 ++-- src/core/lib/iomgr/socket_utils_posix.h | 3 +-- src/core/lib/iomgr/tcp_client.cc | 4 ++-- src/core/lib/iomgr/tcp_client.h | 3 +-- src/core/lib/iomgr/tcp_client_windows.cc | 4 ++-- src/core/lib/iomgr/tcp_posix.cc | 3 +-- src/core/lib/iomgr/tcp_server.cc | 4 ++-- src/core/lib/iomgr/tcp_server.h | 3 +-- src/core/lib/iomgr/tcp_server_posix.cc | 3 +-- src/core/lib/iomgr/tcp_server_utils_posix.h | 4 ++-- src/core/lib/iomgr/tcp_server_utils_posix_common.cc | 3 +-- src/core/lib/iomgr/timer.cc | 4 ++-- src/core/lib/iomgr/timer.h | 3 +-- src/core/lib/iomgr/timer_generic.cc | 3 +-- src/core/lib/iomgr/timer_generic.h | 1 - src/core/lib/iomgr/timer_heap.cc | 3 +-- src/core/lib/iomgr/timer_manager.cc | 3 +-- src/core/lib/iomgr/timer_manager.h | 4 ++-- src/core/lib/iomgr/unix_sockets_posix.h | 3 +-- src/core/lib/iomgr/vsock.cc | 4 ++-- src/core/lib/iomgr/vsock.h | 3 +-- src/core/lib/json/json.h | 3 +-- src/core/lib/json/json_args.h | 4 ++-- src/core/lib/json/json_channel_args.h | 4 ++-- src/core/lib/json/json_object_loader.cc | 3 +-- src/core/lib/json/json_object_loader.h | 4 ++-- src/core/lib/json/json_reader.cc | 3 +-- src/core/lib/json/json_reader.h | 4 ++-- src/core/lib/json/json_util.cc | 4 ++-- src/core/lib/json/json_util.h | 4 ++-- src/core/lib/json/json_writer.cc | 4 ++-- src/core/lib/json/json_writer.h | 4 ++-- src/core/lib/matchers/matchers.cc | 4 ++-- src/core/lib/matchers/matchers.h | 4 ++-- src/core/lib/promise/activity.cc | 4 ++-- src/core/lib/promise/activity.h | 3 +-- src/core/lib/promise/all_ok.h | 4 ++-- src/core/lib/promise/arena_promise.h | 4 ++-- src/core/lib/promise/context.h | 3 +-- src/core/lib/promise/detail/join_state.h | 3 +-- src/core/lib/promise/detail/promise_factory.h | 4 ++-- src/core/lib/promise/detail/promise_like.h | 4 ++-- src/core/lib/promise/detail/seq_state.h | 3 +-- src/core/lib/promise/detail/status.h | 4 ++-- src/core/lib/promise/event_engine_wakeup_scheduler.h | 3 +-- src/core/lib/promise/exec_ctx_wakeup_scheduler.h | 4 ++-- src/core/lib/promise/for_each.h | 3 +-- src/core/lib/promise/if.h | 4 ++-- src/core/lib/promise/inter_activity_latch.h | 3 +-- src/core/lib/promise/inter_activity_pipe.h | 4 ++-- src/core/lib/promise/interceptor_list.h | 3 +-- src/core/lib/promise/join.h | 4 ++-- src/core/lib/promise/latch.h | 3 +-- src/core/lib/promise/loop.h | 4 ++-- src/core/lib/promise/map.h | 4 ++-- src/core/lib/promise/map_pipe.h | 3 +-- src/core/lib/promise/mpsc.h | 3 +-- src/core/lib/promise/observable.h | 4 ++-- src/core/lib/promise/party.cc | 3 +-- src/core/lib/promise/party.h | 3 +-- src/core/lib/promise/pipe.h | 3 +-- src/core/lib/promise/poll.h | 3 +-- src/core/lib/promise/prioritized_race.h | 4 ++-- src/core/lib/promise/promise.h | 4 ++-- src/core/lib/promise/promise_mutex.h | 3 +-- src/core/lib/promise/race.h | 4 ++-- src/core/lib/promise/seq.h | 4 ++-- src/core/lib/promise/sleep.cc | 3 +-- src/core/lib/promise/sleep.h | 3 +-- src/core/lib/promise/status_flag.h | 3 +-- src/core/lib/promise/switch.h | 4 ++-- src/core/lib/promise/trace.cc | 4 ++-- src/core/lib/promise/try_join.h | 4 ++-- src/core/lib/promise/try_seq.h | 4 ++-- src/core/lib/promise/wait_for_callback.h | 4 ++-- src/core/lib/promise/wait_set.h | 4 ++-- src/core/lib/resource_quota/api.cc | 3 +-- src/core/lib/resource_quota/api.h | 3 +-- src/core/lib/resource_quota/arena.cc | 3 +-- src/core/lib/resource_quota/arena.h | 3 +-- src/core/lib/resource_quota/connection_quota.cc | 3 +-- src/core/lib/resource_quota/connection_quota.h | 4 ++-- src/core/lib/resource_quota/memory_quota.cc | 3 +-- src/core/lib/resource_quota/memory_quota.h | 3 +-- src/core/lib/resource_quota/periodic_update.cc | 4 ++-- src/core/lib/resource_quota/periodic_update.h | 4 ++-- src/core/lib/resource_quota/resource_quota.cc | 4 ++-- src/core/lib/resource_quota/resource_quota.h | 3 +-- src/core/lib/resource_quota/thread_quota.cc | 3 +-- src/core/lib/resource_quota/thread_quota.h | 4 ++-- src/core/lib/resource_quota/trace.cc | 4 ++-- src/core/lib/security/authorization/audit_logging.cc | 3 +-- src/core/lib/security/authorization/audit_logging.h | 3 +-- src/core/lib/security/authorization/authorization_engine.h | 4 ++-- .../security/authorization/authorization_policy_provider.h | 3 +-- .../authorization/authorization_policy_provider_vtable.cc | 3 +-- .../lib/security/authorization/cel_authorization_engine.cc | 3 +-- .../lib/security/authorization/cel_authorization_engine.h | 4 ++-- src/core/lib/security/authorization/evaluate_args.cc | 3 +-- src/core/lib/security/authorization/evaluate_args.h | 3 +-- .../lib/security/authorization/grpc_authorization_engine.cc | 3 +-- .../lib/security/authorization/grpc_authorization_engine.h | 3 +-- .../authorization/grpc_authorization_policy_provider.cc | 3 +-- .../authorization/grpc_authorization_policy_provider.h | 3 +-- .../lib/security/authorization/grpc_server_authz_filter.cc | 3 +-- .../lib/security/authorization/grpc_server_authz_filter.h | 3 +-- src/core/lib/security/authorization/matchers.cc | 3 +-- src/core/lib/security/authorization/matchers.h | 4 ++-- src/core/lib/security/authorization/mock_cel/activation.h | 4 ++-- .../authorization/mock_cel/cel_expr_builder_factory.h | 4 ++-- src/core/lib/security/authorization/mock_cel/cel_expression.h | 4 ++-- src/core/lib/security/authorization/mock_cel/cel_value.h | 4 ++-- src/core/lib/security/authorization/mock_cel/evaluator_core.h | 4 ++-- .../lib/security/authorization/mock_cel/flat_expr_builder.h | 4 ++-- src/core/lib/security/authorization/rbac_policy.cc | 4 ++-- src/core/lib/security/authorization/rbac_policy.h | 3 +-- src/core/lib/security/authorization/rbac_translator.cc | 3 +-- src/core/lib/security/authorization/rbac_translator.h | 4 ++-- src/core/lib/security/authorization/stdout_logger.cc | 3 +-- src/core/lib/security/authorization/stdout_logger.h | 3 +-- .../certificate_provider/certificate_provider_factory.h | 3 +-- .../certificate_provider/certificate_provider_registry.cc | 3 +-- .../certificate_provider/certificate_provider_registry.h | 4 ++-- src/core/lib/security/context/security_context.cc | 3 +-- src/core/lib/security/context/security_context.h | 3 +-- src/core/lib/security/credentials/alts/alts_credentials.cc | 3 +-- src/core/lib/security/credentials/alts/alts_credentials.h | 3 +-- .../lib/security/credentials/alts/check_gcp_environment.cc | 3 +-- .../credentials/alts/grpc_alts_credentials_client_options.cc | 3 +-- .../credentials/alts/grpc_alts_credentials_options.cc | 3 +-- .../security/credentials/alts/grpc_alts_credentials_options.h | 3 +-- .../credentials/alts/grpc_alts_credentials_server_options.cc | 3 +-- src/core/lib/security/credentials/call_creds_util.cc | 3 +-- src/core/lib/security/credentials/call_creds_util.h | 3 +-- src/core/lib/security/credentials/channel_creds_registry.h | 4 ++-- .../lib/security/credentials/channel_creds_registry_init.cc | 3 +-- .../security/credentials/composite/composite_credentials.cc | 3 +-- .../security/credentials/composite/composite_credentials.h | 3 +-- src/core/lib/security/credentials/credentials.cc | 3 +-- src/core/lib/security/credentials/credentials.h | 3 +-- .../credentials/external/aws_external_account_credentials.cc | 3 +-- .../credentials/external/aws_external_account_credentials.h | 4 ++-- .../lib/security/credentials/external/aws_request_signer.cc | 4 ++-- .../lib/security/credentials/external/aws_request_signer.h | 4 ++-- .../credentials/external/external_account_credentials.cc | 3 +-- .../credentials/external/external_account_credentials.h | 4 ++-- .../credentials/external/file_external_account_credentials.cc | 3 +-- .../credentials/external/file_external_account_credentials.h | 4 ++-- .../credentials/external/url_external_account_credentials.cc | 3 +-- .../credentials/external/url_external_account_credentials.h | 4 ++-- src/core/lib/security/credentials/fake/fake_credentials.cc | 4 ++-- src/core/lib/security/credentials/fake/fake_credentials.h | 3 +-- .../credentials/google_default/credentials_generic.cc | 3 +-- .../credentials/google_default/google_default_credentials.cc | 3 +-- .../credentials/google_default/google_default_credentials.h | 3 +-- src/core/lib/security/credentials/iam/iam_credentials.cc | 3 +-- src/core/lib/security/credentials/iam/iam_credentials.h | 3 +-- .../lib/security/credentials/insecure/insecure_credentials.cc | 4 ++-- .../lib/security/credentials/insecure/insecure_credentials.h | 3 +-- src/core/lib/security/credentials/jwt/json_token.cc | 3 +-- src/core/lib/security/credentials/jwt/json_token.h | 3 +-- src/core/lib/security/credentials/jwt/jwt_credentials.cc | 3 +-- src/core/lib/security/credentials/jwt/jwt_credentials.h | 3 +-- src/core/lib/security/credentials/jwt/jwt_verifier.cc | 4 ++-- src/core/lib/security/credentials/jwt/jwt_verifier.h | 3 +-- src/core/lib/security/credentials/local/local_credentials.cc | 3 +-- src/core/lib/security/credentials/local/local_credentials.h | 3 +-- .../lib/security/credentials/oauth2/oauth2_credentials.cc | 3 +-- src/core/lib/security/credentials/oauth2/oauth2_credentials.h | 3 +-- .../lib/security/credentials/plugin/plugin_credentials.cc | 3 +-- src/core/lib/security/credentials/plugin/plugin_credentials.h | 3 +-- src/core/lib/security/credentials/ssl/ssl_credentials.cc | 3 +-- src/core/lib/security/credentials/ssl/ssl_credentials.h | 3 +-- .../credentials/tls/grpc_tls_certificate_distributor.cc | 3 +-- .../credentials/tls/grpc_tls_certificate_distributor.h | 4 ++-- .../security/credentials/tls/grpc_tls_certificate_match.cc | 4 ++-- .../security/credentials/tls/grpc_tls_certificate_provider.cc | 3 +-- .../security/credentials/tls/grpc_tls_certificate_provider.h | 3 +-- .../security/credentials/tls/grpc_tls_certificate_verifier.cc | 3 +-- .../security/credentials/tls/grpc_tls_certificate_verifier.h | 3 +-- .../security/credentials/tls/grpc_tls_credentials_options.cc | 3 +-- .../lib/security/credentials/tls/grpc_tls_crl_provider.cc | 4 ++-- src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h | 3 +-- src/core/lib/security/credentials/tls/tls_credentials.cc | 3 +-- src/core/lib/security/credentials/tls/tls_credentials.h | 3 +-- src/core/lib/security/credentials/tls/tls_utils.cc | 3 +-- src/core/lib/security/credentials/tls/tls_utils.h | 3 +-- src/core/lib/security/credentials/xds/xds_credentials.cc | 3 +-- src/core/lib/security/credentials/xds/xds_credentials.h | 3 +-- .../security_connector/alts/alts_security_connector.cc | 3 +-- .../security_connector/alts/alts_security_connector.h | 3 +-- .../security_connector/fake/fake_security_connector.cc | 3 +-- .../security_connector/fake/fake_security_connector.h | 3 +-- .../insecure/insecure_security_connector.cc | 3 +-- .../security_connector/insecure/insecure_security_connector.h | 3 +-- src/core/lib/security/security_connector/load_system_roots.h | 3 +-- .../security_connector/load_system_roots_supported.cc | 4 ++-- .../security/security_connector/load_system_roots_supported.h | 3 +-- .../security_connector/local/local_security_connector.cc | 3 +-- .../security_connector/local/local_security_connector.h | 3 +-- .../lib/security/security_connector/security_connector.cc | 3 +-- src/core/lib/security/security_connector/security_connector.h | 3 +-- .../security/security_connector/ssl/ssl_security_connector.cc | 3 +-- .../security/security_connector/ssl/ssl_security_connector.h | 3 +-- src/core/lib/security/security_connector/ssl_utils.cc | 3 +-- src/core/lib/security/security_connector/ssl_utils.h | 3 +-- .../security/security_connector/tls/tls_security_connector.cc | 3 +-- .../security/security_connector/tls/tls_security_connector.h | 3 +-- src/core/lib/security/transport/auth_filters.h | 3 +-- src/core/lib/security/transport/client_auth_filter.cc | 3 +-- src/core/lib/security/transport/secure_endpoint.cc | 3 +-- src/core/lib/security/transport/secure_endpoint.h | 3 +-- src/core/lib/security/transport/security_handshaker.cc | 3 +-- src/core/lib/security/transport/security_handshaker.h | 3 +-- src/core/lib/security/transport/server_auth_filter.cc | 3 +-- src/core/lib/security/transport/tsi_error.cc | 4 ++-- src/core/lib/security/util/json_util.cc | 3 +-- src/core/lib/slice/percent_encoding.cc | 3 +-- src/core/lib/slice/slice.cc | 3 +-- src/core/lib/slice/slice.h | 3 +-- src/core/lib/slice/slice_buffer.cc | 3 +-- src/core/lib/slice/slice_buffer.h | 3 +-- src/core/lib/slice/slice_internal.h | 3 +-- src/core/lib/slice/slice_refcount.cc | 4 ++-- src/core/lib/slice/slice_refcount.h | 3 +-- src/core/lib/slice/slice_string_helpers.cc | 4 ++-- src/core/lib/slice/slice_string_helpers.h | 3 +-- src/core/lib/surface/api_trace.cc | 4 ++-- src/core/lib/surface/api_trace.h | 3 +-- src/core/lib/surface/byte_buffer.cc | 3 +-- src/core/lib/surface/byte_buffer_reader.cc | 3 +-- src/core/lib/surface/call.cc | 3 +-- src/core/lib/surface/call.h | 3 +-- src/core/lib/surface/call_details.cc | 3 +-- src/core/lib/surface/call_log_batch.cc | 3 +-- src/core/lib/surface/call_test_only.h | 3 +-- src/core/lib/surface/channel.cc | 3 +-- src/core/lib/surface/channel.h | 3 +-- src/core/lib/surface/channel_create.cc | 3 +-- src/core/lib/surface/channel_create.h | 4 ++-- src/core/lib/surface/channel_init.cc | 3 +-- src/core/lib/surface/channel_init.h | 3 +-- src/core/lib/surface/channel_stack_type.cc | 4 ++-- src/core/lib/surface/completion_queue.cc | 3 +-- src/core/lib/surface/completion_queue.h | 3 +-- src/core/lib/surface/completion_queue_factory.cc | 3 +-- src/core/lib/surface/completion_queue_factory.h | 3 +-- src/core/lib/surface/event_string.cc | 4 ++-- src/core/lib/surface/event_string.h | 3 +-- src/core/lib/surface/init.cc | 3 +-- src/core/lib/surface/init_internally.cc | 4 ++-- src/core/lib/surface/lame_client.cc | 3 +-- src/core/lib/surface/lame_client.h | 3 +-- src/core/lib/surface/legacy_channel.cc | 3 +-- src/core/lib/surface/legacy_channel.h | 3 +-- src/core/lib/surface/metadata_array.cc | 3 +-- src/core/lib/surface/server.cc | 3 +-- src/core/lib/surface/server.h | 3 +-- src/core/lib/surface/validate_metadata.cc | 3 +-- src/core/lib/surface/validate_metadata.h | 3 +-- src/core/lib/surface/version.cc | 3 +-- src/core/lib/surface/wait_for_cq_end_op.cc | 4 ++-- src/core/lib/transport/batch_builder.cc | 4 ++-- src/core/lib/transport/batch_builder.h | 3 +-- src/core/lib/transport/bdp_estimator.cc | 4 ++-- src/core/lib/transport/bdp_estimator.h | 3 +-- src/core/lib/transport/call_filters.cc | 4 ++-- src/core/lib/transport/call_filters.h | 4 ++-- src/core/lib/transport/call_final_info.cc | 4 ++-- src/core/lib/transport/call_final_info.h | 3 +-- src/core/lib/transport/call_size_estimator.cc | 4 ++-- src/core/lib/transport/call_size_estimator.h | 4 ++-- src/core/lib/transport/call_spine.cc | 4 ++-- src/core/lib/transport/call_spine.h | 3 +-- src/core/lib/transport/connectivity_state.cc | 3 +-- src/core/lib/transport/connectivity_state.h | 3 +-- src/core/lib/transport/endpoint_info_handshaker.cc | 4 ++-- src/core/lib/transport/error_utils.cc | 3 +-- src/core/lib/transport/error_utils.h | 3 +-- src/core/lib/transport/handshaker.cc | 3 +-- src/core/lib/transport/handshaker.h | 3 +-- src/core/lib/transport/handshaker_registry.cc | 4 ++-- src/core/lib/transport/handshaker_registry.h | 4 ++-- src/core/lib/transport/http_connect_handshaker.cc | 3 +-- src/core/lib/transport/message.cc | 3 +-- src/core/lib/transport/metadata.cc | 4 ++-- src/core/lib/transport/metadata_batch.cc | 4 ++-- src/core/lib/transport/metadata_batch.h | 3 +-- src/core/lib/transport/metadata_compression_traits.h | 4 ++-- src/core/lib/transport/metadata_info.cc | 4 ++-- src/core/lib/transport/parsed_metadata.cc | 4 ++-- src/core/lib/transport/parsed_metadata.h | 3 +-- src/core/lib/transport/promise_endpoint.cc | 3 +-- src/core/lib/transport/promise_endpoint.h | 3 +-- src/core/lib/transport/simple_slice_based_metadata.h | 4 ++-- src/core/lib/transport/status_conversion.cc | 4 ++-- src/core/lib/transport/status_conversion.h | 3 +-- src/core/lib/transport/tcp_connect_handshaker.cc | 3 +-- src/core/lib/transport/timeout_encoding.cc | 3 +-- src/core/lib/transport/timeout_encoding.h | 4 ++-- src/core/lib/transport/transport.cc | 3 +-- src/core/lib/transport/transport.h | 3 +-- src/core/lib/transport/transport_op_string.cc | 3 +-- src/core/lib/uri/uri_parser.cc | 3 +-- src/core/lib/uri/uri_parser.h | 4 ++-- src/core/tsi/alts/crypt/aes_gcm.cc | 3 +-- src/core/tsi/alts/crypt/gsec.cc | 3 +-- src/core/tsi/alts/crypt/gsec.h | 3 +-- src/core/tsi/alts/frame_protector/alts_counter.cc | 3 +-- src/core/tsi/alts/frame_protector/alts_counter.h | 3 +-- src/core/tsi/alts/frame_protector/alts_crypter.cc | 3 +-- src/core/tsi/alts/frame_protector/alts_crypter.h | 3 +-- src/core/tsi/alts/frame_protector/alts_frame_protector.cc | 3 +-- src/core/tsi/alts/frame_protector/alts_frame_protector.h | 4 ++-- .../frame_protector/alts_record_protocol_crypter_common.cc | 3 +-- .../frame_protector/alts_record_protocol_crypter_common.h | 3 +-- .../frame_protector/alts_seal_privacy_integrity_crypter.cc | 3 +-- .../frame_protector/alts_unseal_privacy_integrity_crypter.cc | 3 +-- src/core/tsi/alts/frame_protector/frame_handler.cc | 3 +-- src/core/tsi/alts/frame_protector/frame_handler.h | 4 ++-- src/core/tsi/alts/handshaker/alts_handshaker_client.cc | 3 +-- src/core/tsi/alts/handshaker/alts_handshaker_client.h | 3 +-- src/core/tsi/alts/handshaker/alts_shared_resource.cc | 3 +-- src/core/tsi/alts/handshaker/alts_shared_resource.h | 3 +-- src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc | 3 +-- src/core/tsi/alts/handshaker/alts_tsi_handshaker.h | 3 +-- src/core/tsi/alts/handshaker/alts_tsi_utils.cc | 3 +-- src/core/tsi/alts/handshaker/alts_tsi_utils.h | 3 +-- src/core/tsi/alts/handshaker/transport_security_common_api.cc | 4 ++-- src/core/tsi/alts/handshaker/transport_security_common_api.h | 3 +-- .../alts_grpc_integrity_only_record_protocol.cc | 3 +-- .../alts_grpc_integrity_only_record_protocol.h | 4 ++-- .../alts_grpc_privacy_integrity_record_protocol.cc | 3 +-- .../alts_grpc_privacy_integrity_record_protocol.h | 4 ++-- .../zero_copy_frame_protector/alts_grpc_record_protocol.h | 3 +-- .../alts_grpc_record_protocol_common.cc | 3 +-- .../zero_copy_frame_protector/alts_iovec_record_protocol.cc | 3 +-- .../zero_copy_frame_protector/alts_iovec_record_protocol.h | 4 ++-- .../alts_zero_copy_grpc_protector.cc | 3 +-- .../zero_copy_frame_protector/alts_zero_copy_grpc_protector.h | 4 ++-- src/core/tsi/fake_transport_security.cc | 3 +-- src/core/tsi/local_transport_security.cc | 3 +-- src/core/tsi/local_transport_security.h | 3 +-- src/core/tsi/ssl/key_logging/ssl_key_logging.cc | 3 +-- src/core/tsi/ssl/key_logging/ssl_key_logging.h | 3 +-- src/core/tsi/ssl/session_cache/ssl_session.h | 3 +-- src/core/tsi/ssl/session_cache/ssl_session_cache.cc | 3 +-- src/core/tsi/ssl/session_cache/ssl_session_cache.h | 3 +-- src/core/tsi/ssl/session_cache/ssl_session_openssl.cc | 3 +-- src/core/tsi/ssl_transport_security.cc | 4 ++-- src/core/tsi/ssl_transport_security.h | 3 +-- src/core/tsi/ssl_transport_security_utils.cc | 4 ++-- src/core/tsi/ssl_transport_security_utils.h | 3 +-- src/core/tsi/ssl_types.h | 4 ++-- src/core/tsi/transport_security.cc | 3 +-- src/core/tsi/transport_security.h | 4 ++-- src/core/tsi/transport_security_grpc.cc | 4 ++-- src/core/tsi/transport_security_grpc.h | 3 +-- src/core/tsi/transport_security_interface.h | 4 ++-- 533 files changed, 706 insertions(+), 1062 deletions(-) diff --git a/src/core/.clang-format b/src/core/.clang-format index 64387e9e515..5f150ef6edb 100644 --- a/src/core/.clang-format +++ b/src/core/.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/lib/address_utils/parse_address.cc b/src/core/lib/address_utils/parse_address.cc index 4806d170988..8899aaf725f 100644 --- a/src/core/lib/address_utils/parse_address.cc +++ b/src/core/lib/address_utils/parse_address.cc @@ -16,10 +16,10 @@ // // -#include - #include "src/core/lib/address_utils/parse_address.h" +#include + #include "src/core/lib/iomgr/port.h" // IWYU pragma: keep #ifdef GRPC_HAVE_VSOCK diff --git a/src/core/lib/address_utils/parse_address.h b/src/core/lib/address_utils/parse_address.h index cc08aeda72e..b3093f1fd88 100644 --- a/src/core/lib/address_utils/parse_address.h +++ b/src/core/lib/address_utils/parse_address.h @@ -19,13 +19,13 @@ #ifndef GRPC_SRC_CORE_LIB_ADDRESS_UTILS_PARSE_ADDRESS_H #define GRPC_SRC_CORE_LIB_ADDRESS_UTILS_PARSE_ADDRESS_H -#include - #include #include "absl/status/statusor.h" #include "absl/strings/string_view.h" +#include + #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/uri/uri_parser.h" diff --git a/src/core/lib/address_utils/sockaddr_utils.cc b/src/core/lib/address_utils/sockaddr_utils.cc index c82efe927a1..a48bad46c26 100644 --- a/src/core/lib/address_utils/sockaddr_utils.cc +++ b/src/core/lib/address_utils/sockaddr_utils.cc @@ -16,12 +16,12 @@ // // -#include - #include "src/core/lib/address_utils/sockaddr_utils.h" #include #include + +#include #ifdef GRPC_HAVE_VSOCK #include #endif diff --git a/src/core/lib/address_utils/sockaddr_utils.h b/src/core/lib/address_utils/sockaddr_utils.h index 32c72bd525f..9837afd930b 100644 --- a/src/core/lib/address_utils/sockaddr_utils.h +++ b/src/core/lib/address_utils/sockaddr_utils.h @@ -19,14 +19,14 @@ #ifndef GRPC_SRC_CORE_LIB_ADDRESS_UTILS_SOCKADDR_UTILS_H #define GRPC_SRC_CORE_LIB_ADDRESS_UTILS_SOCKADDR_UTILS_H -#include - #include #include #include "absl/status/statusor.h" +#include + #include "src/core/lib/iomgr/resolved_address.h" // Returns true if addr is an IPv4-mapped IPv6 address within the diff --git a/src/core/lib/avl/avl.h b/src/core/lib/avl/avl.h index 4df3a0c1e4a..e8b9539bee2 100644 --- a/src/core/lib/avl/avl.h +++ b/src/core/lib/avl/avl.h @@ -15,14 +15,14 @@ #ifndef GRPC_SRC_CORE_LIB_AVL_AVL_H #define GRPC_SRC_CORE_LIB_AVL_AVL_H -#include - #include #include // IWYU pragma: keep #include #include +#include + #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" diff --git a/src/core/lib/backoff/backoff.cc b/src/core/lib/backoff/backoff.cc index 65716155c40..b0d6a9fa1f4 100644 --- a/src/core/lib/backoff/backoff.cc +++ b/src/core/lib/backoff/backoff.cc @@ -16,12 +16,12 @@ // // -#include - #include "src/core/lib/backoff/backoff.h" #include +#include + namespace grpc_core { BackOff::BackOff(const Options& options) : options_(options) { Reset(); } diff --git a/src/core/lib/backoff/backoff.h b/src/core/lib/backoff/backoff.h index 6f40ef5da5f..003335b6b7f 100644 --- a/src/core/lib/backoff/backoff.h +++ b/src/core/lib/backoff/backoff.h @@ -19,10 +19,10 @@ #ifndef GRPC_SRC_CORE_LIB_BACKOFF_BACKOFF_H #define GRPC_SRC_CORE_LIB_BACKOFF_BACKOFF_H -#include - #include "absl/random/random.h" +#include + #include "src/core/lib/gprpp/time.h" namespace grpc_core { diff --git a/src/core/lib/backoff/random_early_detection.cc b/src/core/lib/backoff/random_early_detection.cc index d9cd1a31700..c25e3792cdb 100644 --- a/src/core/lib/backoff/random_early_detection.cc +++ b/src/core/lib/backoff/random_early_detection.cc @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/backoff/random_early_detection.h" #include "absl/random/distributions.h" +#include + namespace grpc_core { bool RandomEarlyDetection::Reject(uint64_t size, absl::BitGenRef bitsrc) const { diff --git a/src/core/lib/backoff/random_early_detection.h b/src/core/lib/backoff/random_early_detection.h index e233c136149..400a0d3d57f 100644 --- a/src/core/lib/backoff/random_early_detection.h +++ b/src/core/lib/backoff/random_early_detection.h @@ -15,14 +15,14 @@ #ifndef GRPC_SRC_CORE_LIB_BACKOFF_RANDOM_EARLY_DETECTION_H #define GRPC_SRC_CORE_LIB_BACKOFF_RANDOM_EARLY_DETECTION_H -#include - #include #include #include "absl/random/bit_gen_ref.h" +#include + namespace grpc_core { // Implements the random early detection algorithm - allows items to be rejected diff --git a/src/core/lib/channel/call_finalization.h b/src/core/lib/channel/call_finalization.h index a3076677826..9e083e350a0 100644 --- a/src/core/lib/channel/call_finalization.h +++ b/src/core/lib/channel/call_finalization.h @@ -15,10 +15,10 @@ #ifndef GRPC_SRC_CORE_LIB_CHANNEL_CALL_FINALIZATION_H #define GRPC_SRC_CORE_LIB_CHANNEL_CALL_FINALIZATION_H -#include - #include +#include + #include "src/core/lib/promise/context.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/transport/call_final_info.h" diff --git a/src/core/lib/channel/call_tracer.cc b/src/core/lib/channel/call_tracer.cc index 47782406b1f..898cb5ab6b3 100644 --- a/src/core/lib/channel/call_tracer.cc +++ b/src/core/lib/channel/call_tracer.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/channel/call_tracer.h" #include @@ -25,6 +23,7 @@ #include #include +#include #include "src/core/lib/channel/tcp_tracer.h" #include "src/core/lib/promise/context.h" diff --git a/src/core/lib/channel/call_tracer.h b/src/core/lib/channel/call_tracer.h index 7c4d2447df4..f0b74f7e598 100644 --- a/src/core/lib/channel/call_tracer.h +++ b/src/core/lib/channel/call_tracer.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_CHANNEL_CALL_TRACER_H #define GRPC_SRC_CORE_LIB_CHANNEL_CALL_TRACER_H -#include - #include #include @@ -28,6 +26,7 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" +#include #include #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/lib/channel/channel_args.cc b/src/core/lib/channel/channel_args.cc index 80ac7f7569c..d02d5b369b3 100644 --- a/src/core/lib/channel/channel_args.cc +++ b/src/core/lib/channel/channel_args.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/channel/channel_args.h" #include @@ -38,6 +36,7 @@ #include #include #include +#include #include #include "src/core/lib/gpr/useful.h" diff --git a/src/core/lib/channel/channel_args.h b/src/core/lib/channel/channel_args.h index 0a8a12879e4..97197f43715 100644 --- a/src/core/lib/channel/channel_args.h +++ b/src/core/lib/channel/channel_args.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_ARGS_H #define GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_ARGS_H -#include - #include #include @@ -37,6 +35,7 @@ #include #include +#include #include "src/core/lib/avl/avl.h" #include "src/core/lib/gpr/useful.h" diff --git a/src/core/lib/channel/channel_args_preconditioning.cc b/src/core/lib/channel/channel_args_preconditioning.cc index 1fe51ad6879..92a94535d30 100644 --- a/src/core/lib/channel/channel_args_preconditioning.cc +++ b/src/core/lib/channel/channel_args_preconditioning.cc @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/channel/channel_args_preconditioning.h" #include +#include + namespace grpc_core { void ChannelArgsPreconditioning::Builder::RegisterStage(Stage stage) { diff --git a/src/core/lib/channel/channel_args_preconditioning.h b/src/core/lib/channel/channel_args_preconditioning.h index 1a13bb5e501..69f64accd34 100644 --- a/src/core/lib/channel/channel_args_preconditioning.h +++ b/src/core/lib/channel/channel_args_preconditioning.h @@ -15,12 +15,11 @@ #ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_ARGS_PRECONDITIONING_H #define GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_ARGS_PRECONDITIONING_H -#include - #include #include #include +#include #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/lib/channel/channel_stack.cc b/src/core/lib/channel/channel_stack.cc index a3b0307982e..4c4eaa2326d 100644 --- a/src/core/lib/channel/channel_stack.cc +++ b/src/core/lib/channel/channel_stack.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/channel/channel_stack.h" #include @@ -26,6 +24,7 @@ #include #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" diff --git a/src/core/lib/channel/channel_stack.h b/src/core/lib/channel/channel_stack.h index e32b0a4ae0a..affd34a4191 100644 --- a/src/core/lib/channel/channel_stack.h +++ b/src/core/lib/channel/channel_stack.h @@ -44,8 +44,6 @@ // it can have an effect on the call status. // -#include - #include #include @@ -56,6 +54,7 @@ #include #include #include +#include #include #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/lib/channel/channel_stack_builder.cc b/src/core/lib/channel/channel_stack_builder.cc index 9f5ebda6a3a..69c4fff4fe9 100644 --- a/src/core/lib/channel/channel_stack_builder.cc +++ b/src/core/lib/channel/channel_stack_builder.cc @@ -16,12 +16,12 @@ // // -#include - #include "src/core/lib/channel/channel_stack_builder.h" #include +#include + #include "src/core/lib/channel/channel_args.h" namespace grpc_core { diff --git a/src/core/lib/channel/channel_stack_builder.h b/src/core/lib/channel/channel_stack_builder.h index b0e66d46f64..b7c0f840d0f 100644 --- a/src/core/lib/channel/channel_stack_builder.h +++ b/src/core/lib/channel/channel_stack_builder.h @@ -15,14 +15,14 @@ #ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_H #define GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_H -#include - #include #include #include "absl/status/statusor.h" #include "absl/strings/string_view.h" +#include + #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" diff --git a/src/core/lib/channel/channel_stack_builder_impl.cc b/src/core/lib/channel/channel_stack_builder_impl.cc index a900e4580cc..6fd0b9f6484 100644 --- a/src/core/lib/channel/channel_stack_builder_impl.cc +++ b/src/core/lib/channel/channel_stack_builder_impl.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/channel/channel_stack_builder_impl.h" #include @@ -36,6 +34,7 @@ #include #include +#include #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" diff --git a/src/core/lib/channel/channel_stack_builder_impl.h b/src/core/lib/channel/channel_stack_builder_impl.h index 12d2017da19..6f298b7c287 100644 --- a/src/core/lib/channel/channel_stack_builder_impl.h +++ b/src/core/lib/channel/channel_stack_builder_impl.h @@ -15,10 +15,10 @@ #ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_IMPL_H #define GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_IMPL_H -#include - #include "absl/status/statusor.h" +#include + #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack_builder.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" diff --git a/src/core/lib/channel/channel_stack_trace.cc b/src/core/lib/channel/channel_stack_trace.cc index 59a49ddfbbf..b8e7b204a6a 100644 --- a/src/core/lib/channel/channel_stack_trace.cc +++ b/src/core/lib/channel/channel_stack_trace.cc @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/channel/channel_stack_trace.h" +#include + grpc_core::TraceFlag grpc_trace_channel_stack(false, "channel_stack"); diff --git a/src/core/lib/channel/channel_trace.cc b/src/core/lib/channel/channel_trace.cc index 4ba57020dc8..783a2f3b4b1 100644 --- a/src/core/lib/channel/channel_trace.cc +++ b/src/core/lib/channel/channel_trace.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/channel/channel_trace.h" #include @@ -27,6 +25,7 @@ #include #include +#include #include "src/core/lib/channel/channelz.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 ec5066cc268..b4f40a68d38 100644 --- a/src/core/lib/channel/channel_trace.h +++ b/src/core/lib/channel/channel_trace.h @@ -19,12 +19,11 @@ #ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_TRACE_H #define GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_TRACE_H -#include - #include #include #include +#include #include #include diff --git a/src/core/lib/channel/channelz.cc b/src/core/lib/channel/channelz.cc index 408dcd2af9a..d7ae044578e 100644 --- a/src/core/lib/channel/channelz.cc +++ b/src/core/lib/channel/channelz.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/channel/channelz.h" #include @@ -31,6 +29,7 @@ #include #include +#include #include #include "src/core/lib/address_utils/parse_address.h" diff --git a/src/core/lib/channel/channelz.h b/src/core/lib/channel/channelz.h index dd228a28479..cc83387c194 100644 --- a/src/core/lib/channel/channelz.h +++ b/src/core/lib/channel/channelz.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNELZ_H #define GRPC_SRC_CORE_LIB_CHANNEL_CHANNELZ_H -#include - #include #include @@ -36,6 +34,7 @@ #include #include #include +#include #include "src/core/lib/channel/channel_trace.h" #include "src/core/lib/gpr/time_precise.h" diff --git a/src/core/lib/channel/channelz_registry.cc b/src/core/lib/channel/channelz_registry.cc index aeef6de21fc..e451b187d6b 100644 --- a/src/core/lib/channel/channelz_registry.cc +++ b/src/core/lib/channel/channelz_registry.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/channel/channelz_registry.h" #include @@ -29,6 +27,7 @@ #include #include #include +#include #include #include "src/core/lib/channel/channelz.h" diff --git a/src/core/lib/channel/channelz_registry.h b/src/core/lib/channel/channelz_registry.h index 2c42ced0d47..b183d1690bf 100644 --- a/src/core/lib/channel/channelz_registry.h +++ b/src/core/lib/channel/channelz_registry.h @@ -19,14 +19,14 @@ #ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNELZ_REGISTRY_H #define GRPC_SRC_CORE_LIB_CHANNEL_CHANNELZ_REGISTRY_H -#include - #include #include #include #include "absl/base/thread_annotations.h" +#include + #include "src/core/lib/channel/channelz.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/sync.h" diff --git a/src/core/lib/channel/connected_channel.cc b/src/core/lib/channel/connected_channel.cc index 4955d8eeef3..f54e64c1aa7 100644 --- a/src/core/lib/channel/connected_channel.cc +++ b/src/core/lib/channel/connected_channel.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/channel/connected_channel.h" #include @@ -36,6 +34,7 @@ #include #include #include +#include #include "src/core/lib/channel/call_finalization.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/lib/channel/metrics.cc b/src/core/lib/channel/metrics.cc index 7f687975bc9..beb14309b32 100644 --- a/src/core/lib/channel/metrics.cc +++ b/src/core/lib/channel/metrics.cc @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/channel/metrics.h" #include +#include + #include "src/core/lib/gprpp/crash.h" namespace grpc_core { diff --git a/src/core/lib/channel/metrics.h b/src/core/lib/channel/metrics.h index 1dd79696552..a63ea6e1200 100644 --- a/src/core/lib/channel/metrics.h +++ b/src/core/lib/channel/metrics.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_CHANNEL_METRICS_H #define GRPC_SRC_CORE_LIB_CHANNEL_METRICS_H -#include - #include #include #include @@ -29,6 +27,7 @@ #include #include +#include #include "src/core/lib/channel/call_tracer.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/lib/channel/promise_based_filter.cc b/src/core/lib/channel/promise_based_filter.cc index 96a22a2fb0d..e5fe93ab058 100644 --- a/src/core/lib/channel/promise_based_filter.cc +++ b/src/core/lib/channel/promise_based_filter.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/channel/promise_based_filter.h" #include @@ -30,6 +28,7 @@ #include "absl/strings/str_join.h" #include +#include #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/debug/trace.h" diff --git a/src/core/lib/channel/promise_based_filter.h b/src/core/lib/channel/promise_based_filter.h index 852965c5686..9b5c5ae4f69 100644 --- a/src/core/lib/channel/promise_based_filter.h +++ b/src/core/lib/channel/promise_based_filter.h @@ -19,8 +19,6 @@ // promise-style. Most of this will be removed once the promises conversion is // completed. -#include - #include #include @@ -41,6 +39,7 @@ #include #include #include +#include #include "src/core/lib/channel/call_finalization.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/lib/channel/server_call_tracer_filter.cc b/src/core/lib/channel/server_call_tracer_filter.cc index 7a2ca01bb02..dbf628d8b83 100644 --- a/src/core/lib/channel/server_call_tracer_filter.cc +++ b/src/core/lib/channel/server_call_tracer_filter.cc @@ -14,8 +14,6 @@ // limitations under the License. // -#include - #include "src/core/lib/channel/server_call_tracer_filter.h" #include @@ -24,6 +22,8 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" +#include + #include "src/core/lib/channel/call_finalization.h" #include "src/core/lib/channel/call_tracer.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/lib/channel/status_util.cc b/src/core/lib/channel/status_util.cc index 742043a00f1..f846e360edf 100644 --- a/src/core/lib/channel/status_util.cc +++ b/src/core/lib/channel/status_util.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/channel/status_util.h" #include @@ -27,6 +25,8 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" +#include + #include "src/core/lib/gpr/useful.h" struct status_string_entry { diff --git a/src/core/lib/channel/status_util.h b/src/core/lib/channel/status_util.h index e67a4169bbc..cc46bd4feb0 100644 --- a/src/core/lib/channel/status_util.h +++ b/src/core/lib/channel/status_util.h @@ -19,14 +19,13 @@ #ifndef GRPC_SRC_CORE_LIB_CHANNEL_STATUS_UTIL_H #define GRPC_SRC_CORE_LIB_CHANNEL_STATUS_UTIL_H -#include - #include #include "absl/status/status.h" #include "absl/strings/string_view.h" #include +#include /// If \a status_str is a valid status string, sets \a status to the /// corresponding status value and returns true. diff --git a/src/core/lib/channel/tcp_tracer.h b/src/core/lib/channel/tcp_tracer.h index 5b218bc17b0..f6097447014 100644 --- a/src/core/lib/channel/tcp_tracer.h +++ b/src/core/lib/channel/tcp_tracer.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_CHANNEL_TCP_TRACER_H #define GRPC_SRC_CORE_LIB_CHANNEL_TCP_TRACER_H -#include - #include #include @@ -29,6 +27,8 @@ #include "absl/time/time.h" #include "absl/types/optional.h" +#include + namespace grpc_core { // Interface for TCP tracer implementations. Created by CallTracerInterface. diff --git a/src/core/lib/compression/compression.cc b/src/core/lib/compression/compression.cc index 821d153fabf..c03c882fb9c 100644 --- a/src/core/lib/compression/compression.cc +++ b/src/core/lib/compression/compression.cc @@ -16,8 +16,6 @@ // // -#include - #include #include @@ -26,6 +24,7 @@ #include #include #include +#include #include "src/core/lib/compression/compression_internal.h" #include "src/core/lib/debug/trace.h" diff --git a/src/core/lib/compression/compression_internal.cc b/src/core/lib/compression/compression_internal.cc index 7afb9ac70bf..e1b13a2f1ff 100644 --- a/src/core/lib/compression/compression_internal.cc +++ b/src/core/lib/compression/compression_internal.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/compression/compression_internal.h" #include @@ -31,6 +29,7 @@ #include #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" diff --git a/src/core/lib/compression/compression_internal.h b/src/core/lib/compression/compression_internal.h index ccbdd4aa9d9..80434e6f59b 100644 --- a/src/core/lib/compression/compression_internal.h +++ b/src/core/lib/compression/compression_internal.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_COMPRESSION_COMPRESSION_INTERNAL_H #define GRPC_SRC_CORE_LIB_COMPRESSION_COMPRESSION_INTERNAL_H -#include - #include #include @@ -29,6 +27,7 @@ #include "absl/types/optional.h" #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/bitset.h" diff --git a/src/core/lib/compression/message_compress.cc b/src/core/lib/compression/message_compress.cc index bd0571748bd..59b5d9eee6d 100644 --- a/src/core/lib/compression/message_compress.cc +++ b/src/core/lib/compression/message_compress.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/compression/message_compress.h" #include @@ -28,6 +26,7 @@ #include #include #include +#include #include "src/core/lib/slice/slice.h" diff --git a/src/core/lib/compression/message_compress.h b/src/core/lib/compression/message_compress.h index e597a19aeb9..c48d4b41f41 100644 --- a/src/core/lib/compression/message_compress.h +++ b/src/core/lib/compression/message_compress.h @@ -19,10 +19,9 @@ #ifndef GRPC_SRC_CORE_LIB_COMPRESSION_MESSAGE_COMPRESS_H #define GRPC_SRC_CORE_LIB_COMPRESSION_MESSAGE_COMPRESS_H -#include - #include #include +#include // compress 'input' to 'output' using 'algorithm'. // On success, appends compressed slices to output and returns 1. diff --git a/src/core/lib/config/config_vars.cc b/src/core/lib/config/config_vars.cc index 0be3963d6e6..b01070f81a7 100644 --- a/src/core/lib/config/config_vars.cc +++ b/src/core/lib/config/config_vars.cc @@ -16,13 +16,13 @@ // Automatically generated by tools/codegen/core/gen_config_vars.py // -#include - #include "src/core/lib/config/config_vars.h" #include "absl/flags/flag.h" #include "absl/strings/escaping.h" +#include + #include "src/core/lib/config/load_config.h" #ifndef GPR_DEFAULT_LOG_VERBOSITY_STRING diff --git a/src/core/lib/config/config_vars.h b/src/core/lib/config/config_vars.h index c252b2809dc..20ca3c2d6d9 100644 --- a/src/core/lib/config/config_vars.h +++ b/src/core/lib/config/config_vars.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_CONFIG_CONFIG_VARS_H #define GRPC_SRC_CORE_LIB_CONFIG_CONFIG_VARS_H -#include - #include #include @@ -29,6 +27,8 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" +#include + namespace grpc_core { class GPR_DLL ConfigVars { diff --git a/src/core/lib/config/config_vars_non_generated.cc b/src/core/lib/config/config_vars_non_generated.cc index 78af08c1d8d..2f86246f2b7 100644 --- a/src/core/lib/config/config_vars_non_generated.cc +++ b/src/core/lib/config/config_vars_non_generated.cc @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include #include +#include + #include "src/core/lib/config/config_vars.h" namespace grpc_core { diff --git a/src/core/lib/config/core_configuration.cc b/src/core/lib/config/core_configuration.cc index 782b0621154..84ca3d0da25 100644 --- a/src/core/lib/config/core_configuration.cc +++ b/src/core/lib/config/core_configuration.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/config/core_configuration.h" #include @@ -21,6 +19,7 @@ #include #include +#include namespace grpc_core { diff --git a/src/core/lib/config/core_configuration.h b/src/core/lib/config/core_configuration.h index 761eb5d1fc0..56d73a21986 100644 --- a/src/core/lib/config/core_configuration.h +++ b/src/core/lib/config/core_configuration.h @@ -15,13 +15,12 @@ #ifndef GRPC_SRC_CORE_LIB_CONFIG_CORE_CONFIGURATION_H #define GRPC_SRC_CORE_LIB_CONFIG_CORE_CONFIGURATION_H -#include - #include #include "absl/functional/any_invocable.h" #include +#include #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/handshaker/proxy_mapper_registry.h" diff --git a/src/core/lib/config/load_config.cc b/src/core/lib/config/load_config.cc index 6389d5e140f..b865beda8f4 100644 --- a/src/core/lib/config/load_config.cc +++ b/src/core/lib/config/load_config.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/config/load_config.h" #include @@ -23,6 +21,8 @@ #include "absl/strings/str_join.h" #include "absl/types/optional.h" +#include + #include "src/core/lib/gpr/log_internal.h" #include "src/core/lib/gprpp/env.h" diff --git a/src/core/lib/config/load_config.h b/src/core/lib/config/load_config.h index 2ee4891dca1..a668174193f 100644 --- a/src/core/lib/config/load_config.h +++ b/src/core/lib/config/load_config.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_CONFIG_LOAD_CONFIG_H #define GRPC_SRC_CORE_LIB_CONFIG_LOAD_CONFIG_H -#include - #include #include @@ -26,6 +24,8 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" +#include + namespace grpc_core { std::string LoadConfigFromEnv(absl::string_view environment_variable, diff --git a/src/core/lib/debug/event_log.cc b/src/core/lib/debug/event_log.cc index 984791c411a..1c95bafb2d4 100644 --- a/src/core/lib/debug/event_log.cc +++ b/src/core/lib/debug/event_log.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/debug/event_log.h" #include @@ -23,6 +21,7 @@ #include "absl/strings/str_join.h" #include +#include namespace grpc_core { diff --git a/src/core/lib/debug/event_log.h b/src/core/lib/debug/event_log.h index 3458d95ea7d..8e36b8869b4 100644 --- a/src/core/lib/debug/event_log.h +++ b/src/core/lib/debug/event_log.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_DEBUG_EVENT_LOG_H #define GRPC_SRC_CORE_LIB_DEBUG_EVENT_LOG_H -#include - #include #include @@ -27,6 +25,8 @@ #include "absl/strings/string_view.h" #include "absl/types/span.h" +#include + #include "src/core/lib/gpr/time_precise.h" #include "src/core/lib/gprpp/per_cpu.h" #include "src/core/lib/gprpp/sync.h" diff --git a/src/core/lib/debug/histogram_view.cc b/src/core/lib/debug/histogram_view.cc index 81c9a9b7829..803f7a2321e 100644 --- a/src/core/lib/debug/histogram_view.cc +++ b/src/core/lib/debug/histogram_view.cc @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/debug/histogram_view.h" +#include + namespace grpc_core { double HistogramView::Count() const { diff --git a/src/core/lib/debug/histogram_view.h b/src/core/lib/debug/histogram_view.h index c104f3d1cf1..dd6dd74fd41 100644 --- a/src/core/lib/debug/histogram_view.h +++ b/src/core/lib/debug/histogram_view.h @@ -15,10 +15,10 @@ #ifndef GRPC_SRC_CORE_LIB_DEBUG_HISTOGRAM_VIEW_H #define GRPC_SRC_CORE_LIB_DEBUG_HISTOGRAM_VIEW_H -#include - #include +#include + namespace grpc_core { struct HistogramView { diff --git a/src/core/lib/debug/stats.cc b/src/core/lib/debug/stats.cc index 611ed4165ab..e7d6a63169d 100644 --- a/src/core/lib/debug/stats.cc +++ b/src/core/lib/debug/stats.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/debug/stats.h" #include @@ -28,6 +26,8 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" +#include + namespace grpc_core { namespace stats_detail { diff --git a/src/core/lib/debug/stats.h b/src/core/lib/debug/stats.h index f00a93eca8e..6415a4cd039 100644 --- a/src/core/lib/debug/stats.h +++ b/src/core/lib/debug/stats.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_DEBUG_STATS_H #define GRPC_SRC_CORE_LIB_DEBUG_STATS_H -#include - #include #include @@ -29,6 +27,8 @@ #include "absl/strings/string_view.h" #include "absl/types/span.h" +#include + #include "src/core/lib/debug/histogram_view.h" #include "src/core/lib/debug/stats_data.h" #include "src/core/lib/gprpp/no_destruct.h" diff --git a/src/core/lib/debug/stats_data.cc b/src/core/lib/debug/stats_data.cc index 4a08fe5ae5e..a390927e78f 100644 --- a/src/core/lib/debug/stats_data.cc +++ b/src/core/lib/debug/stats_data.cc @@ -14,12 +14,12 @@ // Automatically generated by tools/codegen/core/gen_stats_data.py -#include - #include "src/core/lib/debug/stats_data.h" #include +#include + namespace grpc_core { namespace { union DblUint { diff --git a/src/core/lib/debug/stats_data.h b/src/core/lib/debug/stats_data.h index ec4a6b8765c..8b9aa2b5fa8 100644 --- a/src/core/lib/debug/stats_data.h +++ b/src/core/lib/debug/stats_data.h @@ -17,8 +17,6 @@ #ifndef GRPC_SRC_CORE_LIB_DEBUG_STATS_DATA_H #define GRPC_SRC_CORE_LIB_DEBUG_STATS_DATA_H -#include - #include #include @@ -26,6 +24,8 @@ #include "absl/strings/string_view.h" +#include + #include "src/core/lib/debug/histogram_view.h" #include "src/core/lib/gprpp/per_cpu.h" diff --git a/src/core/lib/debug/trace.cc b/src/core/lib/debug/trace.cc index 729052cedeb..5b7e189bf9c 100644 --- a/src/core/lib/debug/trace.cc +++ b/src/core/lib/debug/trace.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/debug/trace.h" #include @@ -30,6 +28,7 @@ #include #include +#include #include "src/core/lib/config/config_vars.h" diff --git a/src/core/lib/debug/trace.h b/src/core/lib/debug/trace.h index d3c8ee487b3..21b037c1139 100644 --- a/src/core/lib/debug/trace.h +++ b/src/core/lib/debug/trace.h @@ -19,14 +19,14 @@ #ifndef GRPC_SRC_CORE_LIB_DEBUG_TRACE_H #define GRPC_SRC_CORE_LIB_DEBUG_TRACE_H -#include - #include #include #include #include "absl/strings/string_view.h" +#include + void grpc_tracer_init(); void grpc_tracer_shutdown(void); diff --git a/src/core/lib/event_engine/ares_resolver.cc b/src/core/lib/event_engine/ares_resolver.cc index a51b94630fe..6a5f3268b5c 100644 --- a/src/core/lib/event_engine/ares_resolver.cc +++ b/src/core/lib/event_engine/ares_resolver.cc @@ -11,13 +11,13 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/event_engine/ares_resolver.h" #include #include +#include + #include "src/core/lib/iomgr/port.h" // IWYU pragma: no_include diff --git a/src/core/lib/event_engine/ares_resolver.h b/src/core/lib/event_engine/ares_resolver.h index a1837f2ccf0..5c61bd7bd3d 100644 --- a/src/core/lib/event_engine/ares_resolver.h +++ b/src/core/lib/event_engine/ares_resolver.h @@ -14,10 +14,10 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_ARES_RESOLVER_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_ARES_RESOLVER_H -#include - #include +#include + #include "src/core/lib/debug/trace.h" #if GRPC_ARES == 1 diff --git a/src/core/lib/event_engine/channel_args_endpoint_config.cc b/src/core/lib/event_engine/channel_args_endpoint_config.cc index df8e56e29dd..6cc79a7028a 100644 --- a/src/core/lib/event_engine/channel_args_endpoint_config.cc +++ b/src/core/lib/event_engine/channel_args_endpoint_config.cc @@ -11,8 +11,6 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include @@ -20,6 +18,7 @@ #include "absl/types/optional.h" #include +#include #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/lib/event_engine/channel_args_endpoint_config.h b/src/core/lib/event_engine/channel_args_endpoint_config.h index ac6297f9d72..c14735e3376 100644 --- a/src/core/lib/event_engine/channel_args_endpoint_config.h +++ b/src/core/lib/event_engine/channel_args_endpoint_config.h @@ -14,12 +14,11 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_CHANNEL_ARGS_ENDPOINT_CONFIG_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_CHANNEL_ARGS_ENDPOINT_CONFIG_H -#include - #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include +#include #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/lib/event_engine/common_closures.h b/src/core/lib/event_engine/common_closures.h index 0bc654f4671..007f352cbb8 100644 --- a/src/core/lib/event_engine/common_closures.h +++ b/src/core/lib/event_engine/common_closures.h @@ -15,13 +15,12 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_COMMON_CLOSURES_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_COMMON_CLOSURES_H -#include - #include #include "absl/functional/any_invocable.h" #include +#include namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/default_event_engine.cc b/src/core/lib/event_engine/default_event_engine.cc index c37e5163a38..743b788c72f 100644 --- a/src/core/lib/event_engine/default_event_engine.cc +++ b/src/core/lib/event_engine/default_event_engine.cc @@ -11,8 +11,6 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/event_engine/default_event_engine.h" #include @@ -22,6 +20,7 @@ #include "absl/functional/any_invocable.h" #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" diff --git a/src/core/lib/event_engine/default_event_engine.h b/src/core/lib/event_engine/default_event_engine.h index 1725447ffdf..d1944fa56f0 100644 --- a/src/core/lib/event_engine/default_event_engine.h +++ b/src/core/lib/event_engine/default_event_engine.h @@ -15,11 +15,10 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_H -#include - #include #include +#include #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/gprpp/debug_location.h" diff --git a/src/core/lib/event_engine/default_event_engine_factory.cc b/src/core/lib/event_engine/default_event_engine_factory.cc index 10bfe898650..d48aa2fba03 100644 --- a/src/core/lib/event_engine/default_event_engine_factory.cc +++ b/src/core/lib/event_engine/default_event_engine_factory.cc @@ -12,13 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/event_engine/default_event_engine_factory.h" #include #include +#include #if defined(GPR_WINDOWS) #include "src/core/lib/event_engine/windows/windows_engine.h" diff --git a/src/core/lib/event_engine/default_event_engine_factory.h b/src/core/lib/event_engine/default_event_engine_factory.h index 52feebbb415..a32f04ff6be 100644 --- a/src/core/lib/event_engine/default_event_engine_factory.h +++ b/src/core/lib/event_engine/default_event_engine_factory.h @@ -15,11 +15,10 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_FACTORY_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_FACTORY_H -#include - #include #include +#include namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/event_engine.cc b/src/core/lib/event_engine/event_engine.cc index af39b46cc31..6815e2eb50b 100644 --- a/src/core/lib/event_engine/event_engine.cc +++ b/src/core/lib/event_engine/event_engine.cc @@ -11,9 +11,8 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include - #include +#include namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/event_engine_context.h b/src/core/lib/event_engine/event_engine_context.h index c256f696117..f14a6e81122 100644 --- a/src/core/lib/event_engine/event_engine_context.h +++ b/src/core/lib/event_engine/event_engine_context.h @@ -15,9 +15,8 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_EVENT_ENGINE_CONTEXT_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_EVENT_ENGINE_CONTEXT_H -#include - #include +#include #include "src/core/lib/promise/context.h" diff --git a/src/core/lib/event_engine/extensions/can_track_errors.h b/src/core/lib/event_engine/extensions/can_track_errors.h index d3042acbb2a..8a6f9df046c 100644 --- a/src/core/lib/event_engine/extensions/can_track_errors.h +++ b/src/core/lib/event_engine/extensions/can_track_errors.h @@ -15,10 +15,10 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_CAN_TRACK_ERRORS_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_CAN_TRACK_ERRORS_H -#include - #include "absl/strings/string_view.h" +#include + namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/extensions/chaotic_good_extension.h b/src/core/lib/event_engine/extensions/chaotic_good_extension.h index b6b1699875e..9610f4ed720 100644 --- a/src/core/lib/event_engine/extensions/chaotic_good_extension.h +++ b/src/core/lib/event_engine/extensions/chaotic_good_extension.h @@ -15,10 +15,10 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_CHAOTIC_GOOD_EXTENSION_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_CHAOTIC_GOOD_EXTENSION_H -#include - #include "absl/strings/string_view.h" +#include + #include "src/core/lib/resource_quota/memory_quota.h" namespace grpc_event_engine { diff --git a/src/core/lib/event_engine/extensions/supports_fd.h b/src/core/lib/event_engine/extensions/supports_fd.h index ae5fd6986c8..66ea1c2b345 100644 --- a/src/core/lib/event_engine/extensions/supports_fd.h +++ b/src/core/lib/event_engine/extensions/supports_fd.h @@ -15,13 +15,12 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_SUPPORTS_FD_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_SUPPORTS_FD_H -#include - #include "absl/functional/any_invocable.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include +#include namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/forkable.cc b/src/core/lib/event_engine/forkable.cc index a51f1176506..e0d28e75f63 100644 --- a/src/core/lib/event_engine/forkable.cc +++ b/src/core/lib/event_engine/forkable.cc @@ -12,11 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/event_engine/forkable.h" #include +#include #ifdef GRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK #include diff --git a/src/core/lib/event_engine/forkable.h b/src/core/lib/event_engine/forkable.h index bcebc486232..09d07dda28e 100644 --- a/src/core/lib/event_engine/forkable.h +++ b/src/core/lib/event_engine/forkable.h @@ -14,12 +14,11 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_FORKABLE_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_FORKABLE_H -#include - #include #include #include +#include #include "src/core/lib/debug/trace.h" diff --git a/src/core/lib/event_engine/grpc_polled_fd.h b/src/core/lib/event_engine/grpc_polled_fd.h index 463a403dc81..ea9c6eda138 100644 --- a/src/core/lib/event_engine/grpc_polled_fd.h +++ b/src/core/lib/event_engine/grpc_polled_fd.h @@ -15,11 +15,10 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_GRPC_POLLED_FD_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_GRPC_POLLED_FD_H -#include - #include #include +#include #if GRPC_ARES == 1 diff --git a/src/core/lib/event_engine/handle_containers.h b/src/core/lib/event_engine/handle_containers.h index 00bdfd2409f..2a4cd766f18 100644 --- a/src/core/lib/event_engine/handle_containers.h +++ b/src/core/lib/event_engine/handle_containers.h @@ -14,8 +14,6 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_HANDLE_CONTAINERS_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_HANDLE_CONTAINERS_H -#include - #include #include @@ -25,6 +23,7 @@ #include "absl/hash/hash.h" #include +#include namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/memory_allocator_factory.h b/src/core/lib/event_engine/memory_allocator_factory.h index 0af1b713970..88e61908ef3 100644 --- a/src/core/lib/event_engine/memory_allocator_factory.h +++ b/src/core/lib/event_engine/memory_allocator_factory.h @@ -13,14 +13,13 @@ // limitations under the License. #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_MEMORY_ALLOCATOR_FACTORY_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_MEMORY_ALLOCATOR_FACTORY_H -#include - #include #include #include "absl/strings/string_view.h" #include +#include #include "src/core/lib/resource_quota/memory_quota.h" diff --git a/src/core/lib/event_engine/poller.h b/src/core/lib/event_engine/poller.h index 81cb62d3099..26333e798fa 100644 --- a/src/core/lib/event_engine/poller.h +++ b/src/core/lib/event_engine/poller.h @@ -14,11 +14,10 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POLLER_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POLLER_H -#include - #include "absl/functional/function_ref.h" #include +#include namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/posix.h b/src/core/lib/event_engine/posix.h index 1f57fa1e901..a138275f30d 100644 --- a/src/core/lib/event_engine/posix.h +++ b/src/core/lib/event_engine/posix.h @@ -14,12 +14,11 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_H -#include - #include #include #include #include +#include #include "src/core/lib/event_engine/extensions/can_track_errors.h" #include "src/core/lib/event_engine/extensions/chaotic_good_extension.h" diff --git a/src/core/lib/event_engine/query_extensions.h b/src/core/lib/event_engine/query_extensions.h index 49ec6e39eeb..677e5b22d8b 100644 --- a/src/core/lib/event_engine/query_extensions.h +++ b/src/core/lib/event_engine/query_extensions.h @@ -14,11 +14,10 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_QUERY_EXTENSIONS_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_QUERY_EXTENSIONS_H -#include - #include "absl/strings/string_view.h" #include +#include namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/ref_counted_dns_resolver_interface.h b/src/core/lib/event_engine/ref_counted_dns_resolver_interface.h index 645788e9a83..52d4168f06d 100644 --- a/src/core/lib/event_engine/ref_counted_dns_resolver_interface.h +++ b/src/core/lib/event_engine/ref_counted_dns_resolver_interface.h @@ -15,13 +15,12 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_REF_COUNTED_DNS_RESOLVER_INTERFACE_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_REF_COUNTED_DNS_RESOLVER_INTERFACE_H -#include - #include #include "absl/strings/string_view.h" #include +#include #include "src/core/lib/gprpp/orphanable.h" diff --git a/src/core/lib/event_engine/resolved_address.cc b/src/core/lib/event_engine/resolved_address.cc index 7134c3209d9..35a55e671e9 100644 --- a/src/core/lib/event_engine/resolved_address.cc +++ b/src/core/lib/event_engine/resolved_address.cc @@ -12,14 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/iomgr/resolved_address.h" #include #include #include +#include #include "src/core/lib/event_engine/resolved_address_internal.h" diff --git a/src/core/lib/event_engine/resolved_address_internal.h b/src/core/lib/event_engine/resolved_address_internal.h index c0de7cbf5a1..6073e7e54c8 100644 --- a/src/core/lib/event_engine/resolved_address_internal.h +++ b/src/core/lib/event_engine/resolved_address_internal.h @@ -13,9 +13,8 @@ // limitations under the License. #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_RESOLVED_ADDRESS_INTERNAL_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_RESOLVED_ADDRESS_INTERNAL_H -#include - #include +#include #include "src/core/lib/iomgr/resolved_address.h" diff --git a/src/core/lib/event_engine/shim.cc b/src/core/lib/event_engine/shim.cc index 5ac74519bb0..7e506c5e694 100644 --- a/src/core/lib/event_engine/shim.cc +++ b/src/core/lib/event_engine/shim.cc @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/event_engine/shim.h" +#include + #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/iomgr/port.h" diff --git a/src/core/lib/event_engine/slice.cc b/src/core/lib/event_engine/slice.cc index b9266714bb2..574fe4fb460 100644 --- a/src/core/lib/event_engine/slice.cc +++ b/src/core/lib/event_engine/slice.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/slice/slice.h" #include @@ -24,6 +22,7 @@ #include #include #include +#include #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_refcount.h" diff --git a/src/core/lib/event_engine/slice_buffer.cc b/src/core/lib/event_engine/slice_buffer.cc index 04d711904fe..4a1aa804837 100644 --- a/src/core/lib/event_engine/slice_buffer.cc +++ b/src/core/lib/event_engine/slice_buffer.cc @@ -12,13 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include #include #include #include +#include #include "src/core/lib/slice/slice.h" diff --git a/src/core/lib/event_engine/tcp_socket_utils.cc b/src/core/lib/event_engine/tcp_socket_utils.cc index 79ccd514d1a..3897290a2c6 100644 --- a/src/core/lib/event_engine/tcp_socket_utils.cc +++ b/src/core/lib/event_engine/tcp_socket_utils.cc @@ -11,11 +11,10 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/event_engine/tcp_socket_utils.h" #include +#include #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/iomgr/port.h" diff --git a/src/core/lib/event_engine/tcp_socket_utils.h b/src/core/lib/event_engine/tcp_socket_utils.h index 0847447902f..d048a124b06 100644 --- a/src/core/lib/event_engine/tcp_socket_utils.h +++ b/src/core/lib/event_engine/tcp_socket_utils.h @@ -14,14 +14,13 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_TCP_SOCKET_UTILS_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_TCP_SOCKET_UTILS_H -#include - #include #include "absl/status/statusor.h" #include "absl/types/optional.h" #include +#include namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/thread_local.cc b/src/core/lib/event_engine/thread_local.cc index 1dce8d83bcd..a450ade64bb 100644 --- a/src/core/lib/event_engine/thread_local.cc +++ b/src/core/lib/event_engine/thread_local.cc @@ -11,10 +11,10 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/event_engine/thread_local.h" +#include + namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/thread_pool/thread_count.cc b/src/core/lib/event_engine/thread_pool/thread_count.cc index 5f8d2255aa4..362fad18bb2 100644 --- a/src/core/lib/event_engine/thread_pool/thread_count.cc +++ b/src/core/lib/event_engine/thread_pool/thread_count.cc @@ -11,8 +11,6 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/event_engine/thread_pool/thread_count.h" #include @@ -25,6 +23,7 @@ #include "absl/time/time.h" #include +#include #include "src/core/lib/gprpp/time.h" diff --git a/src/core/lib/event_engine/thread_pool/thread_count.h b/src/core/lib/event_engine/thread_pool/thread_count.h index 8be6f79e944..4e8754095c5 100644 --- a/src/core/lib/event_engine/thread_pool/thread_count.h +++ b/src/core/lib/event_engine/thread_pool/thread_count.h @@ -14,8 +14,6 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREAD_POOL_THREAD_COUNT_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREAD_POOL_THREAD_COUNT_H -#include - #include #include #include @@ -26,6 +24,7 @@ #include "absl/base/thread_annotations.h" #include +#include #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/sync.h" diff --git a/src/core/lib/event_engine/thread_pool/thread_pool.h b/src/core/lib/event_engine/thread_pool/thread_pool.h index 281ab7dd19a..2590d891a30 100644 --- a/src/core/lib/event_engine/thread_pool/thread_pool.h +++ b/src/core/lib/event_engine/thread_pool/thread_pool.h @@ -13,8 +13,6 @@ // limitations under the License. #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREAD_POOL_THREAD_POOL_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREAD_POOL_THREAD_POOL_H -#include - #include #include @@ -22,6 +20,7 @@ #include "absl/functional/any_invocable.h" #include +#include #include "src/core/lib/event_engine/forkable.h" diff --git a/src/core/lib/event_engine/thread_pool/thread_pool_factory.cc b/src/core/lib/event_engine/thread_pool/thread_pool_factory.cc index f25a74a05f8..cab291bc1b4 100644 --- a/src/core/lib/event_engine/thread_pool/thread_pool_factory.cc +++ b/src/core/lib/event_engine/thread_pool/thread_pool_factory.cc @@ -11,12 +11,12 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include - #include #include +#include + #include "src/core/lib/event_engine/forkable.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.h" #include "src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h" diff --git a/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc b/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc index deb1e1c8165..2983a90a3c9 100644 --- a/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc +++ b/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc @@ -15,8 +15,6 @@ // limitations under the License. // // -#include - #include "src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h" #include @@ -33,6 +31,7 @@ #include "absl/types/optional.h" #include +#include #include #include "src/core/lib/backoff/backoff.h" diff --git a/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h b/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h index dfb3b578d82..3dcc55aab6c 100644 --- a/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h +++ b/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h @@ -18,8 +18,6 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREAD_POOL_WORK_STEALING_THREAD_POOL_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREAD_POOL_WORK_STEALING_THREAD_POOL_H -#include - #include #include @@ -31,6 +29,7 @@ #include "absl/functional/any_invocable.h" #include +#include #include #include "src/core/lib/backoff/backoff.h" diff --git a/src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc b/src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc index 4beb7b68bcf..1d80104f663 100644 --- a/src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc +++ b/src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/event_engine/thready_event_engine/thready_event_engine.h" #include @@ -21,6 +19,8 @@ #include #include +#include + #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/gprpp/thd.h" diff --git a/src/core/lib/event_engine/thready_event_engine/thready_event_engine.h b/src/core/lib/event_engine/thready_event_engine/thready_event_engine.h index 23b79dc62cf..6e4f17002f2 100644 --- a/src/core/lib/event_engine/thready_event_engine/thready_event_engine.h +++ b/src/core/lib/event_engine/thready_event_engine/thready_event_engine.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREADY_EVENT_ENGINE_THREADY_EVENT_ENGINE_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREADY_EVENT_ENGINE_THREADY_EVENT_ENGINE_H -#include - #include #include @@ -28,6 +26,7 @@ #include #include #include +#include namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/time_util.cc b/src/core/lib/event_engine/time_util.cc index 0422f059895..d7b663581d1 100644 --- a/src/core/lib/event_engine/time_util.cc +++ b/src/core/lib/event_engine/time_util.cc @@ -11,13 +11,12 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/event_engine/time_util.h" #include #include +#include namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/time_util.h b/src/core/lib/event_engine/time_util.h index dbde1288820..813b6cda8f8 100644 --- a/src/core/lib/event_engine/time_util.h +++ b/src/core/lib/event_engine/time_util.h @@ -14,11 +14,10 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_TIME_UTIL_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_TIME_UTIL_H -#include - #include #include +#include namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/trace.cc b/src/core/lib/event_engine/trace.cc index 20ae3ae2341..33b2fa7f367 100644 --- a/src/core/lib/event_engine/trace.cc +++ b/src/core/lib/event_engine/trace.cc @@ -11,10 +11,10 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/debug/trace.h" +#include + grpc_core::TraceFlag grpc_event_engine_trace(false, "event_engine"); grpc_core::TraceFlag grpc_event_engine_dns_trace(false, "event_engine_dns"); grpc_core::TraceFlag grpc_event_engine_endpoint_trace(false, diff --git a/src/core/lib/event_engine/trace.h b/src/core/lib/event_engine/trace.h index ddc61706ab3..3d0a9e1d5df 100644 --- a/src/core/lib/event_engine/trace.h +++ b/src/core/lib/event_engine/trace.h @@ -14,9 +14,8 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_TRACE_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_TRACE_H -#include - #include +#include #include "src/core/lib/debug/trace.h" diff --git a/src/core/lib/event_engine/utils.cc b/src/core/lib/event_engine/utils.cc index c33eec1d5cf..5fe19aa3698 100644 --- a/src/core/lib/event_engine/utils.cc +++ b/src/core/lib/event_engine/utils.cc @@ -11,8 +11,6 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/event_engine/utils.h" #include @@ -22,6 +20,7 @@ #include "absl/strings/str_cat.h" #include +#include #include "src/core/lib/gprpp/time.h" diff --git a/src/core/lib/event_engine/utils.h b/src/core/lib/event_engine/utils.h index c0f2175908b..ab6d4fa1c96 100644 --- a/src/core/lib/event_engine/utils.h +++ b/src/core/lib/event_engine/utils.h @@ -14,13 +14,12 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_UTILS_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_UTILS_H -#include - #include #include #include +#include #include "src/core/lib/gprpp/time.h" diff --git a/src/core/lib/event_engine/work_queue/basic_work_queue.cc b/src/core/lib/event_engine/work_queue/basic_work_queue.cc index fd41b93fb24..a9170e69bd3 100644 --- a/src/core/lib/event_engine/work_queue/basic_work_queue.cc +++ b/src/core/lib/event_engine/work_queue/basic_work_queue.cc @@ -11,12 +11,12 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/event_engine/work_queue/basic_work_queue.h" #include +#include + #include "src/core/lib/event_engine/common_closures.h" #include "src/core/lib/gprpp/sync.h" diff --git a/src/core/lib/event_engine/work_queue/basic_work_queue.h b/src/core/lib/event_engine/work_queue/basic_work_queue.h index f04d185333b..2aa843c638a 100644 --- a/src/core/lib/event_engine/work_queue/basic_work_queue.h +++ b/src/core/lib/event_engine/work_queue/basic_work_queue.h @@ -13,8 +13,6 @@ // limitations under the License. #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_WORK_QUEUE_BASIC_WORK_QUEUE_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_WORK_QUEUE_BASIC_WORK_QUEUE_H -#include - #include #include @@ -23,6 +21,7 @@ #include "absl/functional/any_invocable.h" #include +#include #include "src/core/lib/event_engine/work_queue/work_queue.h" #include "src/core/lib/gprpp/sync.h" diff --git a/src/core/lib/event_engine/work_queue/work_queue.h b/src/core/lib/event_engine/work_queue/work_queue.h index 270a88e3a09..73c6a74ab21 100644 --- a/src/core/lib/event_engine/work_queue/work_queue.h +++ b/src/core/lib/event_engine/work_queue/work_queue.h @@ -14,13 +14,12 @@ #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_WORK_QUEUE_WORK_QUEUE_H #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_WORK_QUEUE_WORK_QUEUE_H -#include - #include #include "absl/functional/any_invocable.h" #include +#include namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/experiments/config.cc b/src/core/lib/experiments/config.cc index ee5f7836693..15537dbb198 100644 --- a/src/core/lib/experiments/config.cc +++ b/src/core/lib/experiments/config.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/experiments/config.h" #include @@ -31,6 +29,7 @@ #include "absl/strings/strip.h" #include +#include #include "src/core/lib/config/config_vars.h" #include "src/core/lib/experiments/experiments.h" diff --git a/src/core/lib/experiments/config.h b/src/core/lib/experiments/config.h index b760e684cd9..2c601001bf6 100644 --- a/src/core/lib/experiments/config.h +++ b/src/core/lib/experiments/config.h @@ -15,14 +15,14 @@ #ifndef GRPC_SRC_CORE_LIB_EXPERIMENTS_CONFIG_H #define GRPC_SRC_CORE_LIB_EXPERIMENTS_CONFIG_H -#include - #include #include #include "absl/functional/any_invocable.h" #include "absl/strings/string_view.h" +#include + // #define GRPC_EXPERIMENTS_ARE_FINAL namespace grpc_core { diff --git a/src/core/lib/experiments/experiments.cc b/src/core/lib/experiments/experiments.cc index e668ab3ee7d..9111335eeeb 100644 --- a/src/core/lib/experiments/experiments.cc +++ b/src/core/lib/experiments/experiments.cc @@ -14,12 +14,12 @@ // Auto generated by tools/codegen/core/gen_experiments.py -#include - #include "src/core/lib/experiments/experiments.h" #include +#include + #ifndef GRPC_EXPERIMENTS_ARE_FINAL #if defined(GRPC_CFSTREAM) diff --git a/src/core/lib/handshaker/proxy_mapper.h b/src/core/lib/handshaker/proxy_mapper.h index c84354a7c7f..e2d63290925 100644 --- a/src/core/lib/handshaker/proxy_mapper.h +++ b/src/core/lib/handshaker/proxy_mapper.h @@ -19,13 +19,13 @@ #ifndef GRPC_SRC_CORE_LIB_HANDSHAKER_PROXY_MAPPER_H #define GRPC_SRC_CORE_LIB_HANDSHAKER_PROXY_MAPPER_H -#include - #include #include "absl/strings/string_view.h" #include "absl/types/optional.h" +#include + #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/resolved_address.h" diff --git a/src/core/lib/handshaker/proxy_mapper_registry.cc b/src/core/lib/handshaker/proxy_mapper_registry.cc index 64748cdc335..f696db235b1 100644 --- a/src/core/lib/handshaker/proxy_mapper_registry.cc +++ b/src/core/lib/handshaker/proxy_mapper_registry.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/handshaker/proxy_mapper_registry.h" #include @@ -27,6 +25,8 @@ #include "absl/types/optional.h" +#include + namespace grpc_core { void ProxyMapperRegistry::Builder::Register( diff --git a/src/core/lib/handshaker/proxy_mapper_registry.h b/src/core/lib/handshaker/proxy_mapper_registry.h index 1f8551f9cfc..2ebbca0d806 100644 --- a/src/core/lib/handshaker/proxy_mapper_registry.h +++ b/src/core/lib/handshaker/proxy_mapper_registry.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_HANDSHAKER_PROXY_MAPPER_REGISTRY_H #define GRPC_SRC_CORE_LIB_HANDSHAKER_PROXY_MAPPER_REGISTRY_H -#include - #include #include #include @@ -29,6 +27,8 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" +#include + #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/handshaker/proxy_mapper.h" #include "src/core/lib/iomgr/resolved_address.h" diff --git a/src/core/lib/http/format_request.cc b/src/core/lib/http/format_request.cc index ec0862cb48f..d358a57f5bc 100644 --- a/src/core/lib/http/format_request.cc +++ b/src/core/lib/http/format_request.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/http/format_request.h" #include @@ -33,6 +31,7 @@ #include "absl/strings/string_view.h" #include +#include #include "src/core/lib/http/httpcli.h" diff --git a/src/core/lib/http/format_request.h b/src/core/lib/http/format_request.h index 8d8ce756e28..a9e76643556 100644 --- a/src/core/lib/http/format_request.h +++ b/src/core/lib/http/format_request.h @@ -19,9 +19,8 @@ #ifndef GRPC_SRC_CORE_LIB_HTTP_FORMAT_REQUEST_H #define GRPC_SRC_CORE_LIB_HTTP_FORMAT_REQUEST_H -#include - #include +#include #include "src/core/lib/http/parser.h" diff --git a/src/core/lib/http/httpcli.cc b/src/core/lib/http/httpcli.cc index 153a2776896..a88796000ff 100644 --- a/src/core/lib/http/httpcli.cc +++ b/src/core/lib/http/httpcli.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/http/httpcli.h" #include @@ -33,6 +31,7 @@ #include #include #include +#include #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/lib/http/httpcli.h b/src/core/lib/http/httpcli.h index bfa98a378f6..3215bce1aa3 100644 --- a/src/core/lib/http/httpcli.h +++ b/src/core/lib/http/httpcli.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_HTTP_HTTPCLI_H #define GRPC_SRC_CORE_LIB_HTTP_HTTPCLI_H -#include - #include #include @@ -34,6 +32,7 @@ #include #include +#include #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/orphanable.h" diff --git a/src/core/lib/http/httpcli_security_connector.cc b/src/core/lib/http/httpcli_security_connector.cc index 22efdc30034..28127811b2d 100644 --- a/src/core/lib/http/httpcli_security_connector.cc +++ b/src/core/lib/http/httpcli_security_connector.cc @@ -16,8 +16,6 @@ // // -#include - #include #include @@ -32,6 +30,7 @@ #include #include #include +#include #include #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/lib/http/httpcli_ssl_credentials.h b/src/core/lib/http/httpcli_ssl_credentials.h index 66aec76382f..dc6182a0779 100644 --- a/src/core/lib/http/httpcli_ssl_credentials.h +++ b/src/core/lib/http/httpcli_ssl_credentials.h @@ -17,9 +17,8 @@ #ifndef GRPC_SRC_CORE_LIB_HTTP_HTTPCLI_SSL_CREDENTIALS_H #define GRPC_SRC_CORE_LIB_HTTP_HTTPCLI_SSL_CREDENTIALS_H -#include - #include +#include #include "src/core/lib/gprpp/ref_counted_ptr.h" diff --git a/src/core/lib/http/parser.cc b/src/core/lib/http/parser.cc index 274ccf1ca1e..4702fa72917 100644 --- a/src/core/lib/http/parser.cc +++ b/src/core/lib/http/parser.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/http/parser.h" #include @@ -28,6 +26,7 @@ #include #include +#include grpc_core::TraceFlag grpc_http1_trace(false, "http1"); diff --git a/src/core/lib/http/parser.h b/src/core/lib/http/parser.h index d255cc94c76..e9a1088b85f 100644 --- a/src/core/lib/http/parser.h +++ b/src/core/lib/http/parser.h @@ -19,12 +19,11 @@ #ifndef GRPC_SRC_CORE_LIB_HTTP_PARSER_H #define GRPC_SRC_CORE_LIB_HTTP_PARSER_H -#include - #include #include #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 b5b13c7c434..6de9d89c05b 100644 --- a/src/core/lib/iomgr/buffer_list.cc +++ b/src/core/lib/iomgr/buffer_list.cc @@ -16,11 +16,10 @@ // // -#include - #include "src/core/lib/iomgr/buffer_list.h" #include +#include #include #include "src/core/lib/gprpp/crash.h" diff --git a/src/core/lib/iomgr/buffer_list.h b/src/core/lib/iomgr/buffer_list.h index f32008d4780..9e57c818e17 100644 --- a/src/core/lib/iomgr/buffer_list.h +++ b/src/core/lib/iomgr/buffer_list.h @@ -19,10 +19,9 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_BUFFER_LIST_H #define GRPC_SRC_CORE_LIB_IOMGR_BUFFER_LIST_H -#include - #include "absl/types/optional.h" +#include #include #include "src/core/lib/gprpp/sync.h" diff --git a/src/core/lib/iomgr/call_combiner.cc b/src/core/lib/iomgr/call_combiner.cc index c48766f781a..cffff2a3979 100644 --- a/src/core/lib/iomgr/call_combiner.cc +++ b/src/core/lib/iomgr/call_combiner.cc @@ -16,13 +16,12 @@ // // -#include - #include "src/core/lib/iomgr/call_combiner.h" #include #include +#include #include "src/core/lib/debug/stats.h" #include "src/core/lib/debug/stats_data.h" diff --git a/src/core/lib/iomgr/call_combiner.h b/src/core/lib/iomgr/call_combiner.h index e314479413b..28ed8388a94 100644 --- a/src/core/lib/iomgr/call_combiner.h +++ b/src/core/lib/iomgr/call_combiner.h @@ -19,13 +19,12 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_CALL_COMBINER_H #define GRPC_SRC_CORE_LIB_IOMGR_CALL_COMBINER_H -#include - #include #include "absl/container/inlined_vector.h" #include +#include #include "src/core/lib/gprpp/mpscq.h" #include "src/core/lib/gprpp/ref_counted.h" diff --git a/src/core/lib/iomgr/closure.cc b/src/core/lib/iomgr/closure.cc index cf1a184032c..12ff26a9156 100644 --- a/src/core/lib/iomgr/closure.cc +++ b/src/core/lib/iomgr/closure.cc @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/iomgr/closure.h" #include "absl/strings/str_format.h" +#include + std::string grpc_closure::DebugString() const { #ifdef NDEBUG return absl::StrFormat("%p", this); diff --git a/src/core/lib/iomgr/closure.h b/src/core/lib/iomgr/closure.h index adf8ebf2b74..674f6c0a2f7 100644 --- a/src/core/lib/iomgr/closure.h +++ b/src/core/lib/iomgr/closure.h @@ -19,13 +19,12 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_CLOSURE_H #define GRPC_SRC_CORE_LIB_IOMGR_CLOSURE_H -#include - #include #include #include #include +#include #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/gprpp/debug_location.h" diff --git a/src/core/lib/iomgr/combiner.cc b/src/core/lib/iomgr/combiner.cc index d0e635ffd22..9f58920267d 100644 --- a/src/core/lib/iomgr/combiner.cc +++ b/src/core/lib/iomgr/combiner.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/iomgr/combiner.h" #include @@ -26,6 +24,7 @@ #include #include +#include #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/gprpp/crash.h" diff --git a/src/core/lib/iomgr/combiner.h b/src/core/lib/iomgr/combiner.h index 3a6977f74b0..685e46b0d70 100644 --- a/src/core/lib/iomgr/combiner.h +++ b/src/core/lib/iomgr/combiner.h @@ -19,11 +19,10 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_COMBINER_H #define GRPC_SRC_CORE_LIB_IOMGR_COMBINER_H -#include - #include #include +#include #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/lib/iomgr/endpoint.cc b/src/core/lib/iomgr/endpoint.cc index de44d00b11e..0659e7be2f4 100644 --- a/src/core/lib/iomgr/endpoint.cc +++ b/src/core/lib/iomgr/endpoint.cc @@ -16,10 +16,10 @@ // // -#include - #include "src/core/lib/iomgr/endpoint.h" +#include + grpc_core::TraceFlag grpc_tcp_trace(false, "tcp"); void grpc_endpoint_read(grpc_endpoint* ep, grpc_slice_buffer* slices, diff --git a/src/core/lib/iomgr/endpoint.h b/src/core/lib/iomgr/endpoint.h index cf97f1e8009..25fab3c1b0c 100644 --- a/src/core/lib/iomgr/endpoint.h +++ b/src/core/lib/iomgr/endpoint.h @@ -19,12 +19,11 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_ENDPOINT_H #define GRPC_SRC_CORE_LIB_IOMGR_ENDPOINT_H -#include - #include "absl/strings/string_view.h" #include #include +#include #include #include "src/core/lib/iomgr/pollset.h" diff --git a/src/core/lib/iomgr/error.cc b/src/core/lib/iomgr/error.cc index 08774b6c14e..7e26e3d5c14 100644 --- a/src/core/lib/iomgr/error.cc +++ b/src/core/lib/iomgr/error.cc @@ -15,8 +15,6 @@ // limitations under the License. // // -#include - #include "src/core/lib/iomgr/error.h" #include @@ -27,6 +25,7 @@ #include #include #include +#include #include #include "src/core/lib/gprpp/crash.h" diff --git a/src/core/lib/iomgr/error.h b/src/core/lib/iomgr/error.h index e1bec1b91df..887424cbc73 100644 --- a/src/core/lib/iomgr/error.h +++ b/src/core/lib/iomgr/error.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_ERROR_H #define GRPC_SRC_CORE_LIB_IOMGR_ERROR_H -#include - #include #include @@ -29,6 +27,7 @@ #include #include #include +#include #include #include "src/core/lib/debug/trace.h" diff --git a/src/core/lib/iomgr/ev_epoll1_linux.cc b/src/core/lib/iomgr/ev_epoll1_linux.cc index 9a91494a486..f5fd5fc95fa 100644 --- a/src/core/lib/iomgr/ev_epoll1_linux.cc +++ b/src/core/lib/iomgr/ev_epoll1_linux.cc @@ -16,9 +16,8 @@ // // -#include - #include +#include #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/port.h" diff --git a/src/core/lib/iomgr/ev_poll_posix.cc b/src/core/lib/iomgr/ev_poll_posix.cc index 75acbbe8d1d..730eda75097 100644 --- a/src/core/lib/iomgr/ev_poll_posix.cc +++ b/src/core/lib/iomgr/ev_poll_posix.cc @@ -17,7 +17,6 @@ // #include - #include #include "src/core/lib/iomgr/port.h" diff --git a/src/core/lib/iomgr/ev_posix.cc b/src/core/lib/iomgr/ev_posix.cc index 1c1ca9dc558..5e10ae02ba4 100644 --- a/src/core/lib/iomgr/ev_posix.cc +++ b/src/core/lib/iomgr/ev_posix.cc @@ -16,9 +16,8 @@ // // -#include - #include +#include #include "src/core/lib/iomgr/port.h" diff --git a/src/core/lib/iomgr/ev_posix.h b/src/core/lib/iomgr/ev_posix.h index d7d84879f4c..a401929601a 100644 --- a/src/core/lib/iomgr/ev_posix.h +++ b/src/core/lib/iomgr/ev_posix.h @@ -19,10 +19,10 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_EV_POSIX_H #define GRPC_SRC_CORE_LIB_IOMGR_EV_POSIX_H -#include - #include +#include + #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/pollset.h" diff --git a/src/core/lib/iomgr/event_engine_shims/closure.cc b/src/core/lib/iomgr/event_engine_shims/closure.cc index fbcfe60d312..280f7124e7b 100644 --- a/src/core/lib/iomgr/event_engine_shims/closure.cc +++ b/src/core/lib/iomgr/event_engine_shims/closure.cc @@ -11,14 +11,13 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/iomgr/event_engine_shims/closure.h" #include "absl/functional/any_invocable.h" #include "absl/status/status.h" #include +#include #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/lib/iomgr/event_engine_shims/closure.h b/src/core/lib/iomgr/event_engine_shims/closure.h index 7a3f66c25f6..87b4e60bee1 100644 --- a/src/core/lib/iomgr/event_engine_shims/closure.h +++ b/src/core/lib/iomgr/event_engine_shims/closure.h @@ -14,11 +14,10 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_EVENT_ENGINE_SHIMS_CLOSURE_H #define GRPC_SRC_CORE_LIB_IOMGR_EVENT_ENGINE_SHIMS_CLOSURE_H -#include - #include "absl/functional/any_invocable.h" #include +#include #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" diff --git a/src/core/lib/iomgr/event_engine_shims/endpoint.cc b/src/core/lib/iomgr/event_engine_shims/endpoint.cc index 81ff5cf17f6..9b64e411f91 100644 --- a/src/core/lib/iomgr/event_engine_shims/endpoint.cc +++ b/src/core/lib/iomgr/event_engine_shims/endpoint.cc @@ -11,8 +11,6 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" #include @@ -29,6 +27,7 @@ #include #include #include +#include #include #include "src/core/lib/event_engine/extensions/can_track_errors.h" diff --git a/src/core/lib/iomgr/event_engine_shims/endpoint.h b/src/core/lib/iomgr/event_engine_shims/endpoint.h index 0b5bc84a660..2ff27081503 100644 --- a/src/core/lib/iomgr/event_engine_shims/endpoint.h +++ b/src/core/lib/iomgr/event_engine_shims/endpoint.h @@ -13,11 +13,10 @@ // limitations under the License. #ifndef GRPC_SRC_CORE_LIB_IOMGR_EVENT_ENGINE_SHIMS_ENDPOINT_H #define GRPC_SRC_CORE_LIB_IOMGR_EVENT_ENGINE_SHIMS_ENDPOINT_H -#include - #include #include +#include #include "src/core/lib/iomgr/endpoint.h" diff --git a/src/core/lib/iomgr/event_engine_shims/tcp_client.cc b/src/core/lib/iomgr/event_engine_shims/tcp_client.cc index f1a219b7320..640b3efb289 100644 --- a/src/core/lib/iomgr/event_engine_shims/tcp_client.cc +++ b/src/core/lib/iomgr/event_engine_shims/tcp_client.cc @@ -11,8 +11,6 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/iomgr/event_engine_shims/tcp_client.h" #include "absl/status/status.h" @@ -21,6 +19,7 @@ #include "absl/strings/string_view.h" #include +#include #include #include "src/core/lib/address_utils/sockaddr_utils.h" diff --git a/src/core/lib/iomgr/event_engine_shims/tcp_client.h b/src/core/lib/iomgr/event_engine_shims/tcp_client.h index 80f1c0cabc8..71218719346 100644 --- a/src/core/lib/iomgr/event_engine_shims/tcp_client.h +++ b/src/core/lib/iomgr/event_engine_shims/tcp_client.h @@ -13,9 +13,8 @@ // limitations under the License. #ifndef GRPC_SRC_CORE_LIB_IOMGR_EVENT_ENGINE_SHIMS_TCP_CLIENT_H #define GRPC_SRC_CORE_LIB_IOMGR_EVENT_ENGINE_SHIMS_TCP_CLIENT_H -#include - #include +#include #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/resolved_address.h" diff --git a/src/core/lib/iomgr/exec_ctx.cc b/src/core/lib/iomgr/exec_ctx.cc index 4b77738d9eb..3857e9d61d6 100644 --- a/src/core/lib/iomgr/exec_ctx.cc +++ b/src/core/lib/iomgr/exec_ctx.cc @@ -16,13 +16,12 @@ // // -#include - #include "src/core/lib/iomgr/exec_ctx.h" #include "absl/strings/str_format.h" #include +#include #include #include "src/core/lib/gprpp/crash.h" diff --git a/src/core/lib/iomgr/exec_ctx.h b/src/core/lib/iomgr/exec_ctx.h index f1c0acb222f..6f7bdf08323 100644 --- a/src/core/lib/iomgr/exec_ctx.h +++ b/src/core/lib/iomgr/exec_ctx.h @@ -19,10 +19,10 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_EXEC_CTX_H #define GRPC_SRC_CORE_LIB_IOMGR_EXEC_CTX_H -#include - #include +#include + #if __APPLE__ // Provides TARGET_OS_IPHONE #include diff --git a/src/core/lib/iomgr/executor.cc b/src/core/lib/iomgr/executor.cc index c65475e1041..e9baef7c5aa 100644 --- a/src/core/lib/iomgr/executor.cc +++ b/src/core/lib/iomgr/executor.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/iomgr/executor.h" #include @@ -25,6 +23,7 @@ #include #include #include +#include #include #include "src/core/lib/gpr/useful.h" diff --git a/src/core/lib/iomgr/grpc_if_nametoindex.h b/src/core/lib/iomgr/grpc_if_nametoindex.h index 15cf6b38dff..9fa91a2b22f 100644 --- a/src/core/lib/iomgr/grpc_if_nametoindex.h +++ b/src/core/lib/iomgr/grpc_if_nametoindex.h @@ -19,10 +19,10 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_GRPC_IF_NAMETOINDEX_H #define GRPC_SRC_CORE_LIB_IOMGR_GRPC_IF_NAMETOINDEX_H -#include - #include +#include + // Returns the interface index corresponding to the interface "name" provided. // Returns non-zero upon success, and zero upon failure. uint32_t grpc_if_nametoindex(char* name); diff --git a/src/core/lib/iomgr/internal_errqueue.cc b/src/core/lib/iomgr/internal_errqueue.cc index d294a4f105e..3167cb035de 100644 --- a/src/core/lib/iomgr/internal_errqueue.cc +++ b/src/core/lib/iomgr/internal_errqueue.cc @@ -12,11 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/iomgr/internal_errqueue.h" #include +#include #include "src/core/lib/iomgr/port.h" diff --git a/src/core/lib/iomgr/iocp_windows.h b/src/core/lib/iomgr/iocp_windows.h index 13d9c68b717..5a06145ee0b 100644 --- a/src/core/lib/iomgr/iocp_windows.h +++ b/src/core/lib/iomgr/iocp_windows.h @@ -20,7 +20,6 @@ #define GRPC_SRC_CORE_LIB_IOMGR_IOCP_WINDOWS_H #include - #include #include "src/core/lib/iomgr/port.h" diff --git a/src/core/lib/iomgr/iomgr.cc b/src/core/lib/iomgr/iomgr.cc index b6fefdc2b4f..5cda83c1f19 100644 --- a/src/core/lib/iomgr/iomgr.cc +++ b/src/core/lib/iomgr/iomgr.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/iomgr/iomgr.h" #include @@ -26,6 +24,7 @@ #include #include +#include #include #include diff --git a/src/core/lib/iomgr/iomgr.h b/src/core/lib/iomgr/iomgr.h index 91148f9e1c7..3c4a5987f19 100644 --- a/src/core/lib/iomgr/iomgr.h +++ b/src/core/lib/iomgr/iomgr.h @@ -19,10 +19,10 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_IOMGR_H #define GRPC_SRC_CORE_LIB_IOMGR_IOMGR_H -#include - #include +#include + #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/port.h" diff --git a/src/core/lib/iomgr/iomgr_internal.cc b/src/core/lib/iomgr/iomgr_internal.cc index 2fc03cff807..81c1b829247 100644 --- a/src/core/lib/iomgr/iomgr_internal.cc +++ b/src/core/lib/iomgr/iomgr_internal.cc @@ -16,12 +16,12 @@ // // -#include - #include "src/core/lib/iomgr/iomgr_internal.h" #include +#include + static grpc_iomgr_platform_vtable* iomgr_platform_vtable = nullptr; bool grpc_have_determined_iomgr_platform() { diff --git a/src/core/lib/iomgr/iomgr_internal.h b/src/core/lib/iomgr/iomgr_internal.h index f113bc24137..a3a8ceb178a 100644 --- a/src/core/lib/iomgr/iomgr_internal.h +++ b/src/core/lib/iomgr/iomgr_internal.h @@ -19,10 +19,10 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_IOMGR_INTERNAL_H #define GRPC_SRC_CORE_LIB_IOMGR_IOMGR_INTERNAL_H -#include - #include +#include + #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" diff --git a/src/core/lib/iomgr/lockfree_event.cc b/src/core/lib/iomgr/lockfree_event.cc index 58130a34cb5..4d84704b6f1 100644 --- a/src/core/lib/iomgr/lockfree_event.cc +++ b/src/core/lib/iomgr/lockfree_event.cc @@ -16,11 +16,10 @@ // // -#include - #include "src/core/lib/iomgr/lockfree_event.h" #include +#include #include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/crash.h" diff --git a/src/core/lib/iomgr/lockfree_event.h b/src/core/lib/iomgr/lockfree_event.h index ab6afa6ff48..eefca2831c6 100644 --- a/src/core/lib/iomgr/lockfree_event.h +++ b/src/core/lib/iomgr/lockfree_event.h @@ -21,9 +21,8 @@ // Lock free event notification for file descriptors -#include - #include +#include #include "src/core/lib/iomgr/closure.h" diff --git a/src/core/lib/iomgr/polling_entity.cc b/src/core/lib/iomgr/polling_entity.cc index b5caa8a3156..7bd4d2e1726 100644 --- a/src/core/lib/iomgr/polling_entity.cc +++ b/src/core/lib/iomgr/polling_entity.cc @@ -16,14 +16,13 @@ // // -#include - #include "src/core/lib/iomgr/polling_entity.h" #include "absl/strings/str_format.h" #include #include +#include #include "src/core/lib/gprpp/crash.h" diff --git a/src/core/lib/iomgr/pollset.cc b/src/core/lib/iomgr/pollset.cc index 64a75372849..251cc5a2e3c 100644 --- a/src/core/lib/iomgr/pollset.cc +++ b/src/core/lib/iomgr/pollset.cc @@ -16,10 +16,10 @@ // // -#include - #include "src/core/lib/iomgr/pollset.h" +#include + grpc_pollset_vtable* grpc_pollset_impl; void grpc_set_pollset_vtable(grpc_pollset_vtable* vtable) { diff --git a/src/core/lib/iomgr/pollset.h b/src/core/lib/iomgr/pollset.h index 137a581b91f..07966b08e04 100644 --- a/src/core/lib/iomgr/pollset.h +++ b/src/core/lib/iomgr/pollset.h @@ -20,7 +20,6 @@ #define GRPC_SRC_CORE_LIB_IOMGR_POLLSET_H #include - #include #include diff --git a/src/core/lib/iomgr/pollset_set.cc b/src/core/lib/iomgr/pollset_set.cc index 95efc8380f7..7ef0db8c7f6 100644 --- a/src/core/lib/iomgr/pollset_set.cc +++ b/src/core/lib/iomgr/pollset_set.cc @@ -16,10 +16,10 @@ // // -#include - #include "src/core/lib/iomgr/pollset_set.h" +#include + grpc_pollset_set_vtable* grpc_pollset_set_impl; void grpc_set_pollset_set_vtable(grpc_pollset_set_vtable* vtable) { diff --git a/src/core/lib/iomgr/pollset_set_windows.cc b/src/core/lib/iomgr/pollset_set_windows.cc index e3ba5aedd07..46dd8d20977 100644 --- a/src/core/lib/iomgr/pollset_set_windows.cc +++ b/src/core/lib/iomgr/pollset_set_windows.cc @@ -16,10 +16,10 @@ // // -#include - #include +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_WINSOCK_SOCKET diff --git a/src/core/lib/iomgr/pollset_windows.h b/src/core/lib/iomgr/pollset_windows.h index 2314735457f..8ef6c75229e 100644 --- a/src/core/lib/iomgr/pollset_windows.h +++ b/src/core/lib/iomgr/pollset_windows.h @@ -20,7 +20,6 @@ #define GRPC_SRC_CORE_LIB_IOMGR_POLLSET_WINDOWS_H #include - #include #include "src/core/lib/iomgr/port.h" diff --git a/src/core/lib/iomgr/python_util.h b/src/core/lib/iomgr/python_util.h index ab47d2d98d8..f38d7718506 100644 --- a/src/core/lib/iomgr/python_util.h +++ b/src/core/lib/iomgr/python_util.h @@ -19,10 +19,9 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_PYTHON_UTIL_H #define GRPC_SRC_CORE_LIB_IOMGR_PYTHON_UTIL_H -#include - #include #include +#include #include "src/core/lib/iomgr/error.h" diff --git a/src/core/lib/iomgr/resolve_address.cc b/src/core/lib/iomgr/resolve_address.cc index 563a5d906b7..24cdcf1c6d0 100644 --- a/src/core/lib/iomgr/resolve_address.cc +++ b/src/core/lib/iomgr/resolve_address.cc @@ -15,8 +15,6 @@ // limitations under the License. // // -#include - #include "src/core/lib/iomgr/resolve_address.h" #include "absl/strings/str_cat.h" @@ -24,6 +22,7 @@ #include #include #include +#include #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/gprpp/no_destruct.h" diff --git a/src/core/lib/iomgr/resolve_address.h b/src/core/lib/iomgr/resolve_address.h index 9f86113db8f..c63118c053f 100644 --- a/src/core/lib/iomgr/resolve_address.h +++ b/src/core/lib/iomgr/resolve_address.h @@ -19,14 +19,13 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_H #define GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_H -#include - #include #include "absl/container/flat_hash_set.h" #include "absl/status/statusor.h" #include +#include #include "src/core/lib/event_engine/handle_containers.h" #include "src/core/lib/gprpp/orphanable.h" diff --git a/src/core/lib/iomgr/resolve_address_impl.h b/src/core/lib/iomgr/resolve_address_impl.h index 53cd37caae0..a6e072dd919 100644 --- a/src/core/lib/iomgr/resolve_address_impl.h +++ b/src/core/lib/iomgr/resolve_address_impl.h @@ -17,10 +17,10 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_IMPL_H #define GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_IMPL_H -#include - #include +#include + #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/resolve_address.h" diff --git a/src/core/lib/iomgr/resolve_address_posix.h b/src/core/lib/iomgr/resolve_address_posix.h index cb37cbc9a75..15986358e80 100644 --- a/src/core/lib/iomgr/resolve_address_posix.h +++ b/src/core/lib/iomgr/resolve_address_posix.h @@ -17,10 +17,10 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_POSIX_H #define GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_POSIX_H -#include - #include +#include + #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/resolve_address.h" diff --git a/src/core/lib/iomgr/resolve_address_windows.h b/src/core/lib/iomgr/resolve_address_windows.h index 6d608efd2e8..eea5c44111e 100644 --- a/src/core/lib/iomgr/resolve_address_windows.h +++ b/src/core/lib/iomgr/resolve_address_windows.h @@ -17,10 +17,10 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_WINDOWS_H #define GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_WINDOWS_H -#include - #include +#include + #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/resolve_address.h" diff --git a/src/core/lib/iomgr/resolved_address.h b/src/core/lib/iomgr/resolved_address.h index 1c0e8a6d45c..e16f7fc27f9 100644 --- a/src/core/lib/iomgr/resolved_address.h +++ b/src/core/lib/iomgr/resolved_address.h @@ -15,10 +15,10 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_RESOLVED_ADDRESS_H #define GRPC_SRC_CORE_LIB_IOMGR_RESOLVED_ADDRESS_H -#include - #include +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_WINSOCK_SOCKET diff --git a/src/core/lib/iomgr/socket_factory_posix.h b/src/core/lib/iomgr/socket_factory_posix.h index abe82975a53..fa11334a685 100644 --- a/src/core/lib/iomgr/socket_factory_posix.h +++ b/src/core/lib/iomgr/socket_factory_posix.h @@ -19,9 +19,8 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_SOCKET_FACTORY_POSIX_H #define GRPC_SRC_CORE_LIB_IOMGR_SOCKET_FACTORY_POSIX_H -#include - #include +#include #include #include "src/core/lib/iomgr/resolve_address.h" diff --git a/src/core/lib/iomgr/socket_mutator.cc b/src/core/lib/iomgr/socket_mutator.cc index 789d98bafb3..fd909c3e5e6 100644 --- a/src/core/lib/iomgr/socket_mutator.cc +++ b/src/core/lib/iomgr/socket_mutator.cc @@ -16,12 +16,11 @@ // // -#include - #include "src/core/lib/iomgr/socket_mutator.h" #include #include +#include #include #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/lib/iomgr/socket_mutator.h b/src/core/lib/iomgr/socket_mutator.h index 7fde30c7b0e..e919d3caaa4 100644 --- a/src/core/lib/iomgr/socket_mutator.h +++ b/src/core/lib/iomgr/socket_mutator.h @@ -19,11 +19,10 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_SOCKET_MUTATOR_H #define GRPC_SRC_CORE_LIB_IOMGR_SOCKET_MUTATOR_H -#include - #include #include +#include #include /// How is an fd to be used? diff --git a/src/core/lib/iomgr/socket_utils.h b/src/core/lib/iomgr/socket_utils.h index 38a2cdaba36..75d3082677d 100644 --- a/src/core/lib/iomgr/socket_utils.h +++ b/src/core/lib/iomgr/socket_utils.h @@ -19,10 +19,10 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_SOCKET_UTILS_H #define GRPC_SRC_CORE_LIB_IOMGR_SOCKET_UTILS_H -#include - #include +#include + // TODO(juanlishen): The following functions might be simple enough to implement // ourselves, so that they don't cause any portability hassle. diff --git a/src/core/lib/iomgr/socket_utils_posix.cc b/src/core/lib/iomgr/socket_utils_posix.cc index 313899f9dfc..b34f3749c7f 100644 --- a/src/core/lib/iomgr/socket_utils_posix.cc +++ b/src/core/lib/iomgr/socket_utils_posix.cc @@ -16,10 +16,10 @@ // // -#include - #include "absl/types/optional.h" +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_POSIX_SOCKETUTILS diff --git a/src/core/lib/iomgr/socket_utils_posix.h b/src/core/lib/iomgr/socket_utils_posix.h index b8e91ed6a77..187327875fc 100644 --- a/src/core/lib/iomgr/socket_utils_posix.h +++ b/src/core/lib/iomgr/socket_utils_posix.h @@ -19,10 +19,9 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_SOCKET_UTILS_POSIX_H #define GRPC_SRC_CORE_LIB_IOMGR_SOCKET_UTILS_POSIX_H -#include - #include #include +#include #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/resolve_address.h" diff --git a/src/core/lib/iomgr/tcp_client.cc b/src/core/lib/iomgr/tcp_client.cc index 0de5aea449b..26b60f0821f 100644 --- a/src/core/lib/iomgr/tcp_client.cc +++ b/src/core/lib/iomgr/tcp_client.cc @@ -16,10 +16,10 @@ // // -#include - #include "src/core/lib/iomgr/tcp_client.h" +#include + grpc_tcp_client_vtable* grpc_tcp_client_impl; int64_t grpc_tcp_client_connect( diff --git a/src/core/lib/iomgr/tcp_client.h b/src/core/lib/iomgr/tcp_client.h index 3fa6fbfa0c5..142cb120643 100644 --- a/src/core/lib/iomgr/tcp_client.h +++ b/src/core/lib/iomgr/tcp_client.h @@ -19,10 +19,9 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_TCP_CLIENT_H #define GRPC_SRC_CORE_LIB_IOMGR_TCP_CLIENT_H -#include - #include #include +#include #include #include "src/core/lib/iomgr/endpoint.h" diff --git a/src/core/lib/iomgr/tcp_client_windows.cc b/src/core/lib/iomgr/tcp_client_windows.cc index 637c6e3cb55..eb174ac0f87 100644 --- a/src/core/lib/iomgr/tcp_client_windows.cc +++ b/src/core/lib/iomgr/tcp_client_windows.cc @@ -16,10 +16,10 @@ // // -#include - #include +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_WINSOCK_SOCKET diff --git a/src/core/lib/iomgr/tcp_posix.cc b/src/core/lib/iomgr/tcp_posix.cc index ba559f7755c..74e6a729f4a 100644 --- a/src/core/lib/iomgr/tcp_posix.cc +++ b/src/core/lib/iomgr/tcp_posix.cc @@ -16,8 +16,6 @@ // // -#include - #include "absl/base/thread_annotations.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" @@ -25,6 +23,7 @@ #include "absl/types/optional.h" #include +#include #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/port.h" diff --git a/src/core/lib/iomgr/tcp_server.cc b/src/core/lib/iomgr/tcp_server.cc index cf2ddd519fd..f55133b6e6c 100644 --- a/src/core/lib/iomgr/tcp_server.cc +++ b/src/core/lib/iomgr/tcp_server.cc @@ -16,10 +16,10 @@ // // -#include - #include "src/core/lib/iomgr/tcp_server.h" +#include + grpc_tcp_server_vtable* grpc_tcp_server_impl; grpc_error_handle grpc_tcp_server_create( diff --git a/src/core/lib/iomgr/tcp_server.h b/src/core/lib/iomgr/tcp_server.h index 5b30f22c63d..8b1feece209 100644 --- a/src/core/lib/iomgr/tcp_server.h +++ b/src/core/lib/iomgr/tcp_server.h @@ -19,13 +19,12 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_TCP_SERVER_H #define GRPC_SRC_CORE_LIB_IOMGR_TCP_SERVER_H -#include - #include #include #include #include +#include #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" diff --git a/src/core/lib/iomgr/tcp_server_posix.cc b/src/core/lib/iomgr/tcp_server_posix.cc index f4dcdd588d0..b90f73057e6 100644 --- a/src/core/lib/iomgr/tcp_server_posix.cc +++ b/src/core/lib/iomgr/tcp_server_posix.cc @@ -16,11 +16,10 @@ // // -#include - #include #include +#include // FIXME: "posix" files shouldn't be depending on _GNU_SOURCE #ifndef _GNU_SOURCE diff --git a/src/core/lib/iomgr/tcp_server_utils_posix.h b/src/core/lib/iomgr/tcp_server_utils_posix.h index afe6833e60d..fcf97da7926 100644 --- a/src/core/lib/iomgr/tcp_server_utils_posix.h +++ b/src/core/lib/iomgr/tcp_server_utils_posix.h @@ -19,12 +19,12 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_TCP_SERVER_UTILS_POSIX_H #define GRPC_SRC_CORE_LIB_IOMGR_TCP_SERVER_UTILS_POSIX_H -#include - #include #include "absl/container/flat_hash_map.h" +#include + #include "src/core/lib/event_engine/posix.h" #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/resolve_address.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 23dccc76e03..59de22cd68c 100644 --- a/src/core/lib/iomgr/tcp_server_utils_posix_common.cc +++ b/src/core/lib/iomgr/tcp_server_utils_posix_common.cc @@ -16,9 +16,8 @@ // // -#include - #include +#include #include "src/core/lib/iomgr/port.h" diff --git a/src/core/lib/iomgr/timer.cc b/src/core/lib/iomgr/timer.cc index e2ec74a72fd..31e7929fb96 100644 --- a/src/core/lib/iomgr/timer.cc +++ b/src/core/lib/iomgr/timer.cc @@ -16,10 +16,10 @@ // // -#include - #include "src/core/lib/iomgr/timer.h" +#include + #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 492b8692646..299331f0320 100644 --- a/src/core/lib/iomgr/timer.h +++ b/src/core/lib/iomgr/timer.h @@ -19,11 +19,10 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_TIMER_H #define GRPC_SRC_CORE_LIB_IOMGR_TIMER_H -#include - #include #include +#include #include #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/lib/iomgr/timer_generic.cc b/src/core/lib/iomgr/timer_generic.cc index bed5ccccfe8..04f0bd654de 100644 --- a/src/core/lib/iomgr/timer_generic.cc +++ b/src/core/lib/iomgr/timer_generic.cc @@ -16,8 +16,6 @@ // // -#include - #include #include @@ -28,6 +26,7 @@ #include #include #include +#include #include #include "src/core/lib/debug/trace.h" diff --git a/src/core/lib/iomgr/timer_generic.h b/src/core/lib/iomgr/timer_generic.h index 545878ec3a7..862e491968c 100644 --- a/src/core/lib/iomgr/timer_generic.h +++ b/src/core/lib/iomgr/timer_generic.h @@ -20,7 +20,6 @@ #define GRPC_SRC_CORE_LIB_IOMGR_TIMER_GENERIC_H #include - #include #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/lib/iomgr/timer_heap.cc b/src/core/lib/iomgr/timer_heap.cc index 8b346e77a1e..9e3b47b31e5 100644 --- a/src/core/lib/iomgr/timer_heap.cc +++ b/src/core/lib/iomgr/timer_heap.cc @@ -16,13 +16,12 @@ // // -#include - #include "src/core/lib/iomgr/timer_heap.h" #include #include +#include #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/port.h" diff --git a/src/core/lib/iomgr/timer_manager.cc b/src/core/lib/iomgr/timer_manager.cc index 408e6452bd5..8221d04ddf3 100644 --- a/src/core/lib/iomgr/timer_manager.cc +++ b/src/core/lib/iomgr/timer_manager.cc @@ -16,14 +16,13 @@ // // -#include - #include "src/core/lib/iomgr/timer_manager.h" #include #include #include +#include #include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/crash.h" diff --git a/src/core/lib/iomgr/timer_manager.h b/src/core/lib/iomgr/timer_manager.h index e5f0b120adb..c2e662b4943 100644 --- a/src/core/lib/iomgr/timer_manager.h +++ b/src/core/lib/iomgr/timer_manager.h @@ -19,10 +19,10 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_TIMER_MANAGER_H #define GRPC_SRC_CORE_LIB_IOMGR_TIMER_MANAGER_H -#include - #include +#include + // Timer Manager tries to keep only one thread waiting for the next timeout at // all times, and thus effectively preventing the thundering herd problem. diff --git a/src/core/lib/iomgr/unix_sockets_posix.h b/src/core/lib/iomgr/unix_sockets_posix.h index 56675ad5e2c..d63a56e8d00 100644 --- a/src/core/lib/iomgr/unix_sockets_posix.h +++ b/src/core/lib/iomgr/unix_sockets_posix.h @@ -19,12 +19,11 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_UNIX_SOCKETS_POSIX_H #define GRPC_SRC_CORE_LIB_IOMGR_UNIX_SOCKETS_POSIX_H -#include - #include #include "absl/strings/string_view.h" +#include #include #include "src/core/lib/iomgr/port.h" diff --git a/src/core/lib/iomgr/vsock.cc b/src/core/lib/iomgr/vsock.cc index c938c68b9b6..e28fed350f3 100644 --- a/src/core/lib/iomgr/vsock.cc +++ b/src/core/lib/iomgr/vsock.cc @@ -15,10 +15,10 @@ // limitations under the License. // // -#include - #include "src/core/lib/iomgr/vsock.h" +#include + #ifdef GRPC_HAVE_VSOCK #include diff --git a/src/core/lib/iomgr/vsock.h b/src/core/lib/iomgr/vsock.h index 8c45b5cbaff..08280c32a0a 100644 --- a/src/core/lib/iomgr/vsock.h +++ b/src/core/lib/iomgr/vsock.h @@ -19,12 +19,11 @@ #ifndef GRPC_SRC_CORE_LIB_IOMGR_VSOCK_H #define GRPC_SRC_CORE_LIB_IOMGR_VSOCK_H -#include - #include #include "absl/strings/string_view.h" +#include #include #include "src/core/lib/iomgr/port.h" diff --git a/src/core/lib/json/json.h b/src/core/lib/json/json.h index ede3e818a9f..6ffa7e77975 100644 --- a/src/core/lib/json/json.h +++ b/src/core/lib/json/json.h @@ -17,9 +17,8 @@ #ifndef GRPC_SRC_CORE_LIB_JSON_JSON_H #define GRPC_SRC_CORE_LIB_JSON_JSON_H -#include - #include +#include namespace grpc_core { diff --git a/src/core/lib/json/json_args.h b/src/core/lib/json/json_args.h index 50d6f36c4ce..875b1f477d2 100644 --- a/src/core/lib/json/json_args.h +++ b/src/core/lib/json/json_args.h @@ -15,10 +15,10 @@ #ifndef GRPC_SRC_CORE_LIB_JSON_JSON_ARGS_H #define GRPC_SRC_CORE_LIB_JSON_JSON_ARGS_H -#include - #include "absl/strings/string_view.h" +#include + namespace grpc_core { class JsonArgs { diff --git a/src/core/lib/json/json_channel_args.h b/src/core/lib/json/json_channel_args.h index ab36ec94940..82fb8536760 100644 --- a/src/core/lib/json/json_channel_args.h +++ b/src/core/lib/json/json_channel_args.h @@ -15,11 +15,11 @@ #ifndef GRPC_SRC_CORE_LIB_JSON_JSON_CHANNEL_ARGS_H #define GRPC_SRC_CORE_LIB_JSON_JSON_CHANNEL_ARGS_H -#include - #include "absl/strings/string_view.h" #include "absl/types/optional.h" +#include + #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/json/json_args.h" diff --git a/src/core/lib/json/json_object_loader.cc b/src/core/lib/json/json_object_loader.cc index e9165f63269..f7e445be1e1 100644 --- a/src/core/lib/json/json_object_loader.cc +++ b/src/core/lib/json/json_object_loader.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/json/json_object_loader.h" #include @@ -23,6 +21,7 @@ #include "absl/strings/strip.h" #include +#include namespace grpc_core { namespace json_detail { diff --git a/src/core/lib/json/json_object_loader.h b/src/core/lib/json/json_object_loader.h index ba5f3c68fe5..f6295d07aa2 100644 --- a/src/core/lib/json/json_object_loader.h +++ b/src/core/lib/json/json_object_loader.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_JSON_JSON_OBJECT_LOADER_H #define GRPC_SRC_CORE_LIB_JSON_JSON_OBJECT_LOADER_H -#include - #include #include #include @@ -32,6 +30,8 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" +#include + #include "src/core/lib/gprpp/no_destruct.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/time.h" diff --git a/src/core/lib/json/json_reader.cc b/src/core/lib/json/json_reader.cc index 9152c25ef7c..8944c4219cb 100644 --- a/src/core/lib/json/json_reader.cc +++ b/src/core/lib/json/json_reader.cc @@ -14,8 +14,6 @@ // limitations under the License. // -#include - #include #include @@ -36,6 +34,7 @@ #include #include +#include #include "src/core/lib/gprpp/match.h" #include "src/core/lib/json/json.h" diff --git a/src/core/lib/json/json_reader.h b/src/core/lib/json/json_reader.h index defe69d3322..fa26f130a66 100644 --- a/src/core/lib/json/json_reader.h +++ b/src/core/lib/json/json_reader.h @@ -17,11 +17,11 @@ #ifndef GRPC_SRC_CORE_LIB_JSON_JSON_READER_H #define GRPC_SRC_CORE_LIB_JSON_JSON_READER_H -#include - #include "absl/status/statusor.h" #include "absl/strings/string_view.h" +#include + #include "src/core/lib/json/json.h" namespace grpc_core { diff --git a/src/core/lib/json/json_util.cc b/src/core/lib/json/json_util.cc index 084a316a8e7..ca6541a1c1e 100644 --- a/src/core/lib/json/json_util.cc +++ b/src/core/lib/json/json_util.cc @@ -16,10 +16,10 @@ // // -#include - #include "src/core/lib/json/json_util.h" +#include + #include "src/core/lib/gprpp/no_destruct.h" #include "src/core/lib/gprpp/validation_errors.h" #include "src/core/lib/json/json_args.h" diff --git a/src/core/lib/json/json_util.h b/src/core/lib/json/json_util.h index 513800fa8d1..da98a2b67fd 100644 --- a/src/core/lib/json/json_util.h +++ b/src/core/lib/json/json_util.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_JSON_JSON_UTIL_H #define GRPC_SRC_CORE_LIB_JSON_JSON_UTIL_H -#include - #include #include #include @@ -32,6 +30,8 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" +#include + #include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/json/json.h" diff --git a/src/core/lib/json/json_writer.cc b/src/core/lib/json/json_writer.cc index a69884ce0d9..fb9a49d72a6 100644 --- a/src/core/lib/json/json_writer.cc +++ b/src/core/lib/json/json_writer.cc @@ -16,8 +16,6 @@ // // -#include - #include #include @@ -28,6 +26,8 @@ #include "absl/strings/string_view.h" +#include + #include "src/core/lib/json/json.h" namespace grpc_core { diff --git a/src/core/lib/json/json_writer.h b/src/core/lib/json/json_writer.h index f3b6d7f272c..bae701ea023 100644 --- a/src/core/lib/json/json_writer.h +++ b/src/core/lib/json/json_writer.h @@ -17,10 +17,10 @@ #ifndef GRPC_SRC_CORE_LIB_JSON_JSON_WRITER_H #define GRPC_SRC_CORE_LIB_JSON_JSON_WRITER_H -#include - #include +#include + #include "src/core/lib/json/json.h" namespace grpc_core { diff --git a/src/core/lib/matchers/matchers.cc b/src/core/lib/matchers/matchers.cc index 406b9c00f35..38bea23b2b5 100644 --- a/src/core/lib/matchers/matchers.cc +++ b/src/core/lib/matchers/matchers.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/matchers/matchers.h" #include @@ -25,6 +23,8 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" +#include + namespace grpc_core { // diff --git a/src/core/lib/matchers/matchers.h b/src/core/lib/matchers/matchers.h index dff5f3ab8c6..b2055778ff7 100644 --- a/src/core/lib/matchers/matchers.h +++ b/src/core/lib/matchers/matchers.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_MATCHERS_MATCHERS_H #define GRPC_SRC_CORE_LIB_MATCHERS_MATCHERS_H -#include - #include #include @@ -27,6 +25,8 @@ #include "absl/types/optional.h" #include "re2/re2.h" +#include + namespace grpc_core { class StringMatcher { diff --git a/src/core/lib/promise/activity.cc b/src/core/lib/promise/activity.cc index 60024b536cb..b229e5e3a29 100644 --- a/src/core/lib/promise/activity.cc +++ b/src/core/lib/promise/activity.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/promise/activity.h" #include @@ -24,6 +22,8 @@ #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" +#include + #include "src/core/lib/gprpp/atomic_utils.h" namespace grpc_core { diff --git a/src/core/lib/promise/activity.h b/src/core/lib/promise/activity.h index 17a2b70516c..d8bf6ed7bd2 100644 --- a/src/core/lib/promise/activity.h +++ b/src/core/lib/promise/activity.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_ACTIVITY_H #define GRPC_SRC_CORE_LIB_PROMISE_ACTIVITY_H -#include - #include #include @@ -30,6 +28,7 @@ #include "absl/types/optional.h" #include +#include #include "src/core/lib/event_engine/event_engine_context.h" #include "src/core/lib/gprpp/construct_destruct.h" diff --git a/src/core/lib/promise/all_ok.h b/src/core/lib/promise/all_ok.h index 33941a709f2..1f15631ac27 100644 --- a/src/core/lib/promise/all_ok.h +++ b/src/core/lib/promise/all_ok.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_ALL_OK_H #define GRPC_SRC_CORE_LIB_PROMISE_ALL_OK_H -#include - #include #include @@ -24,6 +22,8 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" +#include + #include "src/core/lib/promise/detail/join_state.h" #include "src/core/lib/promise/map.h" #include "src/core/lib/promise/poll.h" diff --git a/src/core/lib/promise/arena_promise.h b/src/core/lib/promise/arena_promise.h index bdc5a484d8d..287d1c650f3 100644 --- a/src/core/lib/promise/arena_promise.h +++ b/src/core/lib/promise/arena_promise.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_ARENA_PROMISE_H #define GRPC_SRC_CORE_LIB_PROMISE_ARENA_PROMISE_H -#include - #include #include @@ -26,6 +24,8 @@ #include "absl/meta/type_traits.h" +#include + #include "src/core/lib/gprpp/construct_destruct.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/poll.h" diff --git a/src/core/lib/promise/context.h b/src/core/lib/promise/context.h index 854cace5aab..a69effe7a1d 100644 --- a/src/core/lib/promise/context.h +++ b/src/core/lib/promise/context.h @@ -15,13 +15,12 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_CONTEXT_H #define GRPC_SRC_CORE_LIB_PROMISE_CONTEXT_H -#include - #include #include "absl/meta/type_traits.h" #include +#include #include "src/core/lib/gprpp/down_cast.h" diff --git a/src/core/lib/promise/detail/join_state.h b/src/core/lib/promise/detail/join_state.h index 4c36208e026..32d87e66296 100644 --- a/src/core/lib/promise/detail/join_state.h +++ b/src/core/lib/promise/detail/join_state.h @@ -17,13 +17,12 @@ // This file is generated by tools/codegen/core/gen_seq.py -#include - #include #include #include #include +#include #include "src/core/lib/gprpp/bitset.h" #include "src/core/lib/gprpp/construct_destruct.h" diff --git a/src/core/lib/promise/detail/promise_factory.h b/src/core/lib/promise/detail/promise_factory.h index 127819598a2..7e38411b8bd 100644 --- a/src/core/lib/promise/detail/promise_factory.h +++ b/src/core/lib/promise/detail/promise_factory.h @@ -15,14 +15,14 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_DETAIL_PROMISE_FACTORY_H #define GRPC_SRC_CORE_LIB_PROMISE_DETAIL_PROMISE_FACTORY_H -#include - #include #include #include #include "absl/meta/type_traits.h" +#include + #include "src/core/lib/promise/detail/promise_like.h" // PromiseFactory is an adaptor class. diff --git a/src/core/lib/promise/detail/promise_like.h b/src/core/lib/promise/detail/promise_like.h index 395c325873a..a8b80172c22 100644 --- a/src/core/lib/promise/detail/promise_like.h +++ b/src/core/lib/promise/detail/promise_like.h @@ -15,12 +15,12 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_DETAIL_PROMISE_LIKE_H #define GRPC_SRC_CORE_LIB_PROMISE_DETAIL_PROMISE_LIKE_H -#include - #include #include "absl/meta/type_traits.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/detail/seq_state.h b/src/core/lib/promise/detail/seq_state.h index 147ff10e6f1..604114af4ed 100644 --- a/src/core/lib/promise/detail/seq_state.h +++ b/src/core/lib/promise/detail/seq_state.h @@ -17,8 +17,6 @@ // This file is generated by tools/codegen/core/gen_seq.py -#include - #include #include @@ -27,6 +25,7 @@ #include "absl/strings/str_cat.h" #include +#include #include "src/core/lib/gprpp/construct_destruct.h" #include "src/core/lib/gprpp/debug_location.h" diff --git a/src/core/lib/promise/detail/status.h b/src/core/lib/promise/detail/status.h index bfc649e6c48..987fddfb99f 100644 --- a/src/core/lib/promise/detail/status.h +++ b/src/core/lib/promise/detail/status.h @@ -15,13 +15,13 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_DETAIL_STATUS_H #define GRPC_SRC_CORE_LIB_PROMISE_DETAIL_STATUS_H -#include - #include #include "absl/status/status.h" #include "absl/status/statusor.h" +#include + // Helpers for dealing with absl::Status/StatusOr generically namespace grpc_core { diff --git a/src/core/lib/promise/event_engine_wakeup_scheduler.h b/src/core/lib/promise/event_engine_wakeup_scheduler.h index 3e489c87fc6..b2ba6586a50 100644 --- a/src/core/lib/promise/event_engine_wakeup_scheduler.h +++ b/src/core/lib/promise/event_engine_wakeup_scheduler.h @@ -15,12 +15,11 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_EVENT_ENGINE_WAKEUP_SCHEDULER_H #define GRPC_SRC_CORE_LIB_PROMISE_EVENT_ENGINE_WAKEUP_SCHEDULER_H -#include - #include #include #include +#include #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/lib/promise/exec_ctx_wakeup_scheduler.h b/src/core/lib/promise/exec_ctx_wakeup_scheduler.h index 7a46c331759..865381f76b0 100644 --- a/src/core/lib/promise/exec_ctx_wakeup_scheduler.h +++ b/src/core/lib/promise/exec_ctx_wakeup_scheduler.h @@ -15,10 +15,10 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_EXEC_CTX_WAKEUP_SCHEDULER_H #define GRPC_SRC_CORE_LIB_PROMISE_EXEC_CTX_WAKEUP_SCHEDULER_H -#include - #include "absl/status/status.h" +#include + #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" diff --git a/src/core/lib/promise/for_each.h b/src/core/lib/promise/for_each.h index 6b1f26d4feb..4f431a9c4a9 100644 --- a/src/core/lib/promise/for_each.h +++ b/src/core/lib/promise/for_each.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_FOR_EACH_H #define GRPC_SRC_CORE_LIB_PROMISE_FOR_EACH_H -#include - #include #include @@ -26,6 +24,7 @@ #include "absl/strings/str_cat.h" #include +#include #include "src/core/lib/gprpp/construct_destruct.h" #include "src/core/lib/promise/activity.h" diff --git a/src/core/lib/promise/if.h b/src/core/lib/promise/if.h index 2c81fd7e38a..9dbef2acc8c 100644 --- a/src/core/lib/promise/if.h +++ b/src/core/lib/promise/if.h @@ -15,14 +15,14 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_IF_H #define GRPC_SRC_CORE_LIB_PROMISE_IF_H -#include - #include #include #include "absl/status/statusor.h" #include "absl/types/variant.h" +#include + #include "src/core/lib/gprpp/construct_destruct.h" #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/detail/promise_like.h" diff --git a/src/core/lib/promise/inter_activity_latch.h b/src/core/lib/promise/inter_activity_latch.h index 9b7b407fd37..b6465af0700 100644 --- a/src/core/lib/promise/inter_activity_latch.h +++ b/src/core/lib/promise/inter_activity_latch.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_INTER_ACTIVITY_LATCH_H #define GRPC_SRC_CORE_LIB_PROMISE_INTER_ACTIVITY_LATCH_H -#include - #include #include @@ -25,6 +23,7 @@ #include "absl/strings/str_cat.h" #include +#include #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/promise/activity.h" diff --git a/src/core/lib/promise/inter_activity_pipe.h b/src/core/lib/promise/inter_activity_pipe.h index dad7bbf2af6..e03901b76ce 100644 --- a/src/core/lib/promise/inter_activity_pipe.h +++ b/src/core/lib/promise/inter_activity_pipe.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_INTER_ACTIVITY_PIPE_H #define GRPC_SRC_CORE_LIB_PROMISE_INTER_ACTIVITY_PIPE_H -#include - #include #include @@ -25,6 +23,8 @@ #include "absl/base/thread_annotations.h" #include "absl/types/optional.h" +#include + #include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/sync.h" diff --git a/src/core/lib/promise/interceptor_list.h b/src/core/lib/promise/interceptor_list.h index f3fa43428a4..be12ed0cfdf 100644 --- a/src/core/lib/promise/interceptor_list.h +++ b/src/core/lib/promise/interceptor_list.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_INTERCEPTOR_LIST_H #define GRPC_SRC_CORE_LIB_PROMISE_INTERCEPTOR_LIST_H -#include - #include #include @@ -29,6 +27,7 @@ #include "absl/types/optional.h" #include +#include #include "src/core/lib/gprpp/construct_destruct.h" #include "src/core/lib/gprpp/debug_location.h" diff --git a/src/core/lib/promise/join.h b/src/core/lib/promise/join.h index 9918319ce1e..5c16f65c27f 100644 --- a/src/core/lib/promise/join.h +++ b/src/core/lib/promise/join.h @@ -15,14 +15,14 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_JOIN_H #define GRPC_SRC_CORE_LIB_PROMISE_JOIN_H -#include - #include #include #include "absl/meta/type_traits.h" +#include + #include "src/core/lib/promise/detail/join_state.h" #include "src/core/lib/promise/map.h" diff --git a/src/core/lib/promise/latch.h b/src/core/lib/promise/latch.h index e1252b99d92..63a6846dfab 100644 --- a/src/core/lib/promise/latch.h +++ b/src/core/lib/promise/latch.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_LATCH_H #define GRPC_SRC_CORE_LIB_PROMISE_LATCH_H -#include - #include #include @@ -26,6 +24,7 @@ #include "absl/strings/str_cat.h" #include +#include #include "src/core/lib/promise/activity.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 4908a472667..8b4f99286d4 100644 --- a/src/core/lib/promise/loop.h +++ b/src/core/lib/promise/loop.h @@ -15,14 +15,14 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_LOOP_H #define GRPC_SRC_CORE_LIB_PROMISE_LOOP_H -#include - #include #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/types/variant.h" +#include + #include "src/core/lib/gprpp/construct_destruct.h" #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/poll.h" diff --git a/src/core/lib/promise/map.h b/src/core/lib/promise/map.h index 59efef428fa..6ee27fef83d 100644 --- a/src/core/lib/promise/map.h +++ b/src/core/lib/promise/map.h @@ -15,13 +15,13 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_MAP_H #define GRPC_SRC_CORE_LIB_PROMISE_MAP_H -#include - #include #include #include +#include + #include "src/core/lib/promise/detail/promise_like.h" #include "src/core/lib/promise/poll.h" diff --git a/src/core/lib/promise/map_pipe.h b/src/core/lib/promise/map_pipe.h index d609cdfd70a..8dd4223dce3 100644 --- a/src/core/lib/promise/map_pipe.h +++ b/src/core/lib/promise/map_pipe.h @@ -15,11 +15,10 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_MAP_PIPE_H #define GRPC_SRC_CORE_LIB_PROMISE_MAP_PIPE_H -#include - #include "absl/status/status.h" #include +#include #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/for_each.h" diff --git a/src/core/lib/promise/mpsc.h b/src/core/lib/promise/mpsc.h index 38bcf2536b2..2362de390cd 100644 --- a/src/core/lib/promise/mpsc.h +++ b/src/core/lib/promise/mpsc.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_MPSC_H #define GRPC_SRC_CORE_LIB_PROMISE_MPSC_H -#include - #include #include @@ -26,6 +24,7 @@ #include "absl/base/thread_annotations.h" #include +#include #include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" diff --git a/src/core/lib/promise/observable.h b/src/core/lib/promise/observable.h index 60077de6d86..37437d9cc16 100644 --- a/src/core/lib/promise/observable.h +++ b/src/core/lib/promise/observable.h @@ -15,11 +15,11 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_OBSERVABLE_H #define GRPC_SRC_CORE_LIB_PROMISE_OBSERVABLE_H -#include - #include "absl/container/flat_hash_set.h" #include "absl/functional/any_invocable.h" +#include + #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" diff --git a/src/core/lib/promise/party.cc b/src/core/lib/promise/party.cc index 6322fbfcb7d..104201a3b2f 100644 --- a/src/core/lib/promise/party.cc +++ b/src/core/lib/promise/party.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/promise/party.h" #include @@ -22,6 +20,7 @@ #include "absl/strings/str_format.h" #include +#include #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/lib/promise/party.h b/src/core/lib/promise/party.h index c9a4ffabba9..44f890fa208 100644 --- a/src/core/lib/promise/party.h +++ b/src/core/lib/promise/party.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_PARTY_H #define GRPC_SRC_CORE_LIB_PROMISE_PARTY_H -#include - #include #include @@ -30,6 +28,7 @@ #include #include +#include #include "src/core/lib/gprpp/construct_destruct.h" #include "src/core/lib/gprpp/crash.h" diff --git a/src/core/lib/promise/pipe.h b/src/core/lib/promise/pipe.h index b790f315592..a1533bbcae5 100644 --- a/src/core/lib/promise/pipe.h +++ b/src/core/lib/promise/pipe.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_PIPE_H #define GRPC_SRC_CORE_LIB_PROMISE_PIPE_H -#include - #include #include @@ -29,6 +27,7 @@ #include "absl/types/variant.h" #include +#include #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" diff --git a/src/core/lib/promise/poll.h b/src/core/lib/promise/poll.h index d9b773f5409..53604c2c89d 100644 --- a/src/core/lib/promise/poll.h +++ b/src/core/lib/promise/poll.h @@ -15,12 +15,11 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_POLL_H #define GRPC_SRC_CORE_LIB_PROMISE_POLL_H -#include - #include #include #include +#include #include "src/core/lib/gprpp/construct_destruct.h" diff --git a/src/core/lib/promise/prioritized_race.h b/src/core/lib/promise/prioritized_race.h index 166c4d2dad1..bd179c33313 100644 --- a/src/core/lib/promise/prioritized_race.h +++ b/src/core/lib/promise/prioritized_race.h @@ -15,10 +15,10 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_PRIORITIZED_RACE_H #define GRPC_SRC_CORE_LIB_PROMISE_PRIORITIZED_RACE_H -#include - #include +#include + namespace grpc_core { namespace promise_detail { diff --git a/src/core/lib/promise/promise.h b/src/core/lib/promise/promise.h index dad484900d4..bad6aad81d0 100644 --- a/src/core/lib/promise/promise.h +++ b/src/core/lib/promise/promise.h @@ -15,14 +15,14 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_PROMISE_H #define GRPC_SRC_CORE_LIB_PROMISE_PROMISE_H -#include - #include #include "absl/functional/any_invocable.h" #include "absl/status/status.h" #include "absl/types/optional.h" +#include + #include "src/core/lib/promise/detail/promise_like.h" #include "src/core/lib/promise/poll.h" diff --git a/src/core/lib/promise/promise_mutex.h b/src/core/lib/promise/promise_mutex.h index 80129eeb995..218919db1e9 100644 --- a/src/core/lib/promise/promise_mutex.h +++ b/src/core/lib/promise/promise_mutex.h @@ -15,11 +15,10 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_PROMISE_MUTEX_H #define GRPC_SRC_CORE_LIB_PROMISE_PROMISE_MUTEX_H -#include - #include #include +#include #include "src/core/lib/promise/activity.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 f363c93e5e2..e23a0679793 100644 --- a/src/core/lib/promise/race.h +++ b/src/core/lib/promise/race.h @@ -15,10 +15,10 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_RACE_H #define GRPC_SRC_CORE_LIB_PROMISE_RACE_H -#include - #include +#include + namespace grpc_core { namespace promise_detail { diff --git a/src/core/lib/promise/seq.h b/src/core/lib/promise/seq.h index 1f1ea758ee2..f1bbb2f322e 100644 --- a/src/core/lib/promise/seq.h +++ b/src/core/lib/promise/seq.h @@ -15,12 +15,12 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_SEQ_H #define GRPC_SRC_CORE_LIB_PROMISE_SEQ_H -#include - #include #include +#include + #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/promise/detail/basic_seq.h" #include "src/core/lib/promise/detail/promise_like.h" diff --git a/src/core/lib/promise/sleep.cc b/src/core/lib/promise/sleep.cc index d6da73cfe60..1b793367149 100644 --- a/src/core/lib/promise/sleep.cc +++ b/src/core/lib/promise/sleep.cc @@ -12,13 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/promise/sleep.h" #include #include +#include #include "src/core/lib/event_engine/event_engine_context.h" // IWYU pragma: keep #include "src/core/lib/gprpp/time.h" diff --git a/src/core/lib/promise/sleep.h b/src/core/lib/promise/sleep.h index 7f3a9685230..b595b7100e3 100644 --- a/src/core/lib/promise/sleep.h +++ b/src/core/lib/promise/sleep.h @@ -15,14 +15,13 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_SLEEP_H #define GRPC_SRC_CORE_LIB_PROMISE_SLEEP_H -#include - #include #include #include "absl/status/status.h" #include +#include #include "src/core/lib/gprpp/time.h" #include "src/core/lib/promise/activity.h" diff --git a/src/core/lib/promise/status_flag.h b/src/core/lib/promise/status_flag.h index 700ad9c856b..80e1e2ebd88 100644 --- a/src/core/lib/promise/status_flag.h +++ b/src/core/lib/promise/status_flag.h @@ -15,13 +15,12 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_STATUS_FLAG_H #define GRPC_SRC_CORE_LIB_PROMISE_STATUS_FLAG_H -#include - #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/types/optional.h" #include +#include #include "src/core/lib/promise/detail/status.h" diff --git a/src/core/lib/promise/switch.h b/src/core/lib/promise/switch.h index 1bb05507ef2..eed6e89928b 100644 --- a/src/core/lib/promise/switch.h +++ b/src/core/lib/promise/switch.h @@ -15,11 +15,11 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_SWITCH_H #define GRPC_SRC_CORE_LIB_PROMISE_SWITCH_H -#include - #include #include +#include + #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/if.h" diff --git a/src/core/lib/promise/trace.cc b/src/core/lib/promise/trace.cc index 21b430526df..603f69f1da1 100644 --- a/src/core/lib/promise/trace.cc +++ b/src/core/lib/promise/trace.cc @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/promise/trace.h" +#include + grpc_core::DebugOnlyTraceFlag grpc_trace_promise_primitives( false, "promise_primitives"); diff --git a/src/core/lib/promise/try_join.h b/src/core/lib/promise/try_join.h index 29cd06d5be4..b984d880190 100644 --- a/src/core/lib/promise/try_join.h +++ b/src/core/lib/promise/try_join.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_TRY_JOIN_H #define GRPC_SRC_CORE_LIB_PROMISE_TRY_JOIN_H -#include - #include #include @@ -24,6 +22,8 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" +#include + #include "src/core/lib/promise/detail/join_state.h" #include "src/core/lib/promise/map.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 ab9777d1afb..aaecff002b0 100644 --- a/src/core/lib/promise/try_seq.h +++ b/src/core/lib/promise/try_seq.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_TRY_SEQ_H #define GRPC_SRC_CORE_LIB_PROMISE_TRY_SEQ_H -#include - #include #include @@ -26,6 +24,8 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" +#include + #include "src/core/lib/promise/detail/basic_seq.h" #include "src/core/lib/promise/detail/promise_like.h" #include "src/core/lib/promise/detail/seq_state.h" diff --git a/src/core/lib/promise/wait_for_callback.h b/src/core/lib/promise/wait_for_callback.h index 6dc966c7b19..519253bbb24 100644 --- a/src/core/lib/promise/wait_for_callback.h +++ b/src/core/lib/promise/wait_for_callback.h @@ -15,13 +15,13 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_WAIT_FOR_CALLBACK_H #define GRPC_SRC_CORE_LIB_PROMISE_WAIT_FOR_CALLBACK_H -#include - #include #include #include "absl/base/thread_annotations.h" +#include + #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/promise/activity.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 bf1adc6c1c2..d58788a057c 100644 --- a/src/core/lib/promise/wait_set.h +++ b/src/core/lib/promise/wait_set.h @@ -15,13 +15,13 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_WAIT_SET_H #define GRPC_SRC_CORE_LIB_PROMISE_WAIT_SET_H -#include - #include #include "absl/container/flat_hash_set.h" #include "absl/hash/hash.h" +#include + #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" diff --git a/src/core/lib/resource_quota/api.cc b/src/core/lib/resource_quota/api.cc index 302b5d1a86e..7e2f9594e65 100644 --- a/src/core/lib/resource_quota/api.cc +++ b/src/core/lib/resource_quota/api.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/resource_quota/api.h" #include @@ -27,6 +25,7 @@ #include #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" diff --git a/src/core/lib/resource_quota/api.h b/src/core/lib/resource_quota/api.h index f636733b8bd..f1a60fb3772 100644 --- a/src/core/lib/resource_quota/api.h +++ b/src/core/lib/resource_quota/api.h @@ -15,12 +15,11 @@ #ifndef GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_API_H #define GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_API_H -#include - #include #include #include +#include #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/resource_quota/resource_quota.h" diff --git a/src/core/lib/resource_quota/arena.cc b/src/core/lib/resource_quota/arena.cc index 332bdc4c85c..7a0f9e752f0 100644 --- a/src/core/lib/resource_quota/arena.cc +++ b/src/core/lib/resource_quota/arena.cc @@ -16,14 +16,13 @@ // // -#include - #include "src/core/lib/resource_quota/arena.h" #include #include #include +#include #include "src/core/lib/gpr/alloc.h" diff --git a/src/core/lib/resource_quota/arena.h b/src/core/lib/resource_quota/arena.h index fdc93621c3c..5985c9220fb 100644 --- a/src/core/lib/resource_quota/arena.h +++ b/src/core/lib/resource_quota/arena.h @@ -25,8 +25,6 @@ #ifndef GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_ARENA_H #define GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_ARENA_H -#include - #include #include @@ -35,6 +33,7 @@ #include #include +#include #include "src/core/lib/gpr/alloc.h" #include "src/core/lib/gprpp/construct_destruct.h" diff --git a/src/core/lib/resource_quota/connection_quota.cc b/src/core/lib/resource_quota/connection_quota.cc index 75d3c7b8edd..74c8514d159 100644 --- a/src/core/lib/resource_quota/connection_quota.cc +++ b/src/core/lib/resource_quota/connection_quota.cc @@ -12,14 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/resource_quota/connection_quota.h" #include #include #include +#include namespace grpc_core { diff --git a/src/core/lib/resource_quota/connection_quota.h b/src/core/lib/resource_quota/connection_quota.h index 32815f57600..fcaddc1b58a 100644 --- a/src/core/lib/resource_quota/connection_quota.h +++ b/src/core/lib/resource_quota/connection_quota.h @@ -15,13 +15,13 @@ #ifndef GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_CONNECTION_QUOTA_H #define GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_CONNECTION_QUOTA_H -#include - #include #include #include "absl/base/thread_annotations.h" +#include + #include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/sync.h" diff --git a/src/core/lib/resource_quota/memory_quota.cc b/src/core/lib/resource_quota/memory_quota.cc index c6de200f8bc..929df9068a5 100644 --- a/src/core/lib/resource_quota/memory_quota.cc +++ b/src/core/lib/resource_quota/memory_quota.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/resource_quota/memory_quota.h" #include @@ -32,6 +30,7 @@ #include #include +#include #include "src/core/lib/debug/trace.h" #include "src/core/lib/gpr/useful.h" diff --git a/src/core/lib/resource_quota/memory_quota.h b/src/core/lib/resource_quota/memory_quota.h index 4f38b8dd32d..fc8d966382c 100644 --- a/src/core/lib/resource_quota/memory_quota.h +++ b/src/core/lib/resource_quota/memory_quota.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_MEMORY_QUOTA_H #define GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_MEMORY_QUOTA_H -#include - #include #include @@ -36,6 +34,7 @@ #include #include #include +#include #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" diff --git a/src/core/lib/resource_quota/periodic_update.cc b/src/core/lib/resource_quota/periodic_update.cc index 78d424ccca9..b39ad44a44f 100644 --- a/src/core/lib/resource_quota/periodic_update.cc +++ b/src/core/lib/resource_quota/periodic_update.cc @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/resource_quota/periodic_update.h" #include +#include + #include "src/core/lib/gpr/useful.h" namespace grpc_core { diff --git a/src/core/lib/resource_quota/periodic_update.h b/src/core/lib/resource_quota/periodic_update.h index 933430a3c7a..4104c94a78b 100644 --- a/src/core/lib/resource_quota/periodic_update.h +++ b/src/core/lib/resource_quota/periodic_update.h @@ -15,14 +15,14 @@ #ifndef GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_PERIODIC_UPDATE_H #define GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_PERIODIC_UPDATE_H -#include - #include #include #include "absl/functional/function_ref.h" +#include + #include "src/core/lib/gprpp/time.h" namespace grpc_core { diff --git a/src/core/lib/resource_quota/resource_quota.cc b/src/core/lib/resource_quota/resource_quota.cc index ac8e3cef356..0a266756e19 100644 --- a/src/core/lib/resource_quota/resource_quota.cc +++ b/src/core/lib/resource_quota/resource_quota.cc @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/resource_quota/resource_quota.h" +#include + namespace grpc_core { ResourceQuota::ResourceQuota(std::string name) diff --git a/src/core/lib/resource_quota/resource_quota.h b/src/core/lib/resource_quota/resource_quota.h index f6dde768daa..37f1fa7c989 100644 --- a/src/core/lib/resource_quota/resource_quota.h +++ b/src/core/lib/resource_quota/resource_quota.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_RESOURCE_QUOTA_H #define GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_RESOURCE_QUOTA_H -#include - #include #include @@ -24,6 +22,7 @@ #include #include +#include #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/cpp_impl_of.h" diff --git a/src/core/lib/resource_quota/thread_quota.cc b/src/core/lib/resource_quota/thread_quota.cc index 24c4c3ace8d..eb30d336341 100644 --- a/src/core/lib/resource_quota/thread_quota.cc +++ b/src/core/lib/resource_quota/thread_quota.cc @@ -12,11 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/resource_quota/thread_quota.h" #include +#include namespace grpc_core { diff --git a/src/core/lib/resource_quota/thread_quota.h b/src/core/lib/resource_quota/thread_quota.h index cda4a4907e7..d66ee574c02 100644 --- a/src/core/lib/resource_quota/thread_quota.h +++ b/src/core/lib/resource_quota/thread_quota.h @@ -15,13 +15,13 @@ #ifndef GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_THREAD_QUOTA_H #define GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_THREAD_QUOTA_H -#include - #include #include #include "absl/base/thread_annotations.h" +#include + #include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/sync.h" diff --git a/src/core/lib/resource_quota/trace.cc b/src/core/lib/resource_quota/trace.cc index 51e6cb01657..056120d7691 100644 --- a/src/core/lib/resource_quota/trace.cc +++ b/src/core/lib/resource_quota/trace.cc @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/resource_quota/trace.h" +#include + grpc_core::TraceFlag grpc_resource_quota_trace(false, "resource_quota"); diff --git a/src/core/lib/security/authorization/audit_logging.cc b/src/core/lib/security/authorization/audit_logging.cc index b1df62da30d..aa8d34ce9a2 100644 --- a/src/core/lib/security/authorization/audit_logging.cc +++ b/src/core/lib/security/authorization/audit_logging.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/security/authorization/audit_logging.h" #include @@ -32,6 +30,7 @@ #include #include #include +#include #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/security/authorization/stdout_logger.h" diff --git a/src/core/lib/security/authorization/audit_logging.h b/src/core/lib/security/authorization/audit_logging.h index 8bf6a3058c8..694810599cf 100644 --- a/src/core/lib/security/authorization/audit_logging.h +++ b/src/core/lib/security/authorization/audit_logging.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_AUDIT_LOGGING_H #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_AUDIT_LOGGING_H -#include - #include #include @@ -30,6 +28,7 @@ #include #include +#include #include "src/core/lib/gprpp/sync.h" diff --git a/src/core/lib/security/authorization/authorization_engine.h b/src/core/lib/security/authorization/authorization_engine.h index d24d32f8cba..37486cef420 100644 --- a/src/core/lib/security/authorization/authorization_engine.h +++ b/src/core/lib/security/authorization/authorization_engine.h @@ -15,10 +15,10 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_AUTHORIZATION_ENGINE_H #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_AUTHORIZATION_ENGINE_H -#include - #include +#include + #include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/security/authorization/evaluate_args.h" diff --git a/src/core/lib/security/authorization/authorization_policy_provider.h b/src/core/lib/security/authorization/authorization_policy_provider.h index e5bee1a5e0c..cca363f38fd 100644 --- a/src/core/lib/security/authorization/authorization_policy_provider.h +++ b/src/core/lib/security/authorization/authorization_policy_provider.h @@ -15,12 +15,11 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_AUTHORIZATION_POLICY_PROVIDER_H #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_AUTHORIZATION_POLICY_PROVIDER_H -#include - #include "absl/strings/string_view.h" #include #include +#include #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/dual_ref_counted.h" diff --git a/src/core/lib/security/authorization/authorization_policy_provider_vtable.cc b/src/core/lib/security/authorization/authorization_policy_provider_vtable.cc index 75498ebf8f6..ddf1a1201ad 100644 --- a/src/core/lib/security/authorization/authorization_policy_provider_vtable.cc +++ b/src/core/lib/security/authorization/authorization_policy_provider_vtable.cc @@ -12,10 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include #include +#include #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" diff --git a/src/core/lib/security/authorization/cel_authorization_engine.cc b/src/core/lib/security/authorization/cel_authorization_engine.cc index 591d7421134..526fb79576e 100644 --- a/src/core/lib/security/authorization/cel_authorization_engine.cc +++ b/src/core/lib/security/authorization/cel_authorization_engine.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/security/authorization/cel_authorization_engine.h" #include @@ -28,6 +26,7 @@ #include "upb/message/map.h" #include +#include 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 f402a26aa78..5122b96cab5 100644 --- a/src/core/lib/security/authorization/cel_authorization_engine.h +++ b/src/core/lib/security/authorization/cel_authorization_engine.h @@ -16,8 +16,6 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_CEL_AUTHORIZATION_ENGINE_H #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_CEL_AUTHORIZATION_ENGINE_H -#include - #include #include #include @@ -28,6 +26,8 @@ #include "google/api/expr/v1alpha1/syntax.upb.h" #include "upb/mem/arena.hpp" +#include + #include "src/core/lib/security/authorization/evaluate_args.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/evaluate_args.cc b/src/core/lib/security/authorization/evaluate_args.cc index 62c5b20e3d5..5846cb6658c 100644 --- a/src/core/lib/security/authorization/evaluate_args.cc +++ b/src/core/lib/security/authorization/evaluate_args.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/security/authorization/evaluate_args.h" #include @@ -25,6 +23,7 @@ #include #include +#include #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/gprpp/host_port.h" diff --git a/src/core/lib/security/authorization/evaluate_args.h b/src/core/lib/security/authorization/evaluate_args.h index e042f2c5ace..69cf2ac4ee8 100644 --- a/src/core/lib/security/authorization/evaluate_args.h +++ b/src/core/lib/security/authorization/evaluate_args.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_EVALUATE_ARGS_H #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_EVALUATE_ARGS_H -#include - #include #include @@ -24,6 +22,7 @@ #include "absl/types/optional.h" #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/resolved_address.h" diff --git a/src/core/lib/security/authorization/grpc_authorization_engine.cc b/src/core/lib/security/authorization/grpc_authorization_engine.cc index 6efd9982dd0..bce0619f68e 100644 --- a/src/core/lib/security/authorization/grpc_authorization_engine.cc +++ b/src/core/lib/security/authorization/grpc_authorization_engine.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/security/authorization/grpc_authorization_engine.h" #include @@ -21,6 +19,7 @@ #include #include +#include #include "src/core/lib/security/authorization/audit_logging.h" #include "src/core/lib/security/authorization/authorization_engine.h" diff --git a/src/core/lib/security/authorization/grpc_authorization_engine.h b/src/core/lib/security/authorization/grpc_authorization_engine.h index f769aa6c15b..1ac877a5f4c 100644 --- a/src/core/lib/security/authorization/grpc_authorization_engine.h +++ b/src/core/lib/security/authorization/grpc_authorization_engine.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_AUTHORIZATION_ENGINE_H #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_AUTHORIZATION_ENGINE_H -#include - #include #include @@ -24,6 +22,7 @@ #include #include +#include #include "src/core/lib/security/authorization/authorization_engine.h" #include "src/core/lib/security/authorization/evaluate_args.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 efb3d532863..caca700f75b 100644 --- a/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc +++ b/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/security/authorization/grpc_authorization_policy_provider.h" #include @@ -26,6 +24,7 @@ #include #include #include +#include #include #include diff --git a/src/core/lib/security/authorization/grpc_authorization_policy_provider.h b/src/core/lib/security/authorization/grpc_authorization_policy_provider.h index 94ad9c4e13e..b61db3131b1 100644 --- a/src/core/lib/security/authorization/grpc_authorization_policy_provider.h +++ b/src/core/lib/security/authorization/grpc_authorization_policy_provider.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_AUTHORIZATION_POLICY_PROVIDER_H #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_AUTHORIZATION_POLICY_PROVIDER_H -#include - #include #include #include @@ -27,6 +25,7 @@ #include "absl/strings/string_view.h" #include +#include #include #include "src/core/lib/gprpp/ref_counted_ptr.h" diff --git a/src/core/lib/security/authorization/grpc_server_authz_filter.cc b/src/core/lib/security/authorization/grpc_server_authz_filter.cc index e19032b86b9..199c0a8fa5b 100644 --- a/src/core/lib/security/authorization/grpc_server_authz_filter.cc +++ b/src/core/lib/security/authorization/grpc_server_authz_filter.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/security/authorization/grpc_server_authz_filter.h" #include @@ -25,6 +23,7 @@ #include "absl/strings/str_join.h" #include +#include #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/promise_based_filter.h" diff --git a/src/core/lib/security/authorization/grpc_server_authz_filter.h b/src/core/lib/security/authorization/grpc_server_authz_filter.h index c4a9fc9b5c1..fd29197a3bf 100644 --- a/src/core/lib/security/authorization/grpc_server_authz_filter.h +++ b/src/core/lib/security/authorization/grpc_server_authz_filter.h @@ -15,11 +15,10 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_SERVER_AUTHZ_FILTER_H #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_SERVER_AUTHZ_FILTER_H -#include - #include "absl/status/statusor.h" #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" diff --git a/src/core/lib/security/authorization/matchers.cc b/src/core/lib/security/authorization/matchers.cc index 3407cc48574..8fc2fe4d2d0 100644 --- a/src/core/lib/security/authorization/matchers.cc +++ b/src/core/lib/security/authorization/matchers.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/security/authorization/matchers.h" #include @@ -26,6 +24,7 @@ #include #include +#include #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" diff --git a/src/core/lib/security/authorization/matchers.h b/src/core/lib/security/authorization/matchers.h index e36c210a97e..354d7c0cb3e 100644 --- a/src/core/lib/security/authorization/matchers.h +++ b/src/core/lib/security/authorization/matchers.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MATCHERS_H #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MATCHERS_H -#include - #include #include @@ -25,6 +23,8 @@ #include "absl/types/optional.h" +#include + #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/matchers/matchers.h" #include "src/core/lib/security/authorization/evaluate_args.h" diff --git a/src/core/lib/security/authorization/mock_cel/activation.h b/src/core/lib/security/authorization/mock_cel/activation.h index 12c82f8d604..174aeac91e7 100644 --- a/src/core/lib/security/authorization/mock_cel/activation.h +++ b/src/core/lib/security/authorization/mock_cel/activation.h @@ -15,10 +15,10 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_ACTIVATION_H #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_ACTIVATION_H -#include - #include "absl/strings/string_view.h" +#include + #include "src/core/lib/security/authorization/mock_cel/cel_value.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/mock_cel/cel_expr_builder_factory.h b/src/core/lib/security/authorization/mock_cel/cel_expr_builder_factory.h index b9f94b15523..873d085ffe8 100644 --- a/src/core/lib/security/authorization/mock_cel/cel_expr_builder_factory.h +++ b/src/core/lib/security/authorization/mock_cel/cel_expr_builder_factory.h @@ -15,10 +15,10 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_CEL_EXPR_BUILDER_FACTORY_H #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_CEL_EXPR_BUILDER_FACTORY_H -#include - #include +#include + #include "src/core/lib/security/authorization/mock_cel/cel_expression.h" #include "src/core/lib/security/authorization/mock_cel/flat_expr_builder.h" 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 a5ab47f7b49..8e4a8b0c042 100644 --- a/src/core/lib/security/authorization/mock_cel/cel_expression.h +++ b/src/core/lib/security/authorization/mock_cel/cel_expression.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_CEL_EXPRESSION_H #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_CEL_EXPRESSION_H -#include - #include #include @@ -24,6 +22,8 @@ #include "absl/status/statusor.h" #include "google/api/expr/v1alpha1/syntax.upb.h" +#include + #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/cel_value.h b/src/core/lib/security/authorization/mock_cel/cel_value.h index a93ba309f27..5a7531121aa 100644 --- a/src/core/lib/security/authorization/mock_cel/cel_value.h +++ b/src/core/lib/security/authorization/mock_cel/cel_value.h @@ -30,8 +30,6 @@ // std::string* msg("test"); // CelValue value = CelValue::CreateString(msg); -#include - #include #include @@ -41,6 +39,8 @@ #include "absl/strings/string_view.h" #include "absl/types/span.h" +#include + namespace grpc_core { namespace mock_cel { 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 24863dae605..09f0add6c81 100644 --- a/src/core/lib/security/authorization/mock_cel/evaluator_core.h +++ b/src/core/lib/security/authorization/mock_cel/evaluator_core.h @@ -15,14 +15,14 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_EVALUATOR_CORE_H #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_EVALUATOR_CORE_H -#include - #include #include #include "absl/status/statusor.h" #include "google/api/expr/v1alpha1/syntax.upb.h" +#include + #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/mock_cel/flat_expr_builder.h b/src/core/lib/security/authorization/mock_cel/flat_expr_builder.h index f333c9c4685..608d9d9cfa1 100644 --- a/src/core/lib/security/authorization/mock_cel/flat_expr_builder.h +++ b/src/core/lib/security/authorization/mock_cel/flat_expr_builder.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_FLAT_EXPR_BUILDER_H #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_FLAT_EXPR_BUILDER_H -#include - #include #include #include @@ -26,6 +24,8 @@ #include "absl/status/statusor.h" #include "google/api/expr/v1alpha1/syntax.upb.h" +#include + #include "src/core/lib/security/authorization/mock_cel/cel_expression.h" #include "src/core/lib/security/authorization/mock_cel/evaluator_core.h" diff --git a/src/core/lib/security/authorization/rbac_policy.cc b/src/core/lib/security/authorization/rbac_policy.cc index dd5a8fffdae..6dfa7b3e3cf 100644 --- a/src/core/lib/security/authorization/rbac_policy.cc +++ b/src/core/lib/security/authorization/rbac_policy.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/security/authorization/rbac_policy.h" #include @@ -22,6 +20,8 @@ #include "absl/strings/str_join.h" #include "absl/strings/string_view.h" +#include + namespace grpc_core { // diff --git a/src/core/lib/security/authorization/rbac_policy.h b/src/core/lib/security/authorization/rbac_policy.h index 0ee9de16cc1..b3a2c6db6aa 100644 --- a/src/core/lib/security/authorization/rbac_policy.h +++ b/src/core/lib/security/authorization/rbac_policy.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_RBAC_POLICY_H #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_RBAC_POLICY_H -#include - #include #include @@ -27,6 +25,7 @@ #include "absl/types/optional.h" #include +#include #include "src/core/lib/matchers/matchers.h" diff --git a/src/core/lib/security/authorization/rbac_translator.cc b/src/core/lib/security/authorization/rbac_translator.cc index eb67014e08d..481ee34552a 100644 --- a/src/core/lib/security/authorization/rbac_translator.cc +++ b/src/core/lib/security/authorization/rbac_translator.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/security/authorization/rbac_translator.h" #include @@ -36,6 +34,7 @@ #include #include #include +#include #include "src/core/lib/gpr/useful.h" #include "src/core/lib/json/json.h" diff --git a/src/core/lib/security/authorization/rbac_translator.h b/src/core/lib/security/authorization/rbac_translator.h index 0f26d9aa39a..18c1fed3b99 100644 --- a/src/core/lib/security/authorization/rbac_translator.h +++ b/src/core/lib/security/authorization/rbac_translator.h @@ -15,12 +15,12 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_RBAC_TRANSLATOR_H #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_RBAC_TRANSLATOR_H -#include - #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" +#include + #include "src/core/lib/security/authorization/rbac_policy.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/stdout_logger.cc b/src/core/lib/security/authorization/stdout_logger.cc index 7aae9a2cac3..15bbef6bcf4 100644 --- a/src/core/lib/security/authorization/stdout_logger.cc +++ b/src/core/lib/security/authorization/stdout_logger.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/security/authorization/stdout_logger.h" #include @@ -29,6 +27,7 @@ #include #include #include +#include namespace grpc_core { namespace experimental { diff --git a/src/core/lib/security/authorization/stdout_logger.h b/src/core/lib/security/authorization/stdout_logger.h index 4f37b7311da..a2186af7fb0 100644 --- a/src/core/lib/security/authorization/stdout_logger.h +++ b/src/core/lib/security/authorization/stdout_logger.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_STDOUT_LOGGER_H #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_STDOUT_LOGGER_H -#include - #include #include @@ -25,6 +23,7 @@ #include #include +#include namespace grpc_core { namespace experimental { diff --git a/src/core/lib/security/certificate_provider/certificate_provider_factory.h b/src/core/lib/security/certificate_provider/certificate_provider_factory.h index 08f0e228859..beacb85032e 100644 --- a/src/core/lib/security/certificate_provider/certificate_provider_factory.h +++ b/src/core/lib/security/certificate_provider/certificate_provider_factory.h @@ -19,13 +19,12 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CERTIFICATE_PROVIDER_CERTIFICATE_PROVIDER_FACTORY_H #define GRPC_SRC_CORE_LIB_SECURITY_CERTIFICATE_PROVIDER_CERTIFICATE_PROVIDER_FACTORY_H -#include - #include #include "absl/strings/string_view.h" #include +#include #include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" diff --git a/src/core/lib/security/certificate_provider/certificate_provider_registry.cc b/src/core/lib/security/certificate_provider/certificate_provider_registry.cc index ae29a85ee86..fde0d303673 100644 --- a/src/core/lib/security/certificate_provider/certificate_provider_registry.cc +++ b/src/core/lib/security/certificate_provider/certificate_provider_registry.cc @@ -16,14 +16,13 @@ // // -#include - #include "src/core/lib/security/certificate_provider/certificate_provider_registry.h" #include #include #include +#include namespace grpc_core { diff --git a/src/core/lib/security/certificate_provider/certificate_provider_registry.h b/src/core/lib/security/certificate_provider/certificate_provider_registry.h index 5cc05ae2a5e..84eee65d392 100644 --- a/src/core/lib/security/certificate_provider/certificate_provider_registry.h +++ b/src/core/lib/security/certificate_provider/certificate_provider_registry.h @@ -19,14 +19,14 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CERTIFICATE_PROVIDER_CERTIFICATE_PROVIDER_REGISTRY_H #define GRPC_SRC_CORE_LIB_SECURITY_CERTIFICATE_PROVIDER_CERTIFICATE_PROVIDER_REGISTRY_H -#include - #include #include #include #include "absl/strings/string_view.h" +#include + #include "src/core/lib/security/certificate_provider/certificate_provider_factory.h" namespace grpc_core { diff --git a/src/core/lib/security/context/security_context.cc b/src/core/lib/security/context/security_context.cc index c81b8aeba7f..9cdc64bde6d 100644 --- a/src/core/lib/security/context/security_context.cc +++ b/src/core/lib/security/context/security_context.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/security/context/security_context.h" #include @@ -27,6 +25,7 @@ #include #include #include +#include #include #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/lib/security/context/security_context.h b/src/core/lib/security/context/security_context.h index 0c24f5fa1a7..bbc38020d4f 100644 --- a/src/core/lib/security/context/security_context.h +++ b/src/core/lib/security/context/security_context.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CONTEXT_SECURITY_CONTEXT_H #define GRPC_SRC_CORE_LIB_SECURITY_CONTEXT_SECURITY_CONTEXT_H -#include - #include #include @@ -31,6 +29,7 @@ #include #include #include +#include #include "src/core/lib/debug/trace.h" #include "src/core/lib/gpr/useful.h" diff --git a/src/core/lib/security/credentials/alts/alts_credentials.cc b/src/core/lib/security/credentials/alts/alts_credentials.cc index 55626975305..fd8c364c26a 100644 --- a/src/core/lib/security/credentials/alts/alts_credentials.cc +++ b/src/core/lib/security/credentials/alts/alts_credentials.cc @@ -16,14 +16,13 @@ // // -#include - #include "src/core/lib/security/credentials/alts/alts_credentials.h" #include #include #include +#include #include #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" diff --git a/src/core/lib/security/credentials/alts/alts_credentials.h b/src/core/lib/security/credentials/alts/alts_credentials.h index a78f5c8f2a6..08ee0439666 100644 --- a/src/core/lib/security/credentials/alts/alts_credentials.h +++ b/src/core/lib/security/credentials/alts/alts_credentials.h @@ -19,10 +19,9 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_ALTS_ALTS_CREDENTIALS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_ALTS_ALTS_CREDENTIALS_H -#include - #include #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/useful.h" diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment.cc b/src/core/lib/security/credentials/alts/check_gcp_environment.cc index d3183ca00fc..3c98988a48e 100644 --- a/src/core/lib/security/credentials/alts/check_gcp_environment.cc +++ b/src/core/lib/security/credentials/alts/check_gcp_environment.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" #include @@ -26,6 +24,7 @@ #include #include +#include const size_t kBiosDataBufferSize = 256; diff --git a/src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc b/src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc index 3dfd949192b..4b9e91b9833 100644 --- a/src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc +++ b/src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc @@ -16,11 +16,10 @@ // // -#include - #include #include #include +#include #include #include "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h" diff --git a/src/core/lib/security/credentials/alts/grpc_alts_credentials_options.cc b/src/core/lib/security/credentials/alts/grpc_alts_credentials_options.cc index bd11e3f844f..ec29ac2dbff 100644 --- a/src/core/lib/security/credentials/alts/grpc_alts_credentials_options.cc +++ b/src/core/lib/security/credentials/alts/grpc_alts_credentials_options.cc @@ -16,12 +16,11 @@ // // -#include - #include "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h" #include #include +#include grpc_alts_credentials_options* grpc_alts_credentials_options_copy( const grpc_alts_credentials_options* options) { diff --git a/src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h b/src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h index c012bb96338..6997beee5de 100644 --- a/src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h +++ b/src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h @@ -19,9 +19,8 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_ALTS_GRPC_ALTS_CREDENTIALS_OPTIONS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_ALTS_GRPC_ALTS_CREDENTIALS_OPTIONS_H -#include - #include +#include #include "src/core/tsi/alts/handshaker/transport_security_common_api.h" diff --git a/src/core/lib/security/credentials/alts/grpc_alts_credentials_server_options.cc b/src/core/lib/security/credentials/alts/grpc_alts_credentials_server_options.cc index 63c6c5e8c72..3da2a2d72a7 100644 --- a/src/core/lib/security/credentials/alts/grpc_alts_credentials_server_options.cc +++ b/src/core/lib/security/credentials/alts/grpc_alts_credentials_server_options.cc @@ -16,10 +16,9 @@ // // -#include - #include #include +#include #include "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h" #include "src/core/tsi/alts/handshaker/transport_security_common_api.h" diff --git a/src/core/lib/security/credentials/call_creds_util.cc b/src/core/lib/security/credentials/call_creds_util.cc index d00b0feb0b2..e946bd64716 100644 --- a/src/core/lib/security/credentials/call_creds_util.cc +++ b/src/core/lib/security/credentials/call_creds_util.cc @@ -14,8 +14,6 @@ // limitations under the License. // -#include - #include "src/core/lib/security/credentials/call_creds_util.h" #include @@ -24,6 +22,7 @@ #include "absl/strings/string_view.h" #include +#include #include #include "src/core/lib/gprpp/ref_counted_ptr.h" diff --git a/src/core/lib/security/credentials/call_creds_util.h b/src/core/lib/security/credentials/call_creds_util.h index ee419b779b2..87dcc80fd76 100644 --- a/src/core/lib/security/credentials/call_creds_util.h +++ b/src/core/lib/security/credentials/call_creds_util.h @@ -17,11 +17,10 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CALL_CREDS_UTIL_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CALL_CREDS_UTIL_H -#include - #include #include +#include #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/transport/transport.h" diff --git a/src/core/lib/security/credentials/channel_creds_registry.h b/src/core/lib/security/credentials/channel_creds_registry.h index 2263758dfbe..3c3ade7e5be 100644 --- a/src/core/lib/security/credentials/channel_creds_registry.h +++ b/src/core/lib/security/credentials/channel_creds_registry.h @@ -17,8 +17,6 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CHANNEL_CREDS_REGISTRY_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CHANNEL_CREDS_REGISTRY_H -#include - #include #include #include @@ -26,6 +24,8 @@ #include "absl/strings/string_view.h" +#include + #include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/validation_errors.h" diff --git a/src/core/lib/security/credentials/channel_creds_registry_init.cc b/src/core/lib/security/credentials/channel_creds_registry_init.cc index bc7e8f11142..557967a54c7 100644 --- a/src/core/lib/security/credentials/channel_creds_registry_init.cc +++ b/src/core/lib/security/credentials/channel_creds_registry_init.cc @@ -16,8 +16,6 @@ // // -#include - #include #include #include @@ -28,6 +26,7 @@ #include #include #include +#include #include #include "src/core/lib/config/core_configuration.h" diff --git a/src/core/lib/security/credentials/composite/composite_credentials.cc b/src/core/lib/security/credentials/composite/composite_credentials.cc index 0ff934fcd01..a9273162eb6 100644 --- a/src/core/lib/security/credentials/composite/composite_credentials.cc +++ b/src/core/lib/security/credentials/composite/composite_credentials.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/security/credentials/composite/composite_credentials.h" #include @@ -28,6 +26,7 @@ #include "absl/strings/str_join.h" #include +#include #include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" diff --git a/src/core/lib/security/credentials/composite/composite_credentials.h b/src/core/lib/security/credentials/composite/composite_credentials.h index 3e28060fa25..9c1841b311c 100644 --- a/src/core/lib/security/credentials/composite/composite_credentials.h +++ b/src/core/lib/security/credentials/composite/composite_credentials.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_COMPOSITE_COMPOSITE_CREDENTIALS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_COMPOSITE_COMPOSITE_CREDENTIALS_H -#include - #include #include #include @@ -31,6 +29,7 @@ #include #include #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/useful.h" diff --git a/src/core/lib/security/credentials/credentials.cc b/src/core/lib/security/credentials/credentials.cc index 07fbbbeb7f7..e3c4f097aa1 100644 --- a/src/core/lib/security/credentials/credentials.cc +++ b/src/core/lib/security/credentials/credentials.cc @@ -16,14 +16,13 @@ // // -#include - #include "src/core/lib/security/credentials/credentials.h" #include #include #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" diff --git a/src/core/lib/security/credentials/credentials.h b/src/core/lib/security/credentials/credentials.h index f6d2b56708a..59922c916b8 100644 --- a/src/core/lib/security/credentials/credentials.h +++ b/src/core/lib/security/credentials/credentials.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CREDENTIALS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CREDENTIALS_H -#include - #include #include #include @@ -33,6 +31,7 @@ #include #include #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/crash.h" diff --git a/src/core/lib/security/credentials/external/aws_external_account_credentials.cc b/src/core/lib/security/credentials/external/aws_external_account_credentials.cc index cd7d117b28e..74609f44742 100644 --- a/src/core/lib/security/credentials/external/aws_external_account_credentials.cc +++ b/src/core/lib/security/credentials/external/aws_external_account_credentials.cc @@ -13,8 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - #include "src/core/lib/security/credentials/external/aws_external_account_credentials.h" #include @@ -35,6 +33,7 @@ #include #include #include +#include #include #include "src/core/lib/gprpp/env.h" 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 a3a41236615..50e7d86b58b 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 @@ -17,8 +17,6 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_AWS_EXTERNAL_ACCOUNT_CREDENTIALS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_AWS_EXTERNAL_ACCOUNT_CREDENTIALS_H -#include - #include #include #include @@ -26,6 +24,8 @@ #include "absl/strings/string_view.h" +#include + #include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/http/httpcli.h" 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 6c22f1ad567..87ca4b37918 100644 --- a/src/core/lib/security/credentials/external/aws_request_signer.cc +++ b/src/core/lib/security/credentials/external/aws_request_signer.cc @@ -13,8 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - #include "src/core/lib/security/credentials/external/aws_request_signer.h" #include @@ -36,6 +34,8 @@ #include "absl/time/clock.h" #include "absl/time/time.h" +#include + namespace grpc_core { namespace { diff --git a/src/core/lib/security/credentials/external/aws_request_signer.h b/src/core/lib/security/credentials/external/aws_request_signer.h index 6243122d489..239abe090e6 100644 --- a/src/core/lib/security/credentials/external/aws_request_signer.h +++ b/src/core/lib/security/credentials/external/aws_request_signer.h @@ -17,11 +17,11 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_AWS_REQUEST_SIGNER_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_AWS_REQUEST_SIGNER_H -#include - #include #include +#include + #include "src/core/lib/iomgr/error.h" #include "src/core/lib/uri/uri_parser.h" 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 3ffd2acb0ef..9b027ae49b9 100644 --- a/src/core/lib/security/credentials/external/external_account_credentials.cc +++ b/src/core/lib/security/credentials/external/external_account_credentials.cc @@ -13,8 +13,6 @@ // limitations under the License. // -#include - #include "src/core/lib/security/credentials/external/external_account_credentials.h" #include @@ -42,6 +40,7 @@ #include #include #include +#include #include #include "src/core/lib/gprpp/status_helper.h" diff --git a/src/core/lib/security/credentials/external/external_account_credentials.h b/src/core/lib/security/credentials/external/external_account_credentials.h index 13749db8567..95a622928d6 100644 --- a/src/core/lib/security/credentials/external/external_account_credentials.h +++ b/src/core/lib/security/credentials/external/external_account_credentials.h @@ -17,8 +17,6 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_EXTERNAL_ACCOUNT_CREDENTIALS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_EXTERNAL_ACCOUNT_CREDENTIALS_H -#include - #include #include @@ -27,6 +25,8 @@ #include "absl/strings/string_view.h" +#include + #include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/time.h" diff --git a/src/core/lib/security/credentials/external/file_external_account_credentials.cc b/src/core/lib/security/credentials/external/file_external_account_credentials.cc index 6ae3c5a7198..472a1cabb39 100644 --- a/src/core/lib/security/credentials/external/file_external_account_credentials.cc +++ b/src/core/lib/security/credentials/external/file_external_account_credentials.cc @@ -13,8 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - #include "src/core/lib/security/credentials/external/file_external_account_credentials.h" #include @@ -26,6 +24,7 @@ #include #include +#include #include "src/core/lib/gprpp/load_file.h" #include "src/core/lib/json/json.h" diff --git a/src/core/lib/security/credentials/external/file_external_account_credentials.h b/src/core/lib/security/credentials/external/file_external_account_credentials.h index c8cf12177bd..8436dea8e7d 100644 --- a/src/core/lib/security/credentials/external/file_external_account_credentials.h +++ b/src/core/lib/security/credentials/external/file_external_account_credentials.h @@ -17,14 +17,14 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_FILE_EXTERNAL_ACCOUNT_CREDENTIALS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_FILE_EXTERNAL_ACCOUNT_CREDENTIALS_H -#include - #include #include #include #include "absl/strings/string_view.h" +#include + #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/credentials/external/external_account_credentials.h" diff --git a/src/core/lib/security/credentials/external/url_external_account_credentials.cc b/src/core/lib/security/credentials/external/url_external_account_credentials.cc index 4b977c045ee..a010be13846 100644 --- a/src/core/lib/security/credentials/external/url_external_account_credentials.cc +++ b/src/core/lib/security/credentials/external/url_external_account_credentials.cc @@ -13,8 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include - #include "src/core/lib/security/credentials/external/url_external_account_credentials.h" #include @@ -34,6 +32,7 @@ #include #include #include +#include #include #include "src/core/lib/http/httpcli_ssl_credentials.h" diff --git a/src/core/lib/security/credentials/external/url_external_account_credentials.h b/src/core/lib/security/credentials/external/url_external_account_credentials.h index 9331412d321..6a5f00cd23b 100644 --- a/src/core/lib/security/credentials/external/url_external_account_credentials.h +++ b/src/core/lib/security/credentials/external/url_external_account_credentials.h @@ -17,8 +17,6 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_URL_EXTERNAL_ACCOUNT_CREDENTIALS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_URL_EXTERNAL_ACCOUNT_CREDENTIALS_H -#include - #include #include #include @@ -26,6 +24,8 @@ #include "absl/strings/string_view.h" +#include + #include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/http/httpcli.h" diff --git a/src/core/lib/security/credentials/fake/fake_credentials.cc b/src/core/lib/security/credentials/fake/fake_credentials.cc index 018057375d3..2eb12fa1039 100644 --- a/src/core/lib/security/credentials/fake/fake_credentials.cc +++ b/src/core/lib/security/credentials/fake/fake_credentials.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/security/credentials/fake/fake_credentials.h" #include @@ -27,6 +25,8 @@ #include "absl/strings/string_view.h" +#include + #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/promise/promise.h" diff --git a/src/core/lib/security/credentials/fake/fake_credentials.h b/src/core/lib/security/credentials/fake/fake_credentials.h index c274a1edc5f..8f6d4dfa11b 100644 --- a/src/core/lib/security/credentials/fake/fake_credentials.h +++ b/src/core/lib/security/credentials/fake/fake_credentials.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_FAKE_FAKE_CREDENTIALS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_FAKE_FAKE_CREDENTIALS_H -#include - #include #include "absl/status/statusor.h" @@ -28,6 +26,7 @@ #include #include #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/useful.h" 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 890fda1cb28..bfcc7c37e08 100644 --- a/src/core/lib/security/credentials/google_default/credentials_generic.cc +++ b/src/core/lib/security/credentials/google_default/credentials_generic.cc @@ -16,14 +16,13 @@ // // -#include - #include #include "absl/strings/str_cat.h" #include "absl/types/optional.h" #include +#include #include "src/core/lib/gprpp/env.h" #include "src/core/lib/security/credentials/credentials.h" 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 361af9a41f9..a8cc51d1f72 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 @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/security/credentials/google_default/google_default_credentials.h" #include @@ -36,6 +34,7 @@ #include #include #include +#include #include #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/lib/security/credentials/google_default/google_default_credentials.h b/src/core/lib/security/credentials/google_default/google_default_credentials.h index 7ade38bf07a..f17105bbdfa 100644 --- a/src/core/lib/security/credentials/google_default/google_default_credentials.h +++ b/src/core/lib/security/credentials/google_default/google_default_credentials.h @@ -18,12 +18,11 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_GOOGLE_DEFAULT_GOOGLE_DEFAULT_CREDENTIALS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_GOOGLE_DEFAULT_GOOGLE_DEFAULT_CREDENTIALS_H -#include - #include #include #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/useful.h" diff --git a/src/core/lib/security/credentials/iam/iam_credentials.cc b/src/core/lib/security/credentials/iam/iam_credentials.cc index 8b56c03f03f..a29624ac0ad 100644 --- a/src/core/lib/security/credentials/iam/iam_credentials.cc +++ b/src/core/lib/security/credentials/iam/iam_credentials.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/security/credentials/iam/iam_credentials.h" #include @@ -29,6 +27,7 @@ #include "absl/strings/string_view.h" #include +#include #include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" diff --git a/src/core/lib/security/credentials/iam/iam_credentials.h b/src/core/lib/security/credentials/iam/iam_credentials.h index bdad0c8e761..ae2960e8466 100644 --- a/src/core/lib/security/credentials/iam/iam_credentials.h +++ b/src/core/lib/security/credentials/iam/iam_credentials.h @@ -19,14 +19,13 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_IAM_IAM_CREDENTIALS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_IAM_IAM_CREDENTIALS_H -#include - #include #include "absl/status/statusor.h" #include "absl/types/optional.h" #include +#include #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/unique_type_name.h" diff --git a/src/core/lib/security/credentials/insecure/insecure_credentials.cc b/src/core/lib/security/credentials/insecure/insecure_credentials.cc index cce66f6e290..a4900ff3281 100644 --- a/src/core/lib/security/credentials/insecure/insecure_credentials.cc +++ b/src/core/lib/security/credentials/insecure/insecure_credentials.cc @@ -16,12 +16,12 @@ // // -#include - #include "src/core/lib/security/credentials/insecure/insecure_credentials.h" #include +#include + #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/security/security_connector/insecure/insecure_security_connector.h" diff --git a/src/core/lib/security/credentials/insecure/insecure_credentials.h b/src/core/lib/security/credentials/insecure/insecure_credentials.h index acf457f745c..1ccee0bc480 100644 --- a/src/core/lib/security/credentials/insecure/insecure_credentials.h +++ b/src/core/lib/security/credentials/insecure/insecure_credentials.h @@ -19,10 +19,9 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_INSECURE_INSECURE_CREDENTIALS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_INSECURE_INSECURE_CREDENTIALS_H -#include - #include #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" diff --git a/src/core/lib/security/credentials/jwt/json_token.cc b/src/core/lib/security/credentials/jwt/json_token.cc index fc15cde77d4..82124dcd59c 100644 --- a/src/core/lib/security/credentials/jwt/json_token.cc +++ b/src/core/lib/security/credentials/jwt/json_token.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/security/credentials/jwt/json_token.h" #include @@ -39,6 +37,7 @@ #include #include #include +#include #include #include diff --git a/src/core/lib/security/credentials/jwt/json_token.h b/src/core/lib/security/credentials/jwt/json_token.h index decbc25e49c..3b2c7d5c348 100644 --- a/src/core/lib/security/credentials/jwt/json_token.h +++ b/src/core/lib/security/credentials/jwt/json_token.h @@ -19,10 +19,9 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JSON_TOKEN_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JSON_TOKEN_H -#include - #include +#include #include #include "src/core/lib/json/json.h" diff --git a/src/core/lib/security/credentials/jwt/jwt_credentials.cc b/src/core/lib/security/credentials/jwt/jwt_credentials.cc index c92c0f028b1..a5691cd2666 100644 --- a/src/core/lib/security/credentials/jwt/jwt_credentials.cc +++ b/src/core/lib/security/credentials/jwt/jwt_credentials.cc @@ -15,8 +15,6 @@ // // -#include - #include "src/core/lib/security/credentials/jwt/jwt_credentials.h" #include @@ -32,6 +30,7 @@ #include #include #include +#include #include #include diff --git a/src/core/lib/security/credentials/jwt/jwt_credentials.h b/src/core/lib/security/credentials/jwt/jwt_credentials.h index 05d4c2d38b0..8ca6296f8ea 100644 --- a/src/core/lib/security/credentials/jwt/jwt_credentials.h +++ b/src/core/lib/security/credentials/jwt/jwt_credentials.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JWT_CREDENTIALS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JWT_CREDENTIALS_H -#include - #include #include @@ -32,6 +30,7 @@ #include "absl/types/optional.h" #include +#include #include #include diff --git a/src/core/lib/security/credentials/jwt/jwt_verifier.cc b/src/core/lib/security/credentials/jwt/jwt_verifier.cc index b5a7aa7ea63..064f75d4278 100644 --- a/src/core/lib/security/credentials/jwt/jwt_verifier.cc +++ b/src/core/lib/security/credentials/jwt/jwt_verifier.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/security/credentials/jwt/jwt_verifier.h" #include @@ -37,6 +35,8 @@ #include #include #include + +#include #if OPENSSL_VERSION_NUMBER >= 0x30000000L #include #endif diff --git a/src/core/lib/security/credentials/jwt/jwt_verifier.h b/src/core/lib/security/credentials/jwt/jwt_verifier.h index 399cd0bd4b8..814c40204a3 100644 --- a/src/core/lib/security/credentials/jwt/jwt_verifier.h +++ b/src/core/lib/security/credentials/jwt/jwt_verifier.h @@ -19,10 +19,9 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JWT_VERIFIER_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JWT_VERIFIER_H -#include - #include +#include #include #include "src/core/lib/gprpp/time.h" diff --git a/src/core/lib/security/credentials/local/local_credentials.cc b/src/core/lib/security/credentials/local/local_credentials.cc index 5c9e598223a..94f975d6d7d 100644 --- a/src/core/lib/security/credentials/local/local_credentials.cc +++ b/src/core/lib/security/credentials/local/local_credentials.cc @@ -16,13 +16,12 @@ // // -#include - #include "src/core/lib/security/credentials/local/local_credentials.h" #include #include +#include #include "src/core/lib/security/security_connector/local/local_security_connector.h" diff --git a/src/core/lib/security/credentials/local/local_credentials.h b/src/core/lib/security/credentials/local/local_credentials.h index b6663c8bc0b..7a52d9a0d1e 100644 --- a/src/core/lib/security/credentials/local/local_credentials.h +++ b/src/core/lib/security/credentials/local/local_credentials.h @@ -19,11 +19,10 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_LOCAL_LOCAL_CREDENTIALS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_LOCAL_LOCAL_CREDENTIALS_H -#include - #include #include #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/useful.h" diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc index 9f2ed31aeb6..bbd666e7dd8 100644 --- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc +++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/security/credentials/oauth2/oauth2_credentials.h" #include @@ -41,6 +39,7 @@ #include #include #include +#include #include #include diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.h b/src/core/lib/security/credentials/oauth2/oauth2_credentials.h index 31c0c227fc9..137818f095a 100644 --- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.h +++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_OAUTH2_OAUTH2_CREDENTIALS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_OAUTH2_OAUTH2_CREDENTIALS_H -#include - #include #include #include @@ -29,6 +27,7 @@ #include "absl/types/optional.h" #include +#include #include #include diff --git a/src/core/lib/security/credentials/plugin/plugin_credentials.cc b/src/core/lib/security/credentials/plugin/plugin_credentials.cc index 821f9a81497..36a9ca80621 100644 --- a/src/core/lib/security/credentials/plugin/plugin_credentials.cc +++ b/src/core/lib/security/credentials/plugin/plugin_credentials.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/security/credentials/plugin/plugin_credentials.h" #include @@ -29,6 +27,7 @@ #include #include +#include #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/lib/security/credentials/plugin/plugin_credentials.h b/src/core/lib/security/credentials/plugin/plugin_credentials.h index 848d970bc6c..a3c22fbe278 100644 --- a/src/core/lib/security/credentials/plugin/plugin_credentials.h +++ b/src/core/lib/security/credentials/plugin/plugin_credentials.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_PLUGIN_PLUGIN_CREDENTIALS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_PLUGIN_PLUGIN_CREDENTIALS_H -#include - #include #include @@ -34,6 +32,7 @@ #include #include #include +#include #include "src/core/lib/debug/trace.h" #include "src/core/lib/gpr/useful.h" diff --git a/src/core/lib/security/credentials/ssl/ssl_credentials.cc b/src/core/lib/security/credentials/ssl/ssl_credentials.cc index 99be297f8c4..ef11a680737 100644 --- a/src/core/lib/security/credentials/ssl/ssl_credentials.cc +++ b/src/core/lib/security/credentials/ssl/ssl_credentials.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/security/credentials/ssl/ssl_credentials.h" #include @@ -30,6 +28,7 @@ #include #include #include +#include #include #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/lib/security/credentials/ssl/ssl_credentials.h b/src/core/lib/security/credentials/ssl/ssl_credentials.h index 01f6ece6581..0dd131ff381 100644 --- a/src/core/lib/security/credentials/ssl/ssl_credentials.h +++ b/src/core/lib/security/credentials/ssl/ssl_credentials.h @@ -18,14 +18,13 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_SSL_SSL_CREDENTIALS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_SSL_SSL_CREDENTIALS_H -#include - #include #include #include #include #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/useful.h" 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 a956beb32e7..7744d62de1a 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 @@ -14,14 +14,13 @@ // limitations under the License. // -#include - #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h" #include "absl/status/status.h" #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 07bb95de9ad..5a0de70f093 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 @@ -17,8 +17,6 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_GRPC_TLS_CERTIFICATE_DISTRIBUTOR_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_GRPC_TLS_CERTIFICATE_DISTRIBUTOR_H -#include - #include #include #include @@ -30,6 +28,8 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" +#include + #include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/error.h" diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_match.cc b/src/core/lib/security/credentials/tls/grpc_tls_certificate_match.cc index ef453fe4a3e..a7ebb6cbdb2 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_match.cc +++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_match.cc @@ -14,8 +14,6 @@ // limitations under the License. // -#include - #include #include #include @@ -26,6 +24,8 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" +#include + #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" namespace grpc_core { 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 bbd0fb20f9c..5e81d3533bf 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 @@ -14,8 +14,6 @@ // limitations under the License. // -#include - #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" #include @@ -29,6 +27,7 @@ #include #include +#include #include #include "src/core/lib/debug/trace.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 d9f2527a33c..f0775320191 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 @@ -17,8 +17,6 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_GRPC_TLS_CERTIFICATE_PROVIDER_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_GRPC_TLS_CERTIFICATE_PROVIDER_H -#include - #include #include @@ -31,6 +29,7 @@ #include #include +#include #include #include "src/core/lib/gpr/useful.h" diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.cc b/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.cc index 79c6cc2b028..48e31b7dac0 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.cc +++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.cc @@ -14,8 +14,6 @@ // limitations under the License. // -#include - #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h" #include @@ -27,6 +25,7 @@ #include #include +#include #include #include "src/core/lib/debug/trace.h" diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h b/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h index e100f852cff..9734f191fc9 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h +++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h @@ -17,8 +17,6 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_GRPC_TLS_CERTIFICATE_VERIFIER_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_GRPC_TLS_CERTIFICATE_VERIFIER_H -#include - #include #include @@ -28,6 +26,7 @@ #include #include #include +#include #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/ref_counted.h" diff --git a/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc b/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc index 0dcc959bf3c..3d159c5a306 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc +++ b/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc @@ -16,14 +16,13 @@ // // -#include - #include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h" #include #include #include +#include #include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/debug_location.h" diff --git a/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.cc b/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.cc index f8adf5f12cc..2da191aeca5 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.cc +++ b/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.cc @@ -16,12 +16,12 @@ // // -#include - #include "src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h" #include +#include + // IWYU pragma: no_include #include #include diff --git a/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h b/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h index baa594478a2..77ffc439384 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h +++ b/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_GRPC_TLS_CRL_PROVIDER_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_GRPC_TLS_CRL_PROVIDER_H -#include - #include #include #include @@ -39,6 +37,7 @@ #include #include +#include #include "src/core/lib/gprpp/directory_reader.h" #include "src/core/lib/gprpp/sync.h" diff --git a/src/core/lib/security/credentials/tls/tls_credentials.cc b/src/core/lib/security/credentials/tls/tls_credentials.cc index eac64307f8d..573d56da9f5 100644 --- a/src/core/lib/security/credentials/tls/tls_credentials.cc +++ b/src/core/lib/security/credentials/tls/tls_credentials.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/security/credentials/tls/tls_credentials.h" #include @@ -30,6 +28,7 @@ #include #include #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/useful.h" diff --git a/src/core/lib/security/credentials/tls/tls_credentials.h b/src/core/lib/security/credentials/tls/tls_credentials.h index 4591fc86d17..c79b4b0c554 100644 --- a/src/core/lib/security/credentials/tls/tls_credentials.h +++ b/src/core/lib/security/credentials/tls/tls_credentials.h @@ -19,10 +19,9 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_TLS_CREDENTIALS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_TLS_CREDENTIALS_H -#include - #include #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" diff --git a/src/core/lib/security/credentials/tls/tls_utils.cc b/src/core/lib/security/credentials/tls/tls_utils.cc index c973e28b859..df0ffa8308d 100644 --- a/src/core/lib/security/credentials/tls/tls_utils.cc +++ b/src/core/lib/security/credentials/tls/tls_utils.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/security/credentials/tls/tls_utils.h" #include @@ -29,6 +27,7 @@ #include "absl/strings/str_cat.h" #include +#include namespace grpc_core { diff --git a/src/core/lib/security/credentials/tls/tls_utils.h b/src/core/lib/security/credentials/tls/tls_utils.h index 4a99ff9dae9..c26f4e38bbd 100644 --- a/src/core/lib/security/credentials/tls/tls_utils.h +++ b/src/core/lib/security/credentials/tls/tls_utils.h @@ -19,14 +19,13 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_TLS_UTILS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_TLS_UTILS_H -#include - #include #include #include "absl/strings/string_view.h" #include +#include namespace grpc_core { diff --git a/src/core/lib/security/credentials/xds/xds_credentials.cc b/src/core/lib/security/credentials/xds/xds_credentials.cc index e7e4d11088b..cfe1a1136fd 100644 --- a/src/core/lib/security/credentials/xds/xds_credentials.cc +++ b/src/core/lib/security/credentials/xds/xds_credentials.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/security/credentials/xds/xds_credentials.h" #include "absl/types/optional.h" @@ -25,6 +23,7 @@ #include #include #include +#include #include "src/core/ext/xds/xds_certificate_provider.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/lib/security/credentials/xds/xds_credentials.h b/src/core/lib/security/credentials/xds/xds_credentials.h index 7b8ce1531a4..b64def62b6f 100644 --- a/src/core/lib/security/credentials/xds/xds_credentials.h +++ b/src/core/lib/security/credentials/xds/xds_credentials.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_XDS_XDS_CREDENTIALS_H #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_XDS_XDS_CREDENTIALS_H -#include - #include #include @@ -32,6 +30,7 @@ #include #include +#include #include "src/core/ext/xds/xds_certificate_provider.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/lib/security/security_connector/alts/alts_security_connector.cc b/src/core/lib/security/security_connector/alts/alts_security_connector.cc index 5e64e8d49d3..afc6033bc6d 100644 --- a/src/core/lib/security/security_connector/alts/alts_security_connector.cc +++ b/src/core/lib/security/security_connector/alts/alts_security_connector.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/security/security_connector/alts/alts_security_connector.h" #include @@ -35,6 +33,7 @@ #include #include #include +#include #include #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/lib/security/security_connector/alts/alts_security_connector.h b/src/core/lib/security/security_connector/alts/alts_security_connector.h index 0b90e5dd8b8..25cef39f92f 100644 --- a/src/core/lib/security/security_connector/alts/alts_security_connector.h +++ b/src/core/lib/security/security_connector/alts/alts_security_connector.h @@ -18,10 +18,9 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_ALTS_ALTS_SECURITY_CONNECTOR_H #define GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_ALTS_ALTS_SECURITY_CONNECTOR_H -#include - #include #include +#include #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/security_connector/security_connector.h" diff --git a/src/core/lib/security/security_connector/fake/fake_security_connector.cc b/src/core/lib/security/security_connector/fake/fake_security_connector.cc index 87a27ddfe2c..4ab4a60b02b 100644 --- a/src/core/lib/security/security_connector/fake/fake_security_connector.cc +++ b/src/core/lib/security/security_connector/fake/fake_security_connector.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/security/security_connector/fake/fake_security_connector.h" #include @@ -36,6 +34,7 @@ #include #include #include +#include #include #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/lib/security/security_connector/fake/fake_security_connector.h b/src/core/lib/security/security_connector/fake/fake_security_connector.h index 16d35258056..a8823493750 100644 --- a/src/core/lib/security/security_connector/fake/fake_security_connector.h +++ b/src/core/lib/security/security_connector/fake/fake_security_connector.h @@ -18,10 +18,9 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_FAKE_FAKE_SECURITY_CONNECTOR_H #define GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_FAKE_FAKE_SECURITY_CONNECTOR_H -#include - #include #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" diff --git a/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc b/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc index e9ee4b127a2..123daedfad8 100644 --- a/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc +++ b/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc @@ -16,14 +16,13 @@ // // -#include - #include "src/core/lib/security/security_connector/insecure/insecure_security_connector.h" #include #include #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/debug_location.h" diff --git a/src/core/lib/security/security_connector/insecure/insecure_security_connector.h b/src/core/lib/security/security_connector/insecure/insecure_security_connector.h index 7f583887883..8f78f610eab 100644 --- a/src/core/lib/security/security_connector/insecure/insecure_security_connector.h +++ b/src/core/lib/security/security_connector/insecure/insecure_security_connector.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_INSECURE_INSECURE_SECURITY_CONNECTOR_H #define GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_INSECURE_INSECURE_SECURITY_CONNECTOR_H -#include - #include #include "absl/status/status.h" @@ -28,6 +26,7 @@ #include #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" diff --git a/src/core/lib/security/security_connector/load_system_roots.h b/src/core/lib/security/security_connector/load_system_roots.h index 36303d979d1..79426ac833a 100644 --- a/src/core/lib/security/security_connector/load_system_roots.h +++ b/src/core/lib/security/security_connector/load_system_roots.h @@ -19,9 +19,8 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_LOAD_SYSTEM_ROOTS_H #define GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_LOAD_SYSTEM_ROOTS_H -#include - #include +#include namespace grpc_core { diff --git a/src/core/lib/security/security_connector/load_system_roots_supported.cc b/src/core/lib/security/security_connector/load_system_roots_supported.cc index a0a64392812..aaf72713a5f 100644 --- a/src/core/lib/security/security_connector/load_system_roots_supported.cc +++ b/src/core/lib/security/security_connector/load_system_roots_supported.cc @@ -16,12 +16,12 @@ // // -#include - #include #include #include +#include + #if defined(GPR_LINUX) || defined(GPR_ANDROID) || defined(GPR_FREEBSD) || \ defined(GPR_APPLE) diff --git a/src/core/lib/security/security_connector/load_system_roots_supported.h b/src/core/lib/security/security_connector/load_system_roots_supported.h index c0cc8ceeafa..694784de20d 100644 --- a/src/core/lib/security/security_connector/load_system_roots_supported.h +++ b/src/core/lib/security/security_connector/load_system_roots_supported.h @@ -19,9 +19,8 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_LOAD_SYSTEM_ROOTS_SUPPORTED_H #define GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_LOAD_SYSTEM_ROOTS_SUPPORTED_H -#include - #include +#include #if defined(GPR_LINUX) || defined(GPR_FREEBSD) || defined(GPR_APPLE) diff --git a/src/core/lib/security/security_connector/local/local_security_connector.cc b/src/core/lib/security/security_connector/local/local_security_connector.cc index 7bc88d74de9..0e2ee655bca 100644 --- a/src/core/lib/security/security_connector/local/local_security_connector.cc +++ b/src/core/lib/security/security_connector/local/local_security_connector.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/security/security_connector/local/local_security_connector.h" #include @@ -35,6 +33,7 @@ #include #include #include +#include #include #include "src/core/client_channel/client_channel_filter.h" diff --git a/src/core/lib/security/security_connector/local/local_security_connector.h b/src/core/lib/security/security_connector/local/local_security_connector.h index 4f1feb89999..ad39afbcf32 100644 --- a/src/core/lib/security/security_connector/local/local_security_connector.h +++ b/src/core/lib/security/security_connector/local/local_security_connector.h @@ -18,10 +18,9 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_LOCAL_LOCAL_SECURITY_CONNECTOR_H #define GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_LOCAL_LOCAL_SECURITY_CONNECTOR_H -#include - #include #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" diff --git a/src/core/lib/security/security_connector/security_connector.cc b/src/core/lib/security/security_connector/security_connector.cc index 175aa5df8bf..3f3645edcee 100644 --- a/src/core/lib/security/security_connector/security_connector.cc +++ b/src/core/lib/security/security_connector/security_connector.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/security/security_connector/security_connector.h" #include @@ -25,6 +23,7 @@ #include #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/useful.h" diff --git a/src/core/lib/security/security_connector/security_connector.h b/src/core/lib/security/security_connector/security_connector.h index ca5047d13bd..1965984866b 100644 --- a/src/core/lib/security/security_connector/security_connector.h +++ b/src/core/lib/security/security_connector/security_connector.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_SECURITY_CONNECTOR_H #define GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_SECURITY_CONNECTOR_H -#include - #include #include "absl/status/status.h" @@ -28,6 +26,7 @@ #include #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" diff --git a/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc b/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc index 5356cd62901..90662be6e14 100644 --- a/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc +++ b/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/security/security_connector/ssl/ssl_security_connector.h" #include @@ -33,6 +31,7 @@ #include #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/debug_location.h" 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 c5781d8d958..f743b6ff3b2 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 @@ -18,13 +18,12 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_SSL_SSL_SECURITY_CONNECTOR_H #define GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_SSL_SSL_SECURITY_CONNECTOR_H -#include - #include #include #include #include +#include #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/security_connector/security_connector.h" diff --git a/src/core/lib/security/security_connector/ssl_utils.cc b/src/core/lib/security/security_connector/ssl_utils.cc index 24c57bc1df7..de302b6476c 100644 --- a/src/core/lib/security/security_connector/ssl_utils.cc +++ b/src/core/lib/security/security_connector/ssl_utils.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/security/security_connector/ssl_utils.h" #include @@ -36,6 +34,7 @@ #include #include #include +#include #include #include diff --git a/src/core/lib/security/security_connector/ssl_utils.h b/src/core/lib/security/security_connector/ssl_utils.h index 4053f3abed3..dd37f0e9b98 100644 --- a/src/core/lib/security/security_connector/ssl_utils.h +++ b/src/core/lib/security/security_connector/ssl_utils.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_SSL_UTILS_H #define GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_SSL_UTILS_H -#include - #include #include @@ -35,6 +33,7 @@ #include #include #include +#include #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/error.h" diff --git a/src/core/lib/security/security_connector/tls/tls_security_connector.cc b/src/core/lib/security/security_connector/tls/tls_security_connector.cc index 69fb13c6d46..303a3b2701c 100644 --- a/src/core/lib/security/security_connector/tls/tls_security_connector.cc +++ b/src/core/lib/security/security_connector/tls/tls_security_connector.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/security/security_connector/tls/tls_security_connector.h" #include @@ -34,6 +32,7 @@ #include #include #include +#include #include #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/lib/security/security_connector/tls/tls_security_connector.h b/src/core/lib/security/security_connector/tls/tls_security_connector.h index cbba26894b8..cf6593b4c68 100644 --- a/src/core/lib/security/security_connector/tls/tls_security_connector.h +++ b/src/core/lib/security/security_connector/tls/tls_security_connector.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_TLS_TLS_SECURITY_CONNECTOR_H #define GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_TLS_TLS_SECURITY_CONNECTOR_H -#include - #include #include @@ -31,6 +29,7 @@ #include #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" diff --git a/src/core/lib/security/transport/auth_filters.h b/src/core/lib/security/transport/auth_filters.h index 7b7d1ab9d25..e4e80909526 100644 --- a/src/core/lib/security/transport/auth_filters.h +++ b/src/core/lib/security/transport/auth_filters.h @@ -19,12 +19,11 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_TRANSPORT_AUTH_FILTERS_H #define GRPC_SRC_CORE_LIB_SECURITY_TRANSPORT_AUTH_FILTERS_H -#include - #include "absl/status/statusor.h" #include #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" diff --git a/src/core/lib/security/transport/client_auth_filter.cc b/src/core/lib/security/transport/client_auth_filter.cc index 4efe90c08d2..1840522e6c7 100644 --- a/src/core/lib/security/transport/client_auth_filter.cc +++ b/src/core/lib/security/transport/client_auth_filter.cc @@ -16,8 +16,6 @@ // // -#include - #include #include @@ -31,6 +29,7 @@ #include #include #include +#include #include #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/lib/security/transport/secure_endpoint.cc b/src/core/lib/security/transport/secure_endpoint.cc index c67f0599fc8..b8323983a0e 100644 --- a/src/core/lib/security/transport/secure_endpoint.cc +++ b/src/core/lib/security/transport/secure_endpoint.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/security/transport/secure_endpoint.h" #include @@ -38,6 +36,7 @@ #include #include #include +#include #include #include "src/core/lib/debug/trace.h" diff --git a/src/core/lib/security/transport/secure_endpoint.h b/src/core/lib/security/transport/secure_endpoint.h index 321b2df63b6..bc987787b5b 100644 --- a/src/core/lib/security/transport/secure_endpoint.h +++ b/src/core/lib/security/transport/secure_endpoint.h @@ -19,12 +19,11 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_TRANSPORT_SECURE_ENDPOINT_H #define GRPC_SRC_CORE_LIB_SECURITY_TRANSPORT_SECURE_ENDPOINT_H -#include - #include #include #include +#include #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/endpoint.h" diff --git a/src/core/lib/security/transport/security_handshaker.cc b/src/core/lib/security/transport/security_handshaker.cc index 8014ce03063..0dbbf77d191 100644 --- a/src/core/lib/security/transport/security_handshaker.cc +++ b/src/core/lib/security/transport/security_handshaker.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/security/transport/security_handshaker.h" #include @@ -42,6 +40,7 @@ #include #include #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channelz.h" diff --git a/src/core/lib/security/transport/security_handshaker.h b/src/core/lib/security/transport/security_handshaker.h index 725584f37b3..02b826c7429 100644 --- a/src/core/lib/security/transport/security_handshaker.h +++ b/src/core/lib/security/transport/security_handshaker.h @@ -19,11 +19,10 @@ #ifndef GRPC_SRC_CORE_LIB_SECURITY_TRANSPORT_SECURITY_HANDSHAKER_H #define GRPC_SRC_CORE_LIB_SECURITY_TRANSPORT_SECURITY_HANDSHAKER_H -#include - #include "absl/status/statusor.h" #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" diff --git a/src/core/lib/security/transport/server_auth_filter.cc b/src/core/lib/security/transport/server_auth_filter.cc index 1ac686a8159..0354398684a 100644 --- a/src/core/lib/security/transport/server_auth_filter.cc +++ b/src/core/lib/security/transport/server_auth_filter.cc @@ -16,8 +16,6 @@ // // -#include - #include #include #include @@ -33,6 +31,7 @@ #include #include #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" diff --git a/src/core/lib/security/transport/tsi_error.cc b/src/core/lib/security/transport/tsi_error.cc index 647bbba1e7a..fbfd9825b4a 100644 --- a/src/core/lib/security/transport/tsi_error.cc +++ b/src/core/lib/security/transport/tsi_error.cc @@ -16,10 +16,10 @@ // // -#include - #include "src/core/lib/security/transport/tsi_error.h" +#include + #include "src/core/lib/gprpp/status_helper.h" grpc_error_handle grpc_set_tsi_error_result(grpc_error_handle error, diff --git a/src/core/lib/security/util/json_util.cc b/src/core/lib/security/util/json_util.cc index 1eb33a16fc3..c0b5a5b36cc 100644 --- a/src/core/lib/security/util/json_util.cc +++ b/src/core/lib/security/util/json_util.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/security/util/json_util.h" #include @@ -27,6 +25,7 @@ #include "absl/strings/str_cat.h" #include +#include #include #include "src/core/lib/iomgr/error.h" diff --git a/src/core/lib/slice/percent_encoding.cc b/src/core/lib/slice/percent_encoding.cc index 1b7327d5284..bd5d71a0788 100644 --- a/src/core/lib/slice/percent_encoding.cc +++ b/src/core/lib/slice/percent_encoding.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/slice/percent_encoding.h" #include @@ -26,6 +24,7 @@ #include #include +#include #include "src/core/lib/gprpp/bitset.h" diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc index ffce11c2a47..90939fa93e4 100644 --- a/src/core/lib/slice/slice.cc +++ b/src/core/lib/slice/slice.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/slice/slice.h" #include @@ -27,6 +25,7 @@ #include #include #include +#include #include "src/core/lib/gprpp/memory.h" #include "src/core/lib/slice/slice_internal.h" diff --git a/src/core/lib/slice/slice.h b/src/core/lib/slice/slice.h index 43bbd253ee9..ed9e30c2edb 100644 --- a/src/core/lib/slice/slice.h +++ b/src/core/lib/slice/slice.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_SLICE_SLICE_H #define GRPC_SRC_CORE_LIB_SLICE_SLICE_H -#include - #include #include @@ -29,6 +27,7 @@ #include #include #include +#include #include "src/core/lib/gpr/string.h" #include "src/core/lib/gprpp/debug_location.h" diff --git a/src/core/lib/slice/slice_buffer.cc b/src/core/lib/slice/slice_buffer.cc index 14c9b67ab2a..c8e93b7d00c 100644 --- a/src/core/lib/slice/slice_buffer.cc +++ b/src/core/lib/slice/slice_buffer.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/slice/slice_buffer.h" #include @@ -28,6 +26,7 @@ #include #include #include +#include #include "src/core/lib/slice/slice_internal.h" diff --git a/src/core/lib/slice/slice_buffer.h b/src/core/lib/slice/slice_buffer.h index c6227da674d..cfd6d53a3bc 100644 --- a/src/core/lib/slice/slice_buffer.h +++ b/src/core/lib/slice/slice_buffer.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_SLICE_SLICE_BUFFER_H #define GRPC_SRC_CORE_LIB_SLICE_SLICE_BUFFER_H -#include - #include #include @@ -25,6 +23,7 @@ #include #include +#include #include "src/core/lib/slice/slice.h" diff --git a/src/core/lib/slice/slice_internal.h b/src/core/lib/slice/slice_internal.h index 626d06a3b7e..0ab8cd536f0 100644 --- a/src/core/lib/slice/slice_internal.h +++ b/src/core/lib/slice/slice_internal.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_SLICE_SLICE_INTERNAL_H #define GRPC_SRC_CORE_LIB_SLICE_SLICE_INTERNAL_H -#include - #include #include @@ -31,6 +29,7 @@ #include #include +#include #include "src/core/lib/gprpp/memory.h" diff --git a/src/core/lib/slice/slice_refcount.cc b/src/core/lib/slice/slice_refcount.cc index 0a05f0a333a..3bba7d75bda 100644 --- a/src/core/lib/slice/slice_refcount.cc +++ b/src/core/lib/slice/slice_refcount.cc @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/slice/slice_refcount.h" +#include + grpc_core::DebugOnlyTraceFlag grpc_slice_refcount_trace(false, "slice_refcount"); diff --git a/src/core/lib/slice/slice_refcount.h b/src/core/lib/slice/slice_refcount.h index fb39f0cbe3d..aa1c6d146b3 100644 --- a/src/core/lib/slice/slice_refcount.h +++ b/src/core/lib/slice/slice_refcount.h @@ -15,14 +15,13 @@ #ifndef GRPC_SRC_CORE_LIB_SLICE_SLICE_REFCOUNT_H #define GRPC_SRC_CORE_LIB_SLICE_SLICE_REFCOUNT_H -#include - #include #include #include #include +#include #include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/debug_location.h" diff --git a/src/core/lib/slice/slice_string_helpers.cc b/src/core/lib/slice/slice_string_helpers.cc index 29d688140b8..d56a7de8943 100644 --- a/src/core/lib/slice/slice_string_helpers.cc +++ b/src/core/lib/slice/slice_string_helpers.cc @@ -16,10 +16,10 @@ // // -#include - #include "src/core/lib/slice/slice_string_helpers.h" +#include + #include "src/core/lib/gpr/string.h" char* grpc_dump_slice(const grpc_slice& s, uint32_t flags) { diff --git a/src/core/lib/slice/slice_string_helpers.h b/src/core/lib/slice/slice_string_helpers.h index 2e21ac06f4c..94680e64c20 100644 --- a/src/core/lib/slice/slice_string_helpers.h +++ b/src/core/lib/slice/slice_string_helpers.h @@ -19,11 +19,10 @@ #ifndef GRPC_SRC_CORE_LIB_SLICE_SLICE_STRING_HELPERS_H #define GRPC_SRC_CORE_LIB_SLICE_SLICE_STRING_HELPERS_H -#include - #include #include +#include // Calls gpr_dump on a slice. char* grpc_dump_slice(const grpc_slice& slice, uint32_t flags); diff --git a/src/core/lib/surface/api_trace.cc b/src/core/lib/surface/api_trace.cc index 1e27ec111d3..16fd62b7596 100644 --- a/src/core/lib/surface/api_trace.cc +++ b/src/core/lib/surface/api_trace.cc @@ -16,10 +16,10 @@ // // -#include - #include "src/core/lib/surface/api_trace.h" +#include + #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 176debc802f..1e08e5367c2 100644 --- a/src/core/lib/surface/api_trace.h +++ b/src/core/lib/surface/api_trace.h @@ -19,9 +19,8 @@ #ifndef GRPC_SRC_CORE_LIB_SURFACE_API_TRACE_H #define GRPC_SRC_CORE_LIB_SURFACE_API_TRACE_H -#include - #include +#include #include "src/core/lib/debug/trace.h" diff --git a/src/core/lib/surface/byte_buffer.cc b/src/core/lib/surface/byte_buffer.cc index 4e00c080cea..06e45623332 100644 --- a/src/core/lib/surface/byte_buffer.cc +++ b/src/core/lib/surface/byte_buffer.cc @@ -16,8 +16,6 @@ // // -#include - #include #include @@ -26,6 +24,7 @@ #include #include #include +#include #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice.h" diff --git a/src/core/lib/surface/byte_buffer_reader.cc b/src/core/lib/surface/byte_buffer_reader.cc index 2f362c2c3cf..1e1efe14f86 100644 --- a/src/core/lib/surface/byte_buffer_reader.cc +++ b/src/core/lib/surface/byte_buffer_reader.cc @@ -16,8 +16,6 @@ // // -#include - #include #include @@ -26,6 +24,7 @@ #include #include #include +#include #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice.h" diff --git a/src/core/lib/surface/call.cc b/src/core/lib/surface/call.cc index e79436f6011..a8e026b0ece 100644 --- a/src/core/lib/surface/call.cc +++ b/src/core/lib/surface/call.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/surface/call.h" #include @@ -53,6 +51,7 @@ #include #include #include +#include #include #include "src/core/lib/channel/call_finalization.h" diff --git a/src/core/lib/surface/call.h b/src/core/lib/surface/call.h index 1736c83fd92..32aba4c3c60 100644 --- a/src/core/lib/surface/call.h +++ b/src/core/lib/surface/call.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_SURFACE_CALL_H #define GRPC_SRC_CORE_LIB_SURFACE_CALL_H -#include - #include #include @@ -33,6 +31,7 @@ #include #include #include +#include #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" diff --git a/src/core/lib/surface/call_details.cc b/src/core/lib/surface/call_details.cc index 07f7e5a604e..a8644c0b236 100644 --- a/src/core/lib/surface/call_details.cc +++ b/src/core/lib/surface/call_details.cc @@ -16,10 +16,9 @@ // // -#include - #include #include +#include #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/lib/surface/call_log_batch.cc b/src/core/lib/surface/call_log_batch.cc index 473faa8424c..6bb0abd0c24 100644 --- a/src/core/lib/surface/call_log_batch.cc +++ b/src/core/lib/surface/call_log_batch.cc @@ -16,8 +16,6 @@ // // -#include - #include #include @@ -31,6 +29,7 @@ #include #include #include +#include #include "src/core/lib/gpr/string.h" #include "src/core/lib/slice/slice_internal.h" diff --git a/src/core/lib/surface/call_test_only.h b/src/core/lib/surface/call_test_only.h index 356fc72a416..2b1f98b1102 100644 --- a/src/core/lib/surface/call_test_only.h +++ b/src/core/lib/surface/call_test_only.h @@ -19,12 +19,11 @@ #ifndef GRPC_SRC_CORE_LIB_SURFACE_CALL_TEST_ONLY_H #define GRPC_SRC_CORE_LIB_SURFACE_CALL_TEST_ONLY_H -#include - #include #include #include +#include /// Return the message compression algorithm from \a call. /// diff --git a/src/core/lib/surface/channel.cc b/src/core/lib/surface/channel.cc index 35aa13bd247..64d5fd3e322 100644 --- a/src/core/lib/surface/channel.cc +++ b/src/core/lib/surface/channel.cc @@ -14,8 +14,6 @@ // limitations under the License. // -#include - #include "src/core/lib/surface/channel.h" #include @@ -23,6 +21,7 @@ #include #include #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_trace.h" diff --git a/src/core/lib/surface/channel.h b/src/core/lib/surface/channel.h index d41282444a3..58046cdde55 100644 --- a/src/core/lib/surface/channel.h +++ b/src/core/lib/surface/channel.h @@ -17,8 +17,6 @@ #ifndef GRPC_SRC_CORE_LIB_SURFACE_CHANNEL_H #define GRPC_SRC_CORE_LIB_SURFACE_CHANNEL_H -#include - #include #include @@ -30,6 +28,7 @@ #include #include #include +#include #include #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/lib/surface/channel_create.cc b/src/core/lib/surface/channel_create.cc index 7c67e20652c..4b64f14c029 100644 --- a/src/core/lib/surface/channel_create.cc +++ b/src/core/lib/surface/channel_create.cc @@ -14,11 +14,10 @@ // limitations under the License. // -#include - #include #include #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channelz.h" diff --git a/src/core/lib/surface/channel_create.h b/src/core/lib/surface/channel_create.h index 7cc386f379a..dcdb1dc9e96 100644 --- a/src/core/lib/surface/channel_create.h +++ b/src/core/lib/surface/channel_create.h @@ -17,12 +17,12 @@ #ifndef GRPC_SRC_CORE_LIB_SURFACE_CHANNEL_CREATE_H #define GRPC_SRC_CORE_LIB_SURFACE_CHANNEL_CREATE_H -#include - #include #include "absl/status/statusor.h" +#include + #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/surface/channel.h" diff --git a/src/core/lib/surface/channel_init.cc b/src/core/lib/surface/channel_init.cc index abd78dc76b1..59aa35e3761 100644 --- a/src/core/lib/surface/channel_init.cc +++ b/src/core/lib/surface/channel_init.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/surface/channel_init.h" #include @@ -34,6 +32,7 @@ #include "absl/types/optional.h" #include +#include #include "src/core/lib/channel/channel_stack_trace.h" #include "src/core/lib/debug/trace.h" diff --git a/src/core/lib/surface/channel_init.h b/src/core/lib/surface/channel_init.h index 052c30e8012..48de857f76d 100644 --- a/src/core/lib/surface/channel_init.h +++ b/src/core/lib/surface/channel_init.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_SURFACE_CHANNEL_INIT_H #define GRPC_SRC_CORE_LIB_SURFACE_CHANNEL_INIT_H -#include - #include #include @@ -31,6 +29,7 @@ #include "absl/functional/any_invocable.h" #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" diff --git a/src/core/lib/surface/channel_stack_type.cc b/src/core/lib/surface/channel_stack_type.cc index 0f38cf367f5..ad7f34c8580 100644 --- a/src/core/lib/surface/channel_stack_type.cc +++ b/src/core/lib/surface/channel_stack_type.cc @@ -16,10 +16,10 @@ // // -#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.cc b/src/core/lib/surface/completion_queue.cc index 0bd2cefec9e..0f76f4fd2a9 100644 --- a/src/core/lib/surface/completion_queue.cc +++ b/src/core/lib/surface/completion_queue.cc @@ -15,8 +15,6 @@ // limitations under the License. // // -#include - #include "src/core/lib/surface/completion_queue.h" #include @@ -37,6 +35,7 @@ #include #include #include +#include #include #include diff --git a/src/core/lib/surface/completion_queue.h b/src/core/lib/surface/completion_queue.h index ac48d7536ab..9779b210ada 100644 --- a/src/core/lib/surface/completion_queue.h +++ b/src/core/lib/surface/completion_queue.h @@ -21,11 +21,10 @@ // Internal API for completion queues -#include - #include #include +#include #include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/manual_constructor.h" diff --git a/src/core/lib/surface/completion_queue_factory.cc b/src/core/lib/surface/completion_queue_factory.cc index 5864d92e6f7..cb9a1b55d42 100644 --- a/src/core/lib/surface/completion_queue_factory.cc +++ b/src/core/lib/surface/completion_queue_factory.cc @@ -16,12 +16,11 @@ // // -#include - #include "src/core/lib/surface/completion_queue_factory.h" #include #include +#include #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/completion_queue.h" diff --git a/src/core/lib/surface/completion_queue_factory.h b/src/core/lib/surface/completion_queue_factory.h index 25f40012c76..fba5aaa18ed 100644 --- a/src/core/lib/surface/completion_queue_factory.h +++ b/src/core/lib/surface/completion_queue_factory.h @@ -19,9 +19,8 @@ #ifndef GRPC_SRC_CORE_LIB_SURFACE_COMPLETION_QUEUE_FACTORY_H #define GRPC_SRC_CORE_LIB_SURFACE_COMPLETION_QUEUE_FACTORY_H -#include - #include +#include typedef struct grpc_completion_queue_factory_vtable { grpc_completion_queue* (*create)(const grpc_completion_queue_factory*, diff --git a/src/core/lib/surface/event_string.cc b/src/core/lib/surface/event_string.cc index 0666d4beff8..eafe18918f5 100644 --- a/src/core/lib/surface/event_string.cc +++ b/src/core/lib/surface/event_string.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/surface/event_string.h" #include @@ -26,6 +24,8 @@ #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" +#include + static void addhdr(grpc_event* ev, std::vector* buf) { buf->push_back(absl::StrFormat("tag:%p", ev->tag)); } diff --git a/src/core/lib/surface/event_string.h b/src/core/lib/surface/event_string.h index d9e01f4b5c1..9677aa84f64 100644 --- a/src/core/lib/surface/event_string.h +++ b/src/core/lib/surface/event_string.h @@ -19,11 +19,10 @@ #ifndef GRPC_SRC_CORE_LIB_SURFACE_EVENT_STRING_H #define GRPC_SRC_CORE_LIB_SURFACE_EVENT_STRING_H -#include - #include #include +#include // Returns a string describing an event. Must be later freed with gpr_free() std::string grpc_event_string(grpc_event* ev); diff --git a/src/core/lib/surface/init.cc b/src/core/lib/surface/init.cc index 28c33b814d7..3ff4c77f062 100644 --- a/src/core/lib/surface/init.cc +++ b/src/core/lib/surface/init.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/surface/init.h" #include "absl/base/thread_annotations.h" @@ -26,6 +24,7 @@ #include #include #include +#include #include #include diff --git a/src/core/lib/surface/init_internally.cc b/src/core/lib/surface/init_internally.cc index 6e44d4329d8..b2c7f62c856 100644 --- a/src/core/lib/surface/init_internally.cc +++ b/src/core/lib/surface/init_internally.cc @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/surface/init_internally.h" +#include + namespace grpc_core { void (*InitInternally)(); diff --git a/src/core/lib/surface/lame_client.cc b/src/core/lib/surface/lame_client.cc index 8e6f44cd646..ce8a4ea1880 100644 --- a/src/core/lib/surface/lame_client.cc +++ b/src/core/lib/surface/lame_client.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/surface/lame_client.h" #include @@ -30,6 +28,7 @@ #include #include #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args_preconditioning.h" diff --git a/src/core/lib/surface/lame_client.h b/src/core/lib/surface/lame_client.h index 1a6b423ff5f..a8464fc9b96 100644 --- a/src/core/lib/surface/lame_client.h +++ b/src/core/lib/surface/lame_client.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_SURFACE_LAME_CLIENT_H #define GRPC_SRC_CORE_LIB_SURFACE_LAME_CLIENT_H -#include - #include #include "absl/base/thread_annotations.h" @@ -28,6 +26,7 @@ #include "absl/status/statusor.h" #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" diff --git a/src/core/lib/surface/legacy_channel.cc b/src/core/lib/surface/legacy_channel.cc index 3f922476094..80568674f9c 100644 --- a/src/core/lib/surface/legacy_channel.cc +++ b/src/core/lib/surface/legacy_channel.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/surface/legacy_channel.h" #include "absl/base/thread_annotations.h" @@ -29,6 +27,7 @@ #include #include #include +#include #include "src/core/client_channel/client_channel_filter.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/lib/surface/legacy_channel.h b/src/core/lib/surface/legacy_channel.h index 1e4a4e93bf5..780de9f4fa9 100644 --- a/src/core/lib/surface/legacy_channel.h +++ b/src/core/lib/surface/legacy_channel.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_SURFACE_LEGACY_CHANNEL_H #define GRPC_SRC_CORE_LIB_SURFACE_LEGACY_CHANNEL_H -#include - #include #include "absl/status/statusor.h" @@ -28,6 +26,7 @@ #include #include +#include #include "src/core/client_channel/client_channel_filter.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/lib/surface/metadata_array.cc b/src/core/lib/surface/metadata_array.cc index 382f4992cce..13d9a7b8981 100644 --- a/src/core/lib/surface/metadata_array.cc +++ b/src/core/lib/surface/metadata_array.cc @@ -16,12 +16,11 @@ // // -#include - #include #include #include +#include #include "src/core/lib/debug/trace.h" #include "src/core/lib/surface/api_trace.h" diff --git a/src/core/lib/surface/server.cc b/src/core/lib/surface/server.cc index d9289e3b683..7b5fb2b95f9 100644 --- a/src/core/lib/surface/server.cc +++ b/src/core/lib/surface/server.cc @@ -14,8 +14,6 @@ // limitations under the License. // -#include - #include "src/core/lib/surface/server.h" #include @@ -44,6 +42,7 @@ #include #include #include +#include #include #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/lib/surface/server.h b/src/core/lib/surface/server.h index 3623ffa0653..6e80b96445f 100644 --- a/src/core/lib/surface/server.h +++ b/src/core/lib/surface/server.h @@ -17,8 +17,6 @@ #ifndef GRPC_SRC_CORE_LIB_SURFACE_SERVER_H #define GRPC_SRC_CORE_LIB_SURFACE_SERVER_H -#include - #include #include @@ -42,6 +40,7 @@ #include #include +#include #include #include "src/core/lib/backoff/random_early_detection.h" diff --git a/src/core/lib/surface/validate_metadata.cc b/src/core/lib/surface/validate_metadata.cc index c9d6078ac33..e3d4f5f9b04 100644 --- a/src/core/lib/surface/validate_metadata.cc +++ b/src/core/lib/surface/validate_metadata.cc @@ -16,14 +16,13 @@ // // -#include - #include "src/core/lib/surface/validate_metadata.h" #include "absl/status/status.h" #include "absl/strings/string_view.h" #include +#include #include "src/core/lib/gprpp/bitset.h" #include "src/core/lib/iomgr/error.h" diff --git a/src/core/lib/surface/validate_metadata.h b/src/core/lib/surface/validate_metadata.h index e73bcc8e719..13f44a52fdf 100644 --- a/src/core/lib/surface/validate_metadata.h +++ b/src/core/lib/surface/validate_metadata.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_SURFACE_VALIDATE_METADATA_H #define GRPC_SRC_CORE_LIB_SURFACE_VALIDATE_METADATA_H -#include - #include #include @@ -29,6 +27,7 @@ #include #include +#include #include "src/core/lib/iomgr/error.h" diff --git a/src/core/lib/surface/version.cc b/src/core/lib/surface/version.cc index 464d251db93..ef02b901ae6 100644 --- a/src/core/lib/surface/version.cc +++ b/src/core/lib/surface/version.cc @@ -19,9 +19,8 @@ // This file is autogenerated from: // templates/src/core/surface/version.c.template -#include - #include +#include const char* grpc_version_string(void) { return "39.0.0"; } diff --git a/src/core/lib/surface/wait_for_cq_end_op.cc b/src/core/lib/surface/wait_for_cq_end_op.cc index 37e5a058809..ed8191618e7 100644 --- a/src/core/lib/surface/wait_for_cq_end_op.cc +++ b/src/core/lib/surface/wait_for_cq_end_op.cc @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/surface/wait_for_cq_end_op.h" #include +#include + #include "src/core/lib/gprpp/match.h" #include "src/core/lib/promise/trace.h" diff --git a/src/core/lib/transport/batch_builder.cc b/src/core/lib/transport/batch_builder.cc index e24c6800896..81c0b2fa5e9 100644 --- a/src/core/lib/transport/batch_builder.cc +++ b/src/core/lib/transport/batch_builder.cc @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/transport/batch_builder.h" #include +#include + #include "src/core/lib/promise/poll.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/surface/call_trace.h" diff --git a/src/core/lib/transport/batch_builder.h b/src/core/lib/transport/batch_builder.h index af6d3401bfc..ee032df12db 100644 --- a/src/core/lib/transport/batch_builder.h +++ b/src/core/lib/transport/batch_builder.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_BATCH_BUILDER_H #define GRPC_SRC_CORE_LIB_TRANSPORT_BATCH_BUILDER_H -#include - #include #include @@ -31,6 +29,7 @@ #include #include +#include #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/debug/trace.h" diff --git a/src/core/lib/transport/bdp_estimator.cc b/src/core/lib/transport/bdp_estimator.cc index 546f21ac64c..cb5fc537754 100644 --- a/src/core/lib/transport/bdp_estimator.cc +++ b/src/core/lib/transport/bdp_estimator.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/transport/bdp_estimator.h" #include @@ -25,6 +23,8 @@ #include +#include + grpc_core::TraceFlag grpc_bdp_estimator_trace(false, "bdp_estimator"); namespace grpc_core { diff --git a/src/core/lib/transport/bdp_estimator.h b/src/core/lib/transport/bdp_estimator.h index 619b07f75df..571cee0028d 100644 --- a/src/core/lib/transport/bdp_estimator.h +++ b/src/core/lib/transport/bdp_estimator.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_BDP_ESTIMATOR_H #define GRPC_SRC_CORE_LIB_TRANSPORT_BDP_ESTIMATOR_H -#include - #include #include @@ -28,6 +26,7 @@ #include "absl/strings/string_view.h" #include +#include #include #include "src/core/lib/debug/trace.h" diff --git a/src/core/lib/transport/call_filters.cc b/src/core/lib/transport/call_filters.cc index db849b2798b..0365556345c 100644 --- a/src/core/lib/transport/call_filters.cc +++ b/src/core/lib/transport/call_filters.cc @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/transport/call_filters.h" +#include + #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/transport/metadata.h" diff --git a/src/core/lib/transport/call_filters.h b/src/core/lib/transport/call_filters.h index 013db5e0b3b..ea7c7b3b6d1 100644 --- a/src/core/lib/transport/call_filters.h +++ b/src/core/lib/transport/call_filters.h @@ -15,12 +15,12 @@ #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_CALL_FILTERS_H #define GRPC_SRC_CORE_LIB_TRANSPORT_CALL_FILTERS_H -#include - #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/promise/promise.h" diff --git a/src/core/lib/transport/call_final_info.cc b/src/core/lib/transport/call_final_info.cc index 88be823abf5..e5bf3a5a8a9 100644 --- a/src/core/lib/transport/call_final_info.cc +++ b/src/core/lib/transport/call_final_info.cc @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/transport/call_final_info.h" #include +#include + static void move64bits(uint64_t* from, uint64_t* to) { *to += *from; *from = 0; diff --git a/src/core/lib/transport/call_final_info.h b/src/core/lib/transport/call_final_info.h index 8f7165f05f7..fd407df6de8 100644 --- a/src/core/lib/transport/call_final_info.h +++ b/src/core/lib/transport/call_final_info.h @@ -15,11 +15,10 @@ #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_CALL_FINAL_INFO_H #define GRPC_SRC_CORE_LIB_TRANSPORT_CALL_FINAL_INFO_H -#include - #include #include +#include #include struct grpc_transport_one_way_stats { diff --git a/src/core/lib/transport/call_size_estimator.cc b/src/core/lib/transport/call_size_estimator.cc index 88fb02528a3..0892fa9e9cc 100644 --- a/src/core/lib/transport/call_size_estimator.cc +++ b/src/core/lib/transport/call_size_estimator.cc @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/transport/call_size_estimator.h" #include +#include + namespace grpc_core { void CallSizeEstimator::UpdateCallSizeEstimate(size_t size) { diff --git a/src/core/lib/transport/call_size_estimator.h b/src/core/lib/transport/call_size_estimator.h index ffffcca531e..75ae1d7256f 100644 --- a/src/core/lib/transport/call_size_estimator.h +++ b/src/core/lib/transport/call_size_estimator.h @@ -15,12 +15,12 @@ #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_CALL_SIZE_ESTIMATOR_H #define GRPC_SRC_CORE_LIB_TRANSPORT_CALL_SIZE_ESTIMATOR_H -#include - #include #include +#include + namespace grpc_core { class CallSizeEstimator { diff --git a/src/core/lib/transport/call_spine.cc b/src/core/lib/transport/call_spine.cc index 7274c994ae4..0edcc3d335b 100644 --- a/src/core/lib/transport/call_spine.cc +++ b/src/core/lib/transport/call_spine.cc @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/transport/call_spine.h" +#include + namespace grpc_core { void ForwardCall(CallHandler call_handler, CallInitiator call_initiator, diff --git a/src/core/lib/transport/call_spine.h b/src/core/lib/transport/call_spine.h index 7b352f228eb..31381ef9f83 100644 --- a/src/core/lib/transport/call_spine.h +++ b/src/core/lib/transport/call_spine.h @@ -15,9 +15,8 @@ #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_CALL_SPINE_H #define GRPC_SRC_CORE_LIB_TRANSPORT_CALL_SPINE_H -#include - #include +#include #include "src/core/lib/promise/detail/status.h" #include "src/core/lib/promise/for_each.h" diff --git a/src/core/lib/transport/connectivity_state.cc b/src/core/lib/transport/connectivity_state.cc index d8c8f3bed46..35bd75185e1 100644 --- a/src/core/lib/transport/connectivity_state.cc +++ b/src/core/lib/transport/connectivity_state.cc @@ -16,11 +16,10 @@ // // -#include - #include "src/core/lib/transport/connectivity_state.h" #include +#include #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" diff --git a/src/core/lib/transport/connectivity_state.h b/src/core/lib/transport/connectivity_state.h index 1a74780aa07..8b5fb677186 100644 --- a/src/core/lib/transport/connectivity_state.h +++ b/src/core/lib/transport/connectivity_state.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_CONNECTIVITY_STATE_H #define GRPC_SRC_CORE_LIB_TRANSPORT_CONNECTIVITY_STATE_H -#include - #include #include #include @@ -29,6 +27,7 @@ #include "absl/status/status.h" #include +#include #include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/orphanable.h" diff --git a/src/core/lib/transport/endpoint_info_handshaker.cc b/src/core/lib/transport/endpoint_info_handshaker.cc index 08dda4e5abe..ce02279ca56 100644 --- a/src/core/lib/transport/endpoint_info_handshaker.cc +++ b/src/core/lib/transport/endpoint_info_handshaker.cc @@ -14,14 +14,14 @@ // limitations under the License. // -#include - #include "src/core/lib/transport/endpoint_info_handshaker.h" #include #include "absl/status/status.h" +#include + #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" diff --git a/src/core/lib/transport/error_utils.cc b/src/core/lib/transport/error_utils.cc index 2e53b31ce2d..2b3b776a27a 100644 --- a/src/core/lib/transport/error_utils.cc +++ b/src/core/lib/transport/error_utils.cc @@ -16,14 +16,13 @@ // // -#include - #include "src/core/lib/transport/error_utils.h" #include #include +#include #include #include "src/core/lib/gprpp/status_helper.h" diff --git a/src/core/lib/transport/error_utils.h b/src/core/lib/transport/error_utils.h index 62f9e17a05c..f10bfad63b6 100644 --- a/src/core/lib/transport/error_utils.h +++ b/src/core/lib/transport/error_utils.h @@ -19,13 +19,12 @@ #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_ERROR_UTILS_H #define GRPC_SRC_CORE_LIB_TRANSPORT_ERROR_UTILS_H -#include - #include #include "absl/status/status.h" #include +#include #include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/error.h" diff --git a/src/core/lib/transport/handshaker.cc b/src/core/lib/transport/handshaker.cc index 9f459c5deb0..8288002bf4d 100644 --- a/src/core/lib/transport/handshaker.cc +++ b/src/core/lib/transport/handshaker.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/transport/handshaker.h" #include @@ -33,6 +31,7 @@ #include #include #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" diff --git a/src/core/lib/transport/handshaker.h b/src/core/lib/transport/handshaker.h index 7d8b66da361..759cfb6798e 100644 --- a/src/core/lib/transport/handshaker.h +++ b/src/core/lib/transport/handshaker.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_HANDSHAKER_H #define GRPC_SRC_CORE_LIB_TRANSPORT_HANDSHAKER_H -#include - #include #include @@ -30,6 +28,7 @@ #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/transport/handshaker_registry.cc b/src/core/lib/transport/handshaker_registry.cc index 6505516481c..1f49d3bda42 100644 --- a/src/core/lib/transport/handshaker_registry.cc +++ b/src/core/lib/transport/handshaker_registry.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/transport/handshaker_registry.h" #include @@ -25,6 +23,8 @@ #include #include +#include + namespace grpc_core { void HandshakerRegistry::Builder::RegisterHandshakerFactory( diff --git a/src/core/lib/transport/handshaker_registry.h b/src/core/lib/transport/handshaker_registry.h index e5aa0f6ede7..22354603a43 100644 --- a/src/core/lib/transport/handshaker_registry.h +++ b/src/core/lib/transport/handshaker_registry.h @@ -19,11 +19,11 @@ #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_HANDSHAKER_REGISTRY_H #define GRPC_SRC_CORE_LIB_TRANSPORT_HANDSHAKER_REGISTRY_H -#include - #include #include +#include + #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/transport/handshaker_factory.h" diff --git a/src/core/lib/transport/http_connect_handshaker.cc b/src/core/lib/transport/http_connect_handshaker.cc index 11e2332bc8f..d401423d11a 100644 --- a/src/core/lib/transport/http_connect_handshaker.cc +++ b/src/core/lib/transport/http_connect_handshaker.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/transport/http_connect_handshaker.h" #include @@ -36,6 +34,7 @@ #include #include #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" diff --git a/src/core/lib/transport/message.cc b/src/core/lib/transport/message.cc index 6429fb2e445..a9435911a57 100644 --- a/src/core/lib/transport/message.cc +++ b/src/core/lib/transport/message.cc @@ -12,13 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/transport/message.h" #include "absl/strings/str_cat.h" #include +#include namespace grpc_core { diff --git a/src/core/lib/transport/metadata.cc b/src/core/lib/transport/metadata.cc index 1a77cb81a89..2a964aa3466 100644 --- a/src/core/lib/transport/metadata.cc +++ b/src/core/lib/transport/metadata.cc @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/transport/metadata.h" +#include + #include "src/core/lib/transport/error_utils.h" namespace grpc_core { diff --git a/src/core/lib/transport/metadata_batch.cc b/src/core/lib/transport/metadata_batch.cc index 3edc9dc7c42..732a17e11ca 100644 --- a/src/core/lib/transport/metadata_batch.cc +++ b/src/core/lib/transport/metadata_batch.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/transport/metadata_batch.h" #include @@ -28,6 +26,8 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" +#include + #include "src/core/lib/transport/timeout_encoding.h" namespace grpc_core { diff --git a/src/core/lib/transport/metadata_batch.h b/src/core/lib/transport/metadata_batch.h index b05c8d188fe..d7d0185a66e 100644 --- a/src/core/lib/transport/metadata_batch.h +++ b/src/core/lib/transport/metadata_batch.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_METADATA_BATCH_H #define GRPC_SRC_CORE_LIB_TRANSPORT_METADATA_BATCH_H -#include - #include #include @@ -38,6 +36,7 @@ #include #include #include +#include #include "src/core/lib/compression/compression_internal.h" #include "src/core/lib/experiments/experiments.h" diff --git a/src/core/lib/transport/metadata_compression_traits.h b/src/core/lib/transport/metadata_compression_traits.h index 002caf069d5..05f8a9145f8 100644 --- a/src/core/lib/transport/metadata_compression_traits.h +++ b/src/core/lib/transport/metadata_compression_traits.h @@ -15,10 +15,10 @@ #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_METADATA_COMPRESSION_TRAITS_H #define GRPC_SRC_CORE_LIB_TRANSPORT_METADATA_COMPRESSION_TRAITS_H -#include - #include +#include + namespace grpc_core { /////////////////////////////////////////////////////////////////////////////// diff --git a/src/core/lib/transport/metadata_info.cc b/src/core/lib/transport/metadata_info.cc index 6bba4ae2b4f..79a9dd96a7b 100644 --- a/src/core/lib/transport/metadata_info.cc +++ b/src/core/lib/transport/metadata_info.cc @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/transport/metadata_info.h" +#include + #include "src/core/lib/slice/slice.h" namespace grpc_core { diff --git a/src/core/lib/transport/parsed_metadata.cc b/src/core/lib/transport/parsed_metadata.cc index 26619a138b6..d2554ef894f 100644 --- a/src/core/lib/transport/parsed_metadata.cc +++ b/src/core/lib/transport/parsed_metadata.cc @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/transport/parsed_metadata.h" +#include + namespace grpc_core { namespace metadata_detail { diff --git a/src/core/lib/transport/parsed_metadata.h b/src/core/lib/transport/parsed_metadata.h index 6da6a862785..26e3264bb4c 100644 --- a/src/core/lib/transport/parsed_metadata.h +++ b/src/core/lib/transport/parsed_metadata.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_PARSED_METADATA_H #define GRPC_SRC_CORE_LIB_TRANSPORT_PARSED_METADATA_H -#include - #include #include @@ -32,6 +30,7 @@ #include "absl/strings/string_view.h" #include +#include #include "src/core/lib/gprpp/time.h" #include "src/core/lib/slice/slice.h" diff --git a/src/core/lib/transport/promise_endpoint.cc b/src/core/lib/transport/promise_endpoint.cc index 5159b2dc6d4..9f8ced08ef8 100644 --- a/src/core/lib/transport/promise_endpoint.cc +++ b/src/core/lib/transport/promise_endpoint.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/lib/transport/promise_endpoint.h" #include @@ -28,6 +26,7 @@ #include #include #include +#include #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/slice/slice_buffer.h" diff --git a/src/core/lib/transport/promise_endpoint.h b/src/core/lib/transport/promise_endpoint.h index 8fe3c5c9877..be49a1fccb0 100644 --- a/src/core/lib/transport/promise_endpoint.h +++ b/src/core/lib/transport/promise_endpoint.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_PROMISE_ENDPOINT_H #define GRPC_SRC_CORE_LIB_TRANSPORT_PROMISE_ENDPOINT_H -#include - #include #include @@ -36,6 +34,7 @@ #include #include #include +#include #include "src/core/lib/event_engine/extensions/chaotic_good_extension.h" #include "src/core/lib/event_engine/query_extensions.h" diff --git a/src/core/lib/transport/simple_slice_based_metadata.h b/src/core/lib/transport/simple_slice_based_metadata.h index 41ede91e97e..01270a645c3 100644 --- a/src/core/lib/transport/simple_slice_based_metadata.h +++ b/src/core/lib/transport/simple_slice_based_metadata.h @@ -15,10 +15,10 @@ #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_SIMPLE_SLICE_BASED_METADATA_H #define GRPC_SRC_CORE_LIB_TRANSPORT_SIMPLE_SLICE_BASED_METADATA_H -#include - #include "absl/strings/string_view.h" +#include + #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/parsed_metadata.h" diff --git a/src/core/lib/transport/status_conversion.cc b/src/core/lib/transport/status_conversion.cc index 808134dc5f6..aa372ccb8b0 100644 --- a/src/core/lib/transport/status_conversion.cc +++ b/src/core/lib/transport/status_conversion.cc @@ -16,10 +16,10 @@ // // -#include - #include "src/core/lib/transport/status_conversion.h" +#include + grpc_http2_error_code grpc_status_to_http2_error(grpc_status_code status) { switch (status) { case GRPC_STATUS_OK: diff --git a/src/core/lib/transport/status_conversion.h b/src/core/lib/transport/status_conversion.h index 83a68d62d26..6691a84d729 100644 --- a/src/core/lib/transport/status_conversion.h +++ b/src/core/lib/transport/status_conversion.h @@ -19,9 +19,8 @@ #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_STATUS_CONVERSION_H #define GRPC_SRC_CORE_LIB_TRANSPORT_STATUS_CONVERSION_H -#include - #include +#include #include "src/core/lib/gprpp/time.h" #include "src/core/lib/transport/http2_errors.h" diff --git a/src/core/lib/transport/tcp_connect_handshaker.cc b/src/core/lib/transport/tcp_connect_handshaker.cc index cf56bce34f8..6f5ee5017f9 100644 --- a/src/core/lib/transport/tcp_connect_handshaker.cc +++ b/src/core/lib/transport/tcp_connect_handshaker.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/transport/tcp_connect_handshaker.h" #include @@ -31,6 +29,7 @@ #include #include #include +#include #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/lib/transport/timeout_encoding.cc b/src/core/lib/transport/timeout_encoding.cc index 97d0a6a7418..265081aac34 100644 --- a/src/core/lib/transport/timeout_encoding.cc +++ b/src/core/lib/transport/timeout_encoding.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/transport/timeout_encoding.h" #include @@ -25,6 +23,7 @@ #include "absl/base/attributes.h" #include +#include #include namespace grpc_core { diff --git a/src/core/lib/transport/timeout_encoding.h b/src/core/lib/transport/timeout_encoding.h index 6e0eab972f0..58346c98c6d 100644 --- a/src/core/lib/transport/timeout_encoding.h +++ b/src/core/lib/transport/timeout_encoding.h @@ -19,12 +19,12 @@ #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_TIMEOUT_ENCODING_H #define GRPC_SRC_CORE_LIB_TRANSPORT_TIMEOUT_ENCODING_H -#include - #include #include "absl/types/optional.h" +#include + #include "src/core/lib/gprpp/time.h" #include "src/core/lib/slice/slice.h" diff --git a/src/core/lib/transport/transport.cc b/src/core/lib/transport/transport.cc index aa4134f88ee..0ea7ad6284e 100644 --- a/src/core/lib/transport/transport.cc +++ b/src/core/lib/transport/transport.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/lib/transport/transport.h" #include @@ -31,6 +29,7 @@ #include #include +#include #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/gprpp/time.h" diff --git a/src/core/lib/transport/transport.h b/src/core/lib/transport/transport.h index 91924f80550..9a89def3a8e 100644 --- a/src/core/lib/transport/transport.h +++ b/src/core/lib/transport/transport.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_TRANSPORT_H #define GRPC_SRC_CORE_LIB_TRANSPORT_TRANSPORT_H -#include - #include #include #include @@ -38,6 +36,7 @@ #include #include #include +#include #include #include "src/core/lib/channel/context.h" diff --git a/src/core/lib/transport/transport_op_string.cc b/src/core/lib/transport/transport_op_string.cc index c11e61f7dc9..09222337537 100644 --- a/src/core/lib/transport/transport_op_string.cc +++ b/src/core/lib/transport/transport_op_string.cc @@ -16,8 +16,6 @@ // // -#include - #include #include @@ -25,6 +23,7 @@ #include "absl/strings/str_format.h" #include +#include #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/gprpp/orphanable.h" diff --git a/src/core/lib/uri/uri_parser.cc b/src/core/lib/uri/uri_parser.cc index 8c24d252da4..1aa8ad7fd27 100644 --- a/src/core/lib/uri/uri_parser.cc +++ b/src/core/lib/uri/uri_parser.cc @@ -14,8 +14,6 @@ // limitations under the License. // -#include - #include "src/core/lib/uri/uri_parser.h" #include @@ -38,6 +36,7 @@ #include "absl/strings/strip.h" #include +#include namespace grpc_core { diff --git a/src/core/lib/uri/uri_parser.h b/src/core/lib/uri/uri_parser.h index e7142b1c37c..2768bae179f 100644 --- a/src/core/lib/uri/uri_parser.h +++ b/src/core/lib/uri/uri_parser.h @@ -17,8 +17,6 @@ #ifndef GRPC_SRC_CORE_LIB_URI_URI_PARSER_H #define GRPC_SRC_CORE_LIB_URI_URI_PARSER_H -#include - #include #include #include @@ -26,6 +24,8 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" +#include + namespace grpc_core { class URI { diff --git a/src/core/tsi/alts/crypt/aes_gcm.cc b/src/core/tsi/alts/crypt/aes_gcm.cc index a2c4ec9f44d..a4b908b4bdd 100644 --- a/src/core/tsi/alts/crypt/aes_gcm.cc +++ b/src/core/tsi/alts/crypt/aes_gcm.cc @@ -16,8 +16,6 @@ // // -#include - #include #include @@ -31,6 +29,7 @@ #include "absl/types/span.h" #include +#include #include "src/core/tsi/alts/crypt/gsec.h" diff --git a/src/core/tsi/alts/crypt/gsec.cc b/src/core/tsi/alts/crypt/gsec.cc index a6145c5d070..591ad2bceb5 100644 --- a/src/core/tsi/alts/crypt/gsec.cc +++ b/src/core/tsi/alts/crypt/gsec.cc @@ -16,14 +16,13 @@ // // -#include - #include "src/core/tsi/alts/crypt/gsec.h" #include #include #include +#include static const char vtable_error_msg[] = "crypter or crypter->vtable has not been initialized properly"; diff --git a/src/core/tsi/alts/crypt/gsec.h b/src/core/tsi/alts/crypt/gsec.h index 693bf0a120a..0407955d691 100644 --- a/src/core/tsi/alts/crypt/gsec.h +++ b/src/core/tsi/alts/crypt/gsec.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_TSI_ALTS_CRYPT_GSEC_H #define GRPC_SRC_CORE_TSI_ALTS_CRYPT_GSEC_H -#include - #include #include #include @@ -32,6 +30,7 @@ #include #include +#include namespace grpc_core { diff --git a/src/core/tsi/alts/frame_protector/alts_counter.cc b/src/core/tsi/alts/frame_protector/alts_counter.cc index 1468817513b..5eede6067de 100644 --- a/src/core/tsi/alts/frame_protector/alts_counter.cc +++ b/src/core/tsi/alts/frame_protector/alts_counter.cc @@ -16,13 +16,12 @@ // // -#include - #include "src/core/tsi/alts/frame_protector/alts_counter.h" #include #include +#include static void maybe_copy_error_msg(const char* src, char** dst) { if (dst != nullptr && src != nullptr) { diff --git a/src/core/tsi/alts/frame_protector/alts_counter.h b/src/core/tsi/alts/frame_protector/alts_counter.h index e9e9eddde33..9ebc0892f73 100644 --- a/src/core/tsi/alts/frame_protector/alts_counter.h +++ b/src/core/tsi/alts/frame_protector/alts_counter.h @@ -19,12 +19,11 @@ #ifndef GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_COUNTER_H #define GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_COUNTER_H -#include - #include #include #include +#include // Main struct for a crypter counter managed within seal/unseal operations. typedef struct alts_counter { diff --git a/src/core/tsi/alts/frame_protector/alts_crypter.cc b/src/core/tsi/alts/frame_protector/alts_crypter.cc index 194c9f41767..4938127df89 100644 --- a/src/core/tsi/alts/frame_protector/alts_crypter.cc +++ b/src/core/tsi/alts/frame_protector/alts_crypter.cc @@ -16,13 +16,12 @@ // // -#include - #include "src/core/tsi/alts/frame_protector/alts_crypter.h" #include #include +#include static void maybe_copy_error_msg(const char* src, char** dst) { if (dst != nullptr && src != nullptr) { diff --git a/src/core/tsi/alts/frame_protector/alts_crypter.h b/src/core/tsi/alts/frame_protector/alts_crypter.h index 6925f0bf8a7..a660b30667c 100644 --- a/src/core/tsi/alts/frame_protector/alts_crypter.h +++ b/src/core/tsi/alts/frame_protector/alts_crypter.h @@ -19,12 +19,11 @@ #ifndef GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_CRYPTER_H #define GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_CRYPTER_H -#include - #include #include #include +#include #include "src/core/tsi/alts/crypt/gsec.h" diff --git a/src/core/tsi/alts/frame_protector/alts_frame_protector.cc b/src/core/tsi/alts/frame_protector/alts_frame_protector.cc index 21e89e54c1f..9b48b181d1f 100644 --- a/src/core/tsi/alts/frame_protector/alts_frame_protector.cc +++ b/src/core/tsi/alts/frame_protector/alts_frame_protector.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/tsi/alts/frame_protector/alts_frame_protector.h" #include @@ -30,6 +28,7 @@ #include #include +#include #include "src/core/lib/gprpp/memory.h" #include "src/core/tsi/alts/crypt/gsec.h" diff --git a/src/core/tsi/alts/frame_protector/alts_frame_protector.h b/src/core/tsi/alts/frame_protector/alts_frame_protector.h index fff405c4846..e1f7def8164 100644 --- a/src/core/tsi/alts/frame_protector/alts_frame_protector.h +++ b/src/core/tsi/alts/frame_protector/alts_frame_protector.h @@ -19,10 +19,10 @@ #ifndef GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_FRAME_PROTECTOR_H #define GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_FRAME_PROTECTOR_H -#include - #include +#include + #include "src/core/tsi/transport_security_interface.h" typedef struct alts_frame_protector alts_frame_protector; diff --git a/src/core/tsi/alts/frame_protector/alts_record_protocol_crypter_common.cc b/src/core/tsi/alts/frame_protector/alts_record_protocol_crypter_common.cc index 3ff100bdb3f..2146511b1cc 100644 --- a/src/core/tsi/alts/frame_protector/alts_record_protocol_crypter_common.cc +++ b/src/core/tsi/alts/frame_protector/alts_record_protocol_crypter_common.cc @@ -16,11 +16,10 @@ // // -#include - #include "src/core/tsi/alts/frame_protector/alts_record_protocol_crypter_common.h" #include +#include static void maybe_copy_error_msg(const char* src, char** dst) { if (dst != nullptr && src != nullptr) { diff --git a/src/core/tsi/alts/frame_protector/alts_record_protocol_crypter_common.h b/src/core/tsi/alts/frame_protector/alts_record_protocol_crypter_common.h index cfec50e00a9..fd8bf4e47b5 100644 --- a/src/core/tsi/alts/frame_protector/alts_record_protocol_crypter_common.h +++ b/src/core/tsi/alts/frame_protector/alts_record_protocol_crypter_common.h @@ -19,9 +19,8 @@ #ifndef GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_RECORD_PROTOCOL_CRYPTER_COMMON_H #define GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_RECORD_PROTOCOL_CRYPTER_COMMON_H -#include - #include +#include #include "src/core/tsi/alts/frame_protector/alts_counter.h" #include "src/core/tsi/alts/frame_protector/alts_crypter.h" diff --git a/src/core/tsi/alts/frame_protector/alts_seal_privacy_integrity_crypter.cc b/src/core/tsi/alts/frame_protector/alts_seal_privacy_integrity_crypter.cc index 8b9136cc0b8..4dc87f1ffd4 100644 --- a/src/core/tsi/alts/frame_protector/alts_seal_privacy_integrity_crypter.cc +++ b/src/core/tsi/alts/frame_protector/alts_seal_privacy_integrity_crypter.cc @@ -16,9 +16,8 @@ // // -#include - #include +#include #include "src/core/tsi/alts/frame_protector/alts_counter.h" #include "src/core/tsi/alts/frame_protector/alts_crypter.h" diff --git a/src/core/tsi/alts/frame_protector/alts_unseal_privacy_integrity_crypter.cc b/src/core/tsi/alts/frame_protector/alts_unseal_privacy_integrity_crypter.cc index 805a93fc19d..064ca82afb3 100644 --- a/src/core/tsi/alts/frame_protector/alts_unseal_privacy_integrity_crypter.cc +++ b/src/core/tsi/alts/frame_protector/alts_unseal_privacy_integrity_crypter.cc @@ -16,9 +16,8 @@ // // -#include - #include +#include #include "src/core/tsi/alts/frame_protector/alts_counter.h" #include "src/core/tsi/alts/frame_protector/alts_crypter.h" diff --git a/src/core/tsi/alts/frame_protector/frame_handler.cc b/src/core/tsi/alts/frame_protector/frame_handler.cc index 41b172ad2d2..0c22491fd3a 100644 --- a/src/core/tsi/alts/frame_protector/frame_handler.cc +++ b/src/core/tsi/alts/frame_protector/frame_handler.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/tsi/alts/frame_protector/frame_handler.h" #include @@ -28,6 +26,7 @@ #include #include +#include #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/gprpp/memory.h" diff --git a/src/core/tsi/alts/frame_protector/frame_handler.h b/src/core/tsi/alts/frame_protector/frame_handler.h index 6cb0806db0b..f0a32b4409a 100644 --- a/src/core/tsi/alts/frame_protector/frame_handler.h +++ b/src/core/tsi/alts/frame_protector/frame_handler.h @@ -19,11 +19,11 @@ #ifndef GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_FRAME_HANDLER_H #define GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_FRAME_HANDLER_H -#include - #include #include +#include + const size_t kFrameMessageType = 0x06; const size_t kFrameLengthFieldSize = 4; const size_t kFrameMessageTypeFieldSize = 4; diff --git a/src/core/tsi/alts/handshaker/alts_handshaker_client.cc b/src/core/tsi/alts/handshaker/alts_handshaker_client.cc index 06a3a790cc2..65113b17dcc 100644 --- a/src/core/tsi/alts/handshaker/alts_handshaker_client.cc +++ b/src/core/tsi/alts/handshaker/alts_handshaker_client.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/tsi/alts/handshaker/alts_handshaker_client.h" #include @@ -28,6 +26,7 @@ #include #include #include +#include #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/gprpp/env.h" diff --git a/src/core/tsi/alts/handshaker/alts_handshaker_client.h b/src/core/tsi/alts/handshaker/alts_handshaker_client.h index 69b789cb332..35a51af74d9 100644 --- a/src/core/tsi/alts/handshaker/alts_handshaker_client.h +++ b/src/core/tsi/alts/handshaker/alts_handshaker_client.h @@ -19,11 +19,10 @@ #ifndef GRPC_SRC_CORE_TSI_ALTS_HANDSHAKER_ALTS_HANDSHAKER_CLIENT_H #define GRPC_SRC_CORE_TSI_ALTS_HANDSHAKER_ALTS_HANDSHAKER_CLIENT_H -#include - #include #include #include +#include #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/pollset_set.h" diff --git a/src/core/tsi/alts/handshaker/alts_shared_resource.cc b/src/core/tsi/alts/handshaker/alts_shared_resource.cc index 289078ed978..843335935a5 100644 --- a/src/core/tsi/alts/handshaker/alts_shared_resource.cc +++ b/src/core/tsi/alts/handshaker/alts_shared_resource.cc @@ -16,11 +16,10 @@ // // -#include - #include "src/core/tsi/alts/handshaker/alts_shared_resource.h" #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/crash.h" diff --git a/src/core/tsi/alts/handshaker/alts_shared_resource.h b/src/core/tsi/alts/handshaker/alts_shared_resource.h index 26aa8f0c95c..43265edfbfd 100644 --- a/src/core/tsi/alts/handshaker/alts_shared_resource.h +++ b/src/core/tsi/alts/handshaker/alts_shared_resource.h @@ -19,9 +19,8 @@ #ifndef GRPC_SRC_CORE_TSI_ALTS_HANDSHAKER_ALTS_SHARED_RESOURCE_H #define GRPC_SRC_CORE_TSI_ALTS_HANDSHAKER_ALTS_SHARED_RESOURCE_H -#include - #include +#include #include #include "src/core/lib/gprpp/thd.h" diff --git a/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc b/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc index e34f90b0cb3..98cf9bbec93 100644 --- a/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc +++ b/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h" #include @@ -29,6 +27,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/tsi/alts/handshaker/alts_tsi_handshaker.h b/src/core/tsi/alts/handshaker/alts_tsi_handshaker.h index 1cddc61d520..ab59da56677 100644 --- a/src/core/tsi/alts/handshaker/alts_tsi_handshaker.h +++ b/src/core/tsi/alts/handshaker/alts_tsi_handshaker.h @@ -19,9 +19,8 @@ #ifndef GRPC_SRC_CORE_TSI_ALTS_HANDSHAKER_ALTS_TSI_HANDSHAKER_H #define GRPC_SRC_CORE_TSI_ALTS_HANDSHAKER_ALTS_TSI_HANDSHAKER_H -#include - #include +#include #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h" diff --git a/src/core/tsi/alts/handshaker/alts_tsi_utils.cc b/src/core/tsi/alts/handshaker/alts_tsi_utils.cc index 5d0e8d47e0a..762af6d2679 100644 --- a/src/core/tsi/alts/handshaker/alts_tsi_utils.cc +++ b/src/core/tsi/alts/handshaker/alts_tsi_utils.cc @@ -16,11 +16,10 @@ // // -#include - #include "src/core/tsi/alts/handshaker/alts_tsi_utils.h" #include +#include #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" diff --git a/src/core/tsi/alts/handshaker/alts_tsi_utils.h b/src/core/tsi/alts/handshaker/alts_tsi_utils.h index ce9b3248c38..f5dd355f8ae 100644 --- a/src/core/tsi/alts/handshaker/alts_tsi_utils.h +++ b/src/core/tsi/alts/handshaker/alts_tsi_utils.h @@ -19,10 +19,9 @@ #ifndef GRPC_SRC_CORE_TSI_ALTS_HANDSHAKER_ALTS_TSI_UTILS_H #define GRPC_SRC_CORE_TSI_ALTS_HANDSHAKER_ALTS_TSI_UTILS_H -#include - #include #include +#include #include "src/core/tsi/transport_security_interface.h" #include "src/proto/grpc/gcp/handshaker.upb.h" diff --git a/src/core/tsi/alts/handshaker/transport_security_common_api.cc b/src/core/tsi/alts/handshaker/transport_security_common_api.cc index a5c117e07e6..bb3c209a711 100644 --- a/src/core/tsi/alts/handshaker/transport_security_common_api.cc +++ b/src/core/tsi/alts/handshaker/transport_security_common_api.cc @@ -16,12 +16,12 @@ // // -#include - #include "src/core/tsi/alts/handshaker/transport_security_common_api.h" #include "upb/mem/arena.hpp" +#include + bool grpc_gcp_rpc_protocol_versions_set_max( grpc_gcp_rpc_protocol_versions* versions, uint32_t max_major, uint32_t max_minor) { diff --git a/src/core/tsi/alts/handshaker/transport_security_common_api.h b/src/core/tsi/alts/handshaker/transport_security_common_api.h index 14e8a32b613..a8cb4c3f79d 100644 --- a/src/core/tsi/alts/handshaker/transport_security_common_api.h +++ b/src/core/tsi/alts/handshaker/transport_security_common_api.h @@ -19,12 +19,11 @@ #ifndef GRPC_SRC_CORE_TSI_ALTS_HANDSHAKER_TRANSPORT_SECURITY_COMMON_API_H #define GRPC_SRC_CORE_TSI_ALTS_HANDSHAKER_TRANSPORT_SECURITY_COMMON_API_H -#include - #include #include #include #include +#include #include "src/core/lib/gprpp/crash.h" #include "src/proto/grpc/gcp/transport_security_common.upb.h" 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 8f1329b8d3b..01cf48f635a 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 @@ -16,14 +16,13 @@ // // -#include - #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h" #include #include #include +#include #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/slice/slice.h" diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h index 1c1d3c92b8b..eb61d2ff2e3 100644 --- a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h +++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h @@ -19,10 +19,10 @@ #ifndef GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_GRPC_INTEGRITY_ONLY_RECORD_PROTOCOL_H #define GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_GRPC_INTEGRITY_ONLY_RECORD_PROTOCOL_H -#include - #include +#include + #include "src/core/tsi/alts/crypt/gsec.h" #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol.h" diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc index 25c09f6366b..768c8b775b7 100644 --- a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc +++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc @@ -16,12 +16,11 @@ // // -#include - #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h" #include #include +#include #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/slice/slice.h" diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h index 25601339d96..c4dd9ab152a 100644 --- a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h +++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h @@ -19,10 +19,10 @@ #ifndef GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_GRPC_PRIVACY_INTEGRITY_RECORD_PROTOCOL_H #define GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_GRPC_PRIVACY_INTEGRITY_RECORD_PROTOCOL_H -#include - #include +#include + #include "src/core/tsi/alts/crypt/gsec.h" #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol.h" diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol.h b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol.h index 68bdb955939..5838eb4696c 100644 --- a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol.h +++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol.h @@ -19,9 +19,8 @@ #ifndef GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_GRPC_RECORD_PROTOCOL_H #define GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_GRPC_RECORD_PROTOCOL_H -#include - #include +#include #include "src/core/tsi/transport_security_interface.h" diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc index cf313405866..c03dde032d0 100644 --- a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc +++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc @@ -16,14 +16,13 @@ // // -#include - #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h" #include #include #include +#include #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/crash.h" diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc b/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc index dc12a5133b5..40046f0769e 100644 --- a/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc +++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h" #include @@ -25,6 +23,7 @@ #include #include +#include #include "src/core/lib/gprpp/crash.h" #include "src/core/tsi/alts/frame_protector/alts_counter.h" diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h b/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h index cdc9f99041a..e29ab55b502 100644 --- a/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h +++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h @@ -19,10 +19,10 @@ #ifndef GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_IOVEC_RECORD_PROTOCOL_H #define GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_IOVEC_RECORD_PROTOCOL_H -#include - #include +#include + #include "src/core/tsi/alts/crypt/gsec.h" constexpr size_t kZeroCopyFrameMessageType = 0x06; diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc b/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc index 7a86440cd7e..617a19b7f3d 100644 --- a/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc +++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h" #include @@ -27,6 +25,7 @@ #include #include +#include #include "src/core/tsi/alts/crypt/gsec.h" #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h" diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h b/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h index 1a3e2568818..42c3dee0d35 100644 --- a/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h +++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h @@ -19,10 +19,10 @@ #ifndef GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_ZERO_COPY_GRPC_PROTECTOR_H #define GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_ZERO_COPY_GRPC_PROTECTOR_H -#include - #include +#include + #include "src/core/tsi/alts/crypt/gsec.h" #include "src/core/tsi/transport_security_interface.h" diff --git a/src/core/tsi/fake_transport_security.cc b/src/core/tsi/fake_transport_security.cc index d8e498e8181..e612af27d3c 100644 --- a/src/core/tsi/fake_transport_security.cc +++ b/src/core/tsi/fake_transport_security.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/tsi/fake_transport_security.h" #include @@ -25,6 +23,7 @@ #include #include +#include #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/crash.h" diff --git a/src/core/tsi/local_transport_security.cc b/src/core/tsi/local_transport_security.cc index 6b3668c5282..944aee67145 100644 --- a/src/core/tsi/local_transport_security.cc +++ b/src/core/tsi/local_transport_security.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/tsi/local_transport_security.h" #include @@ -26,6 +24,7 @@ #include #include +#include #include #include "src/core/lib/gprpp/crash.h" diff --git a/src/core/tsi/local_transport_security.h b/src/core/tsi/local_transport_security.h index 82048e4a221..5f60eac53e0 100644 --- a/src/core/tsi/local_transport_security.h +++ b/src/core/tsi/local_transport_security.h @@ -19,9 +19,8 @@ #ifndef GRPC_SRC_CORE_TSI_LOCAL_TRANSPORT_SECURITY_H #define GRPC_SRC_CORE_TSI_LOCAL_TRANSPORT_SECURITY_H -#include - #include +#include #include "src/core/tsi/transport_security.h" #include "src/core/tsi/transport_security_interface.h" diff --git a/src/core/tsi/ssl/key_logging/ssl_key_logging.cc b/src/core/tsi/ssl/key_logging/ssl_key_logging.cc index 292352f8e55..d290ed30feb 100644 --- a/src/core/tsi/ssl/key_logging/ssl_key_logging.cc +++ b/src/core/tsi/ssl/key_logging/ssl_key_logging.cc @@ -12,13 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "src/core/tsi/ssl/key_logging/ssl_key_logging.h" #include #include +#include #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/gprpp/sync.h" diff --git a/src/core/tsi/ssl/key_logging/ssl_key_logging.h b/src/core/tsi/ssl/key_logging/ssl_key_logging.h index ff5871f9a5b..ec420acc228 100644 --- a/src/core/tsi/ssl/key_logging/ssl_key_logging.h +++ b/src/core/tsi/ssl/key_logging/ssl_key_logging.h @@ -15,8 +15,6 @@ #ifndef GRPC_SRC_CORE_TSI_SSL_KEY_LOGGING_SSL_KEY_LOGGING_H #define GRPC_SRC_CORE_TSI_SSL_KEY_LOGGING_SSL_KEY_LOGGING_H -#include - #include #include @@ -26,6 +24,7 @@ #include #include +#include #include #include "src/core/lib/gprpp/memory.h" diff --git a/src/core/tsi/ssl/session_cache/ssl_session.h b/src/core/tsi/ssl/session_cache/ssl_session.h index 0889df812ee..d56451ec7fb 100644 --- a/src/core/tsi/ssl/session_cache/ssl_session.h +++ b/src/core/tsi/ssl/session_cache/ssl_session.h @@ -19,13 +19,12 @@ #ifndef GRPC_SRC_CORE_TSI_SSL_SESSION_CACHE_SSL_SESSION_H #define GRPC_SRC_CORE_TSI_SSL_SESSION_CACHE_SSL_SESSION_H -#include - #include #include #include +#include #include "src/core/lib/gprpp/ref_counted.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 d4bafaa0538..26f751fd600 100644 --- a/src/core/tsi/ssl/session_cache/ssl_session_cache.cc +++ b/src/core/tsi/ssl/session_cache/ssl_session_cache.cc @@ -16,11 +16,10 @@ // // -#include - #include "src/core/tsi/ssl/session_cache/ssl_session_cache.h" #include +#include #include #include "src/core/lib/gprpp/crash.h" diff --git a/src/core/tsi/ssl/session_cache/ssl_session_cache.h b/src/core/tsi/ssl/session_cache/ssl_session_cache.h index 0d7e8df76ea..881a69cf006 100644 --- a/src/core/tsi/ssl/session_cache/ssl_session_cache.h +++ b/src/core/tsi/ssl/session_cache/ssl_session_cache.h @@ -19,14 +19,13 @@ #ifndef GRPC_SRC_CORE_TSI_SSL_SESSION_CACHE_SSL_SESSION_CACHE_H #define GRPC_SRC_CORE_TSI_SSL_SESSION_CACHE_SSL_SESSION_CACHE_H -#include - #include #include #include #include +#include #include #include "src/core/lib/gprpp/cpp_impl_of.h" 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 487608d7dca..ba797476e24 100644 --- a/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc +++ b/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc @@ -16,9 +16,8 @@ // // -#include - #include +#include #include "src/core/lib/gprpp/crash.h" #include "src/core/tsi/ssl/session_cache/ssl_session.h" diff --git a/src/core/tsi/ssl_transport_security.cc b/src/core/tsi/ssl_transport_security.cc index 17ad9077393..9235782bb29 100644 --- a/src/core/tsi/ssl_transport_security.cc +++ b/src/core/tsi/ssl_transport_security.cc @@ -16,13 +16,13 @@ // // -#include - #include "src/core/tsi/ssl_transport_security.h" #include #include +#include + // TODO(jboeuf): refactor inet_ntop into a portability header. // Note: for whomever reads this and tries to refactor this, this // can't be in grpc, it has to be in gpr. diff --git a/src/core/tsi/ssl_transport_security.h b/src/core/tsi/ssl_transport_security.h index f2e21710e77..da3b260adbd 100644 --- a/src/core/tsi/ssl_transport_security.h +++ b/src/core/tsi/ssl_transport_security.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_TSI_SSL_TRANSPORT_SECURITY_H #define GRPC_SRC_CORE_TSI_SSL_TRANSPORT_SECURITY_H -#include - #include #include @@ -29,6 +27,7 @@ #include #include +#include #include "src/core/tsi/ssl/key_logging/ssl_key_logging.h" #include "src/core/tsi/ssl_transport_security_utils.h" diff --git a/src/core/tsi/ssl_transport_security_utils.cc b/src/core/tsi/ssl_transport_security_utils.cc index 1c05de9293d..6ba2ee7a23e 100644 --- a/src/core/tsi/ssl_transport_security_utils.cc +++ b/src/core/tsi/ssl_transport_security_utils.cc @@ -16,8 +16,6 @@ // // -#include - #include "src/core/tsi/ssl_transport_security_utils.h" #include @@ -28,6 +26,8 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" +#include + #include "src/core/tsi/transport_security_interface.h" namespace grpc_core { diff --git a/src/core/tsi/ssl_transport_security_utils.h b/src/core/tsi/ssl_transport_security_utils.h index a0fd928e6f2..6485c542de4 100644 --- a/src/core/tsi/ssl_transport_security_utils.h +++ b/src/core/tsi/ssl_transport_security_utils.h @@ -19,8 +19,6 @@ #ifndef GRPC_SRC_CORE_TSI_SSL_TRANSPORT_SECURITY_UTILS_H #define GRPC_SRC_CORE_TSI_SSL_TRANSPORT_SECURITY_UTILS_H -#include - #include #include "absl/status/status.h" @@ -28,6 +26,7 @@ #include "absl/strings/string_view.h" #include +#include #include "src/core/tsi/ssl/key_logging/ssl_key_logging.h" #include "src/core/tsi/transport_security_interface.h" diff --git a/src/core/tsi/ssl_types.h b/src/core/tsi/ssl_types.h index 8312ec2f38f..221636859d1 100644 --- a/src/core/tsi/ssl_types.h +++ b/src/core/tsi/ssl_types.h @@ -27,10 +27,10 @@ // function // -#include - #include +#include + #ifdef OPENSSL_IS_BORINGSSL #define TSI_INT_AS_SIZE(x) ((size_t)(x)) #define TSI_SIZE_AS_SIZE(x) (x) diff --git a/src/core/tsi/transport_security.cc b/src/core/tsi/transport_security.cc index f9b13ea7d36..065987b3271 100644 --- a/src/core/tsi/transport_security.cc +++ b/src/core/tsi/transport_security.cc @@ -16,14 +16,13 @@ // // -#include - #include "src/core/tsi/transport_security.h" #include #include #include +#include #include // --- Tracing. --- diff --git a/src/core/tsi/transport_security.h b/src/core/tsi/transport_security.h index 2c88cb6eb8b..19482fba176 100644 --- a/src/core/tsi/transport_security.h +++ b/src/core/tsi/transport_security.h @@ -19,10 +19,10 @@ #ifndef GRPC_SRC_CORE_TSI_TRANSPORT_SECURITY_H #define GRPC_SRC_CORE_TSI_TRANSPORT_SECURITY_H -#include - #include +#include + #include "src/core/lib/debug/trace.h" #include "src/core/tsi/transport_security_interface.h" diff --git a/src/core/tsi/transport_security_grpc.cc b/src/core/tsi/transport_security_grpc.cc index 3f04ce99122..4d120d9b076 100644 --- a/src/core/tsi/transport_security_grpc.cc +++ b/src/core/tsi/transport_security_grpc.cc @@ -16,10 +16,10 @@ // // -#include - #include "src/core/tsi/transport_security_grpc.h" +#include + // This method creates a tsi_zero_copy_grpc_protector object. tsi_result tsi_handshaker_result_create_zero_copy_grpc_protector( const tsi_handshaker_result* self, size_t* max_output_protected_frame_size, diff --git a/src/core/tsi/transport_security_grpc.h b/src/core/tsi/transport_security_grpc.h index 9bcef5ceddc..a3332302263 100644 --- a/src/core/tsi/transport_security_grpc.h +++ b/src/core/tsi/transport_security_grpc.h @@ -19,9 +19,8 @@ #ifndef GRPC_SRC_CORE_TSI_TRANSPORT_SECURITY_GRPC_H #define GRPC_SRC_CORE_TSI_TRANSPORT_SECURITY_GRPC_H -#include - #include +#include #include "src/core/tsi/transport_security.h" diff --git a/src/core/tsi/transport_security_interface.h b/src/core/tsi/transport_security_interface.h index 37cc94c7127..186bb683f18 100644 --- a/src/core/tsi/transport_security_interface.h +++ b/src/core/tsi/transport_security_interface.h @@ -19,13 +19,13 @@ #ifndef GRPC_SRC_CORE_TSI_TRANSPORT_SECURITY_INTERFACE_H #define GRPC_SRC_CORE_TSI_TRANSPORT_SECURITY_INTERFACE_H -#include - #include #include #include +#include + #include "src/core/lib/debug/trace.h" // --- tsi result ---