Update include/grpcpp/.clang-format

8 months ago · 3242577530
parent 3eb3e63eb3
commit 3242577530
14 changed files with 10 additions and 26 deletions
--- a/include/grpcpp/.clang-format
+++ b/include/grpcpp/.clang-format
@ -5,9 +5,6 @@ DerivePointerAlignment: false
 PointerAlignment: Left
 IncludeBlocks: Regroup
 IncludeCategories:
-  # port_platform.h is before almost everything
-  - Regex: '^<grpc/(support|impl/codegen)/port_platform.h>'
-    Priority: -100
  # ruby.h is even more first if it's included
  - Regex: '^<ruby/ruby.h>'
    Priority: -200
--- a/include/grpcpp/create_channel_posix.h
+++ b/include/grpcpp/create_channel_posix.h
@ -19,10 +19,9 @@
 #ifndef GRPCPP_CREATE_CHANNEL_POSIX_H
 #define GRPCPP_CREATE_CHANNEL_POSIX_H

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

+#include <grpc/support/port_platform.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/support/channel_arguments.h>

--- a/include/grpcpp/ext/channelz_service_plugin.h
+++ b/include/grpcpp/ext/channelz_service_plugin.h
@ -20,7 +20,6 @@
 #define GRPCPP_EXT_CHANNELZ_SERVICE_PLUGIN_H

 #include <grpc/support/port_platform.h>
-
 #include <grpcpp/impl/server_builder_plugin.h>
 #include <grpcpp/impl/server_initializer.h>
 #include <grpcpp/support/config.h>
--- a/include/grpcpp/ext/csm_observability.h
+++ b/include/grpcpp/ext/csm_observability.h
@ -19,8 +19,6 @@
 #ifndef GRPCPP_EXT_CSM_OBSERVABILITY_H
 #define GRPCPP_EXT_CSM_OBSERVABILITY_H

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

 #include "absl/functional/any_invocable.h"
@ -28,6 +26,7 @@
 #include "absl/strings/string_view.h"
 #include "opentelemetry/metrics/meter_provider.h"

+#include <grpc/support/port_platform.h>
 #include <grpcpp/ext/otel_plugin.h>

 namespace grpc {
--- a/include/grpcpp/ext/gcp_observability.h
+++ b/include/grpcpp/ext/gcp_observability.h
@ -17,11 +17,10 @@
 #ifndef GRPCPP_EXT_GCP_OBSERVABILITY_H
 #define GRPCPP_EXT_GCP_OBSERVABILITY_H

-#include <grpc/support/port_platform.h>
-
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"

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

 namespace grpc {
--- a/include/grpcpp/ext/otel_plugin.h
+++ b/include/grpcpp/ext/otel_plugin.h
@ -19,8 +19,6 @@
 #ifndef GRPCPP_EXT_OTEL_PLUGIN_H
 #define GRPCPP_EXT_OTEL_PLUGIN_H

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

@ -32,6 +30,7 @@
 #include "opentelemetry/metrics/meter_provider.h"

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

 namespace grpc {

--- a/include/grpcpp/ext/server_load_reporting.h
+++ b/include/grpcpp/ext/server_load_reporting.h
@ -19,9 +19,8 @@
 #ifndef GRPCPP_EXT_SERVER_LOAD_REPORTING_H
 #define GRPCPP_EXT_SERVER_LOAD_REPORTING_H

-#include <grpc/support/port_platform.h>
-
 #include <grpc/load_reporting.h>
+#include <grpc/support/port_platform.h>
 #include <grpcpp/impl/server_builder_option.h>
 #include <grpcpp/server_context.h>
 #include <grpcpp/support/config.h>
--- a/include/grpcpp/generic/async_generic_service.h
+++ b/include/grpcpp/generic/async_generic_service.h
@ -20,7 +20,6 @@
 #define GRPCPP_GENERIC_ASYNC_GENERIC_SERVICE_H

 #include <grpc/support/port_platform.h>
-
 #include <grpcpp/impl/server_callback_handlers.h>
 #include <grpcpp/support/async_stream.h>
 #include <grpcpp/support/byte_buffer.h>
--- a/include/grpcpp/server.h
+++ b/include/grpcpp/server.h
@ -19,14 +19,13 @@
 #ifndef GRPCPP_SERVER_H
 #define GRPCPP_SERVER_H

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

 #include <grpc/compression.h>
 #include <grpc/support/atm.h>
+#include <grpc/support/port_platform.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/completion_queue.h>
 #include <grpcpp/health_check_service_interface.h>
--- a/include/grpcpp/server_builder.h
+++ b/include/grpcpp/server_builder.h
@ -19,8 +19,6 @@
 #ifndef GRPCPP_SERVER_BUILDER_H
 #define GRPCPP_SERVER_BUILDER_H

-#include <grpc/support/port_platform.h>
-
 #include <climits>
 #include <map>
 #include <memory>
@ -28,6 +26,7 @@

 #include <grpc/compression.h>
 #include <grpc/support/cpu.h>
+#include <grpc/support/port_platform.h>
 #include <grpc/support/workaround_list.h>
 #include <grpcpp/impl/channel_argument_option.h>
 #include <grpcpp/impl/server_builder_option.h>
--- a/include/grpcpp/server_context.h
+++ b/include/grpcpp/server_context.h
@ -19,8 +19,6 @@
 #ifndef GRPCPP_SERVER_CONTEXT_H
 #define GRPCPP_SERVER_CONTEXT_H

-#include <grpc/support/port_platform.h>
-
 #include <atomic>
 #include <cassert>
 #include <map>
@ -31,6 +29,7 @@
 #include <grpc/grpc.h>
 #include <grpc/impl/call.h>
 #include <grpc/impl/compression_types.h>
+#include <grpc/support/port_platform.h>
 #include <grpcpp/impl/call.h>
 #include <grpcpp/impl/call_op_set.h>
 #include <grpcpp/impl/codegen/create_auth_context.h>
--- a/include/grpcpp/server_interface.h
+++ b/include/grpcpp/server_interface.h
@ -19,11 +19,10 @@
 #ifndef GRPCPP_SERVER_INTERFACE_H
 #define GRPCPP_SERVER_INTERFACE_H

-#include <grpc/support/port_platform.h>
-
 #include <grpc/grpc.h>
 #include <grpc/impl/grpc_types.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 #include <grpcpp/impl/call.h>
 #include <grpcpp/impl/call_hook.h>
--- a/include/grpcpp/server_posix.h
+++ b/include/grpcpp/server_posix.h
@ -19,10 +19,9 @@
 #ifndef GRPCPP_SERVER_POSIX_H
 #define GRPCPP_SERVER_POSIX_H

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

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

 namespace grpc {
--- a/include/grpcpp/xds_server_builder.h
+++ b/include/grpcpp/xds_server_builder.h
@ -20,7 +20,6 @@
 #define GRPCPP_XDS_SERVER_BUILDER_H

 #include <grpc/support/port_platform.h>
-
 #include <grpcpp/server_builder.h>

 namespace grpc {