clang-format

11 months ago · 41f0283c42
parent bfeb884075
commit 41f0283c42
30 changed files with 45 additions and 60 deletions
--- a/src/core/resolver/binder/binder_resolver.cc
+++ b/src/core/resolver/binder/binder_resolver.cc
@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include <grpc/support/port_platform.h>
-
 #include <algorithm>

 #include "absl/status/status.h"

+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gprpp/status_helper.h"
 #include "src/core/lib/iomgr/port.h"  // IWYU pragma: keep

--- a/src/core/resolver/dns/c_ares/dns_resolver_ares.cc
+++ b/src/core/resolver/dns/c_ares/dns_resolver_ares.cc
@ -14,8 +14,6 @@
 // limitations under the License.
 //

-#include <grpc/support/port_platform.h>
-
 #include <stdint.h>

 #include <algorithm>
@ -36,6 +34,7 @@
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
--- a/src/core/resolver/dns/c_ares/dns_resolver_ares.h
+++ b/src/core/resolver/dns/c_ares/dns_resolver_ares.h
@ -14,10 +14,10 @@
 #ifndef GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_DNS_RESOLVER_ARES_H
 #define GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_DNS_RESOLVER_ARES_H

-#include <grpc/support/port_platform.h>
-
 #include "absl/strings/string_view.h"

+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/config/core_configuration.h"

 namespace grpc_core {
--- a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h
+++ b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h
@ -19,14 +19,14 @@
 #ifndef GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_GRPC_ARES_EV_DRIVER_H
 #define GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_GRPC_ARES_EV_DRIVER_H

-#include <grpc/support/port_platform.h>
-
 #include <memory>

 #include <ares.h>

 #include "absl/base/thread_annotations.h"

+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
--- a/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc
+++ b/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc
@ -16,14 +16,13 @@
 //
 //

-#include <grpc/support/port_platform.h>
-
 #include <algorithm>
 #include <vector>

 #include "absl/strings/string_view.h"

 #include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/lib/gprpp/status_helper.h"
 #include "src/core/lib/iomgr/sockaddr.h"
--- a/src/core/resolver/dns/c_ares/grpc_ares_wrapper.h
+++ b/src/core/resolver/dns/c_ares/grpc_ares_wrapper.h
@ -19,8 +19,6 @@
 #ifndef GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_GRPC_ARES_WRAPPER_H
 #define GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_GRPC_ARES_WRAPPER_H

-#include <grpc/support/port_platform.h>
-
 #include <stddef.h>

 #include <memory>
@ -30,6 +28,7 @@
 #include "absl/base/thread_annotations.h"

 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/gprpp/sync.h"
--- a/src/core/resolver/dns/dns_resolver_plugin.cc
+++ b/src/core/resolver/dns/dns_resolver_plugin.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 <grpc/support/port_platform.h>
-
 #include "src/core/resolver/dns/dns_resolver_plugin.h"

 #include <memory>
@ -20,6 +18,7 @@
 #include "absl/strings/match.h"

 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/experiments/experiments.h"
--- a/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc
+++ b/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.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 <grpc/support/port_platform.h>
-
 #include "src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h"

 #include <inttypes.h>
@ -37,6 +35,7 @@
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/lib/backoff/backoff.h"
 #include "src/core/lib/channel/channel_args.h"
--- a/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h
+++ b/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h
@ -13,10 +13,10 @@
 // limitations under the License.
 #ifndef GRPC_SRC_CORE_RESOLVER_DNS_EVENT_ENGINE_EVENT_ENGINE_CLIENT_CHANNEL_RESOLVER_H
 #define GRPC_SRC_CORE_RESOLVER_DNS_EVENT_ENGINE_EVENT_ENGINE_CLIENT_CHANNEL_RESOLVER_H
-#include <grpc/support/port_platform.h>
-
 #include "absl/strings/string_view.h"

+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/uri/uri_parser.h"
 #include "src/core/resolver/resolver.h"
--- a/src/core/resolver/dns/event_engine/service_config_helper.cc
+++ b/src/core/resolver/dns/event_engine/service_config_helper.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 <grpc/support/port_platform.h>
-
 #include "src/core/resolver/dns/event_engine/service_config_helper.h"

 #include <stdlib.h>
@ -23,6 +21,8 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"

+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gprpp/status_helper.h"
 #include "src/core/lib/iomgr/gethostname.h"
 #include "src/core/lib/json/json.h"
--- a/src/core/resolver/dns/event_engine/service_config_helper.h
+++ b/src/core/resolver/dns/event_engine/service_config_helper.h
@ -15,13 +15,13 @@
 #ifndef GRPC_SRC_CORE_RESOLVER_DNS_EVENT_ENGINE_SERVICE_CONFIG_HELPER_H
 #define GRPC_SRC_CORE_RESOLVER_DNS_EVENT_ENGINE_SERVICE_CONFIG_HELPER_H

-#include <grpc/support/port_platform.h>
-
 #include <string>

 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"

+#include <grpc/support/port_platform.h>
+
 namespace grpc_core {

 absl::StatusOr<std::string> ChooseServiceConfig(
--- a/src/core/resolver/dns/native/dns_resolver.cc
+++ b/src/core/resolver/dns/native/dns_resolver.cc
@ -14,8 +14,6 @@
 // limitations under the License.
 //

-#include <grpc/support/port_platform.h>
-
 #include <algorithm>
 #include <memory>
 #include <utility>
@ -31,6 +29,7 @@

 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/lib/backoff/backoff.h"
 #include "src/core/lib/channel/channel_args.h"
--- a/src/core/resolver/endpoint_addresses.cc
+++ b/src/core/resolver/endpoint_addresses.cc
@ -16,8 +16,6 @@
 //
 //

-#include <grpc/support/port_platform.h>
-
 #include "src/core/resolver/endpoint_addresses.h"

 #include <string.h>
@ -32,6 +30,7 @@
 #include "absl/strings/str_join.h"

 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
--- a/src/core/resolver/endpoint_addresses.h
+++ b/src/core/resolver/endpoint_addresses.h
@ -19,8 +19,6 @@
 #ifndef GRPC_SRC_CORE_RESOLVER_ENDPOINT_ADDRESSES_H
 #define GRPC_SRC_CORE_RESOLVER_ENDPOINT_ADDRESSES_H

-#include <grpc/support/port_platform.h>
-
 #include <set>
 #include <string>
 #include <utility>
@ -28,6 +26,8 @@

 #include "absl/functional/function_ref.h"

+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/resolved_address.h"

--- a/src/core/resolver/fake/fake_resolver.cc
+++ b/src/core/resolver/fake/fake_resolver.cc
@ -17,8 +17,6 @@
 // This is similar to the sockaddr resolver, except that it supports a
 // bunch of query args that are useful for dependency injection in tests.

-#include <grpc/support/port_platform.h>
-
 #include "src/core/resolver/fake/fake_resolver.h"

 #include <memory>
@ -28,6 +26,7 @@
 #include "absl/strings/string_view.h"

 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
--- a/src/core/resolver/fake/fake_resolver.h
+++ b/src/core/resolver/fake/fake_resolver.h
@ -17,8 +17,6 @@
 #ifndef GRPC_SRC_CORE_RESOLVER_FAKE_FAKE_RESOLVER_H
 #define GRPC_SRC_CORE_RESOLVER_FAKE_FAKE_RESOLVER_H

-#include <grpc/support/port_platform.h>
-
 #include <utility>

 #include "absl/base/thread_annotations.h"
@ -27,6 +25,7 @@
 #include "absl/types/optional.h"

 #include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/notification.h"
--- a/src/core/resolver/google_c2p/google_c2p_resolver.cc
+++ b/src/core/resolver/google_c2p/google_c2p_resolver.cc
@ -14,8 +14,6 @@
 // limitations under the License.
 //

-#include <grpc/support/port_platform.h>
-
 #include <cstdint>
 #include <memory>
 #include <random>
@ -31,6 +29,7 @@

 #include <grpc/support/json.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/ext/gcp/metadata_query.h"
 #include "src/core/ext/xds/xds_bootstrap.h"
--- a/src/core/resolver/polling_resolver.cc
+++ b/src/core/resolver/polling_resolver.cc
@ -14,8 +14,6 @@
 // limitations under the License.
 //

-#include <grpc/support/port_platform.h>
-
 #include "src/core/resolver/polling_resolver.h"

 #include <inttypes.h>
@ -31,6 +29,7 @@
 #include "absl/strings/strip.h"

 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/lib/backoff/backoff.h"
 #include "src/core/lib/channel/channel_args.h"
--- a/src/core/resolver/polling_resolver.h
+++ b/src/core/resolver/polling_resolver.h
@ -17,8 +17,6 @@
 #ifndef GRPC_SRC_CORE_RESOLVER_POLLING_RESOLVER_H
 #define GRPC_SRC_CORE_RESOLVER_POLLING_RESOLVER_H

-#include <grpc/support/port_platform.h>
-
 #include <memory>
 #include <string>

@ -26,6 +24,7 @@
 #include "absl/types/optional.h"

 #include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/lib/backoff/backoff.h"
 #include "src/core/lib/channel/channel_args.h"
--- a/src/core/resolver/resolver.cc
+++ b/src/core/resolver/resolver.cc
@ -16,10 +16,10 @@
 //
 //

-#include <grpc/support/port_platform.h>
-
 #include "src/core/resolver/resolver.h"

+#include <grpc/support/port_platform.h>
+
 grpc_core::DebugOnlyTraceFlag grpc_trace_resolver_refcount(false,
                                                           "resolver_refcount");

--- a/src/core/resolver/resolver.h
+++ b/src/core/resolver/resolver.h
@ -17,14 +17,14 @@
 #ifndef GRPC_SRC_CORE_RESOLVER_RESOLVER_H
 #define GRPC_SRC_CORE_RESOLVER_RESOLVER_H

-#include <grpc/support/port_platform.h>
-
 #include <functional>
 #include <string>

 #include "absl/status/status.h"
 #include "absl/status/statusor.h"

+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/gprpp/orphanable.h"
--- a/src/core/resolver/resolver_factory.h
+++ b/src/core/resolver/resolver_factory.h
@ -17,14 +17,14 @@
 #ifndef GRPC_SRC_CORE_RESOLVER_RESOLVER_FACTORY_H
 #define GRPC_SRC_CORE_RESOLVER_RESOLVER_FACTORY_H

-#include <grpc/support/port_platform.h>
-
 #include <memory>
 #include <string>

 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"

+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
--- a/src/core/resolver/resolver_registry.cc
+++ b/src/core/resolver/resolver_registry.cc
@ -14,8 +14,6 @@
 // limitations under the License.
 //

-#include <grpc/support/port_platform.h>
-
 #include "src/core/resolver/resolver_registry.h"

 #include "absl/status/status.h"
@ -25,6 +23,7 @@
 #include "absl/strings/str_format.h"

 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>

 namespace grpc_core {

--- a/src/core/resolver/resolver_registry.h
+++ b/src/core/resolver/resolver_registry.h
@ -17,8 +17,6 @@
 #ifndef GRPC_SRC_CORE_RESOLVER_RESOLVER_REGISTRY_H
 #define GRPC_SRC_CORE_RESOLVER_RESOLVER_REGISTRY_H

-#include <grpc/support/port_platform.h>
-
 #include <map>
 #include <memory>
 #include <string>
@ -26,6 +24,8 @@

 #include "absl/strings/string_view.h"

+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
--- a/src/core/resolver/sockaddr/sockaddr_resolver.cc
+++ b/src/core/resolver/sockaddr/sockaddr_resolver.cc
@ -14,8 +14,6 @@
 // limitations under the License.
 //

-#include <grpc/support/port_platform.h>
-
 #include <algorithm>
 #include <memory>
 #include <string>
@ -26,6 +24,7 @@
 #include "absl/strings/string_view.h"

 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/channel/channel_args.h"
--- a/src/core/resolver/xds/xds_dependency_manager.cc
+++ b/src/core/resolver/xds/xds_dependency_manager.cc
@ -14,14 +14,14 @@
 // limitations under the License.
 //

-#include <grpc/support/port_platform.h>
-
 #include "src/core/resolver/xds/xds_dependency_manager.h"

 #include <set>

 #include "absl/strings/str_join.h"

+#include <grpc/support/port_platform.h>
+
 #include "src/core/ext/xds/xds_routing.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/gprpp/match.h"
--- a/src/core/resolver/xds/xds_dependency_manager.h
+++ b/src/core/resolver/xds/xds_dependency_manager.h
@ -17,12 +17,12 @@
 #ifndef GRPC_SRC_CORE_RESOLVER_XDS_XDS_DEPENDENCY_MANAGER_H
 #define GRPC_SRC_CORE_RESOLVER_XDS_XDS_DEPENDENCY_MANAGER_H

-#include <grpc/support/port_platform.h>
-
 #include "absl/container/flat_hash_map.h"
 #include "absl/container/flat_hash_set.h"
 #include "absl/strings/string_view.h"

+#include <grpc/support/port_platform.h>
+
 #include "src/core/ext/xds/xds_client_grpc.h"
 #include "src/core/ext/xds/xds_cluster.h"
 #include "src/core/ext/xds/xds_endpoint.h"
--- a/src/core/resolver/xds/xds_resolver.cc
+++ b/src/core/resolver/xds/xds_resolver.cc
@ -14,8 +14,6 @@
 // limitations under the License.
 //

-#include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 #include <string.h>

@ -47,6 +45,7 @@
 #include <grpc/slice.h>
 #include <grpc/status.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/client_channel/client_channel_internal.h"
 #include "src/core/client_channel/config_selector.h"
--- a/src/core/resolver/xds/xds_resolver_attributes.h
+++ b/src/core/resolver/xds/xds_resolver_attributes.h
@ -17,10 +17,10 @@
 #ifndef GRPC_SRC_CORE_RESOLVER_XDS_XDS_RESOLVER_ATTRIBUTES_H
 #define GRPC_SRC_CORE_RESOLVER_XDS_XDS_RESOLVER_ATTRIBUTES_H

-#include <grpc/support/port_platform.h>
-
 #include "absl/strings/string_view.h"

+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gprpp/unique_type_name.h"
 #include "src/core/service_config/service_config_call_data.h"

--- a/src/core/resolver/xds/xds_resolver_trace.cc
+++ b/src/core/resolver/xds/xds_resolver_trace.cc
@ -14,10 +14,10 @@
 // limitations under the License.
 //

-#include <grpc/support/port_platform.h>
-
 #include "src/core/resolver/xds/xds_resolver_trace.h"

+#include <grpc/support/port_platform.h>
+
 namespace grpc_core {

 TraceFlag grpc_xds_resolver_trace(false, "xds_resolver");