format: upgrade to clang-format-5.0

.clang-format

@@ -4,5 +4,6 @@ AccessModifierOffset: -2
 ColumnLimit: 100
 DerivePointerAlignment: false
 PointerAlignment: Left
+SortIncludes: false
 ...
 

ci/README.md

@@ -69,5 +69,5 @@ The `./ci/run_envoy_docker.sh './ci/do_ci.sh <TARGET>'` targets are:
 * `bazel.release.server_only` &mdash; build Envoy static binary under `-c opt` with gcc.
 * `bazel.coverage` &mdash; build and run tests under `-c dbg` with gcc, generating coverage information in `$ENVOY_DOCKER_BUILD_DIR/envoy/generated/coverage/coverage.html`.
 * `bazel.tsan` &mdash; build and run tests under `-c dbg --config=clang-tsan` with clang-5.0.
-* `check_format`&mdash; run `clang-format` 3.6 and `buildifier` on entire source tree.
-* `fix_format`&mdash; run and enforce `clang-format` 3.6 and `buildifier` on entire source tree.
+* `check_format`&mdash; run `clang-format` 5.0 and `buildifier` on entire source tree.
+* `fix_format`&mdash; run and enforce `clang-format` 5.0 and `buildifier` on entire source tree.

ci/envoy_build_sha.sh

@@ -1 +1 @@
-ENVOY_BUILD_SHA=cd7f513444fb24270175f0c961996d184b764f32
+ENVOY_BUILD_SHA=146fb40d0c8b8e48416470b50d60929a3f344711

include/envoy/access_log/access_log.h

@@ -28,5 +28,5 @@ class AccessLogManager {
 
 typedef std::unique_ptr<AccessLogManager> AccessLogManagerPtr;
 
-} // AccessLog
-} // Envoy
+} // namespace AccessLog
+} // namespace Envoy

include/envoy/api/api.h

@@ -47,5 +47,5 @@ class Api {
 
 typedef std::unique_ptr<Api> ApiPtr;
 
-} // Api
-} // Envoy
+} // namespace Api
+} // namespace Envoy

include/envoy/buffer/buffer.h

@@ -133,5 +133,5 @@ class Instance {
 
 typedef std::unique_ptr<Instance> InstancePtr;
 
-} // Buffer
-} // Envoy
+} // namespace Buffer
+} // namespace Envoy

include/envoy/common/exception.h

@@ -11,4 +11,4 @@ class EnvoyException : public std::runtime_error {
 public:
   EnvoyException(const std::string& message) : std::runtime_error(message) {}
 };
-} // Envoy
+} // namespace Envoy

include/envoy/common/optional.h

@@ -58,4 +58,4 @@ template <typename T> class Optional {
   T value_;
   bool valid_{};
 };
-} // Envoy
+} // namespace Envoy

include/envoy/common/time.h

@@ -39,4 +39,4 @@ class MonotonicTimeSource {
    */
   virtual MonotonicTime currentTime() PURE;
 };
-} // Envoy
+} // namespace Envoy

include/envoy/event/deferred_deletable.h

@@ -17,5 +17,5 @@ class DeferredDeletable {
 
 typedef std::unique_ptr<DeferredDeletable> DeferredDeletablePtr;
 
-} // Event
-} // Envoy
+} // namespace Event
+} // namespace Envoy

include/envoy/event/dispatcher.h

@@ -157,5 +157,5 @@ class Dispatcher {
 
 typedef std::unique_ptr<Dispatcher> DispatcherPtr;
 
-} // Event
-} // Envoy
+} // namespace Event
+} // namespace Envoy

include/envoy/event/file_event.h

@@ -49,5 +49,5 @@ class FileEvent {
 
 typedef std::unique_ptr<FileEvent> FileEventPtr;
 
-} // Event
-} // Envoy
+} // namespace Event
+} // namespace Envoy

include/envoy/event/signal.h

@@ -21,5 +21,5 @@ class SignalEvent {
 
 typedef std::unique_ptr<SignalEvent> SignalEventPtr;
 
-} // Event
-} // Envoy
+} // namespace Event
+} // namespace Envoy

include/envoy/event/timer.h

@@ -34,5 +34,5 @@ class Timer {
 
 typedef std::unique_ptr<Timer> TimerPtr;
 
-} // Event
-} // Envoy
+} // namespace Event
+} // namespace Envoy

include/envoy/filesystem/filesystem.h

@@ -79,5 +79,5 @@ class Watcher {
 
 typedef std::unique_ptr<Watcher> WatcherPtr;
 
-} // Filesystem
-} // Envoy
+} // namespace Filesystem
+} // namespace Envoy

include/envoy/grpc/async_client.h

@@ -109,5 +109,5 @@ template <class RequestType, class ResponseType> class AsyncClient {
         const Optional<std::chrono::milliseconds>& timeout) PURE;
 };
 
-} // Grpc
-} // Envoy
+} // namespace Grpc
+} // namespace Envoy

include/envoy/grpc/rpc_channel.h

@@ -75,5 +75,5 @@ class RpcChannelFactory {
                                const Optional<std::chrono::milliseconds>& timeout) PURE;
 };
 
-} // Grpc
-} // Envoy
+} // namespace Grpc
+} // namespace Envoy

include/envoy/grpc/status.h

@@ -47,5 +47,5 @@ class Status {
   };
 };
 
-} // Grpc
-} // Envoy
+} // namespace Grpc
+} // namespace Envoy

include/envoy/http/access_log.h

@@ -166,6 +166,6 @@ class Formatter {
 
 typedef std::unique_ptr<Formatter> FormatterPtr;
 
-} // AccessLog
-} // Http
-} // Envoy
+} // namespace AccessLog
+} // namespace Http
+} // namespace Envoy

include/envoy/http/async_client.h

@@ -156,5 +156,5 @@ class AsyncClient {
 
 typedef std::unique_ptr<AsyncClient> AsyncClientPtr;
 
-} // Http
-} // Envoy
+} // namespace Http
+} // namespace Envoy

include/envoy/http/codec.h

@@ -264,5 +264,5 @@ class ClientConnection : public virtual Connection {
 
 typedef std::unique_ptr<ClientConnection> ClientConnectionPtr;
 
-} // Http
-} // Envoy
+} // namespace Http
+} // namespace Envoy

include/envoy/http/codes.h

@@ -72,5 +72,5 @@ enum class Code {
   // clang-format on
 };
 
-} // Http
-} // Envoy
+} // namespace Http
+} // namespace Envoy

include/envoy/http/conn_pool.h

@@ -99,6 +99,6 @@ class Instance : public Event::DeferredDeletable {
 
 typedef std::unique_ptr<Instance> InstancePtr;
 
-} // ConnectionPool
-} // Http
-} // Envoy
+} // namespace ConnectionPool
+} // namespace Http
+} // namespace Envoy

include/envoy/http/filter.h

@@ -385,5 +385,5 @@ class FilterChainFactory {
   virtual void createFilterChain(FilterChainFactoryCallbacks& callbacks) PURE;
 };
 
-} // Http
-} // Envoy
+} // namespace Http
+} // namespace Envoy

include/envoy/http/header_map.h

@@ -321,5 +321,5 @@ class HeaderMap {
 
 typedef std::unique_ptr<HeaderMap> HeaderMapPtr;
 
-} // Http
-} // Envoy
+} // namespace Http
+} // namespace Envoy

include/envoy/http/message.h

@@ -46,5 +46,5 @@ class Message {
 
 typedef std::unique_ptr<Message> MessagePtr;
 
-} // Http
-} // Envoy
+} // namespace Http
+} // namespace Envoy

include/envoy/http/protocol.h

@@ -8,5 +8,5 @@ namespace Http {
  */
 enum class Protocol { Http10, Http11, Http2 };
 
-} // Http
-} // Envoy
+} // namespace Http
+} // namespace Envoy

include/envoy/init/init.h

@@ -36,5 +36,5 @@ class Manager {
   virtual void registerTarget(Target& target) PURE;
 };
 
-} // Init
-} // Envoy
+} // namespace Init
+} // namespace Envoy

include/envoy/json/json_object.h

@@ -160,5 +160,5 @@ class Object {
   virtual bool empty() const PURE;
 };
 
-} // Json
-} // Envoy
+} // namespace Json
+} // namespace Envoy

include/envoy/local_info/local_info.h

@@ -36,5 +36,5 @@ class LocalInfo {
   virtual const std::string& nodeName() const PURE;
 };
 
-} // LocalInfo
-} // Envoy
+} // namespace LocalInfo
+} // namespace Envoy

include/envoy/mongo/bson.h

@@ -114,5 +114,5 @@ class Document {
   virtual const std::list<FieldPtr>& values() const PURE;
 };
 
-} // Bson
-} // Envoy
+} // namespace Bson
+} // namespace Envoy

include/envoy/mongo/codec.h

@@ -185,5 +185,5 @@ class Encoder {
   virtual void encodeReply(const ReplyMessage& message) PURE;
 };
 
-} // Mongo
-} // Envoy
+} // namespace Mongo
+} // namespace Envoy

include/envoy/network/address.h

@@ -139,6 +139,6 @@ class Instance {
 
 typedef std::shared_ptr<const Instance> InstanceConstSharedPtr;
 
-} // Address
-} // Network
-} // Envoy
+} // namespace Address
+} // namespace Network
+} // namespace Envoy

include/envoy/network/connection.h

@@ -180,5 +180,5 @@ class ClientConnection : public virtual Connection {
 
 typedef std::unique_ptr<ClientConnection> ClientConnectionPtr;
 
-} // Network
-} // Envoy
+} // namespace Network
+} // namespace Envoy

include/envoy/network/connection_handler.h

@@ -79,5 +79,5 @@ class ConnectionHandler {
 
 typedef std::unique_ptr<ConnectionHandler> ConnectionHandlerPtr;
 
-} // Network
-} // Envoy
+} // namespace Network
+} // namespace Envoy

include/envoy/network/dns.h

@@ -54,5 +54,5 @@ class DnsResolver {
 
 typedef std::shared_ptr<DnsResolver> DnsResolverSharedPtr;
 
-} // Network
-} // Envoy
+} // namespace Network
+} // namespace Envoy

include/envoy/network/drain_decision.h

@@ -16,5 +16,5 @@ class DrainDecision {
   virtual bool drainClose() PURE;
 };
 
-} // Network
-} // Envoy
+} // namespace Network
+} // namespace Envoy

include/envoy/network/filter.h

@@ -163,5 +163,5 @@ class FilterChainFactory {
   virtual bool createFilterChain(Connection& connection) PURE;
 };
 
-} // Network
-} // Envoy
+} // namespace Network
+} // namespace Envoy

include/envoy/network/listen_socket.h

@@ -33,5 +33,5 @@ class ListenSocket {
 
 typedef std::unique_ptr<ListenSocket> ListenSocketPtr;
 
-} // Network
-} // Envoy
+} // namespace Network
+} // namespace Envoy

include/envoy/network/listener.h

@@ -70,5 +70,5 @@ class CreateListenerException : public EnvoyException {
   CreateListenerException(const std::string& what) : EnvoyException(what) {}
 };
 
-} // Network
-} // Envoy
+} // namespace Network
+} // namespace Envoy

include/envoy/ratelimit/ratelimit.h

@@ -98,5 +98,5 @@ class ClientFactory {
 
 typedef std::unique_ptr<ClientFactory> ClientFactoryPtr;
 
-} // RateLimit
-} // Envoy
+} // namespace RateLimit
+} // namespace Envoy

include/envoy/redis/codec.h

@@ -131,5 +131,5 @@ class ProtocolError : public EnvoyException {
   ProtocolError(const std::string& error) : EnvoyException(error) {}
 };
 
-} // Redis
-} // Envoy
+} // namespace Redis
+} // namespace Envoy

include/envoy/redis/command_splitter.h

@@ -57,6 +57,6 @@ class Instance {
   virtual SplitRequestPtr makeRequest(const RespValue& request, SplitCallbacks& callbacks) PURE;
 };
 
-} // CommandSplitter
-} // Redis
-} // Envoy
+} // namespace CommandSplitter
+} // namespace Redis
+} // namespace Envoy

include/envoy/redis/conn_pool.h

@@ -126,6 +126,6 @@ class Instance {
 
 typedef std::unique_ptr<Instance> InstancePtr;
 
-} // ConnPool
-} // Redis
-} // Envoy
+} // namespace ConnPool
+} // namespace Redis
+} // namespace Envoy

include/envoy/registry/registry.h

@@ -78,5 +78,5 @@ template <class T, class Base> class RegisterFactory {
   }
 };
 
-} // Registry
-} // Envoy
+} // namespace Registry
+} // namespace Envoy

include/envoy/router/rds.h

@@ -25,5 +25,5 @@ class RouteConfigProvider {
 
 typedef std::unique_ptr<RouteConfigProvider> RouteConfigProviderPtr;
 
-} // Router
-} // Envoy
+} // namespace Router
+} // namespace Envoy

include/envoy/router/router.h

@@ -322,5 +322,5 @@ class Config {
 
 typedef std::shared_ptr<const Config> ConfigConstSharedPtr;
 
-} // Router
-} // Envoy
+} // namespace Router
+} // namespace Envoy

include/envoy/router/router_ratelimit.h

@@ -87,5 +87,5 @@ class RateLimitPolicy {
   getApplicableRateLimit(uint64_t stage) const PURE;
 };
 
-} // Router
-} // Envoy
+} // namespace Router
+} // namespace Envoy

include/envoy/router/shadow_writer.h

@@ -30,5 +30,5 @@ class ShadowWriter {
 
 typedef std::unique_ptr<ShadowWriter> ShadowWriterPtr;
 
-} // Router
-} // Envoy
+} // namespace Router
+} // namespace Envoy

include/envoy/runtime/runtime.h

@@ -115,5 +115,5 @@ class Loader {
 
 typedef std::unique_ptr<Loader> LoaderPtr;
 
-} // Runtime
-} // Envoy
+} // namespace Runtime
+} // namespace Envoy