Merge pull request #1492 from ctiller/create-pull-request/patch-a954afa

Automated fix for refs/heads/cg-cancel-nicely

src/core/ext/filters/client_channel/client_channel.cc

@@ -292,8 +292,8 @@ class ClientChannel::FilterBasedCallData : public ClientChannel::CallData {
   grpc_polling_entity* pollent_ = nullptr;
 
   // Accessed while holding ClientChannel::resolution_mu_.
-  ResolverQueuedCallCanceller* resolver_call_canceller_ ABSL_GUARDED_BY(
-      &ClientChannel::resolution_mu_) = nullptr;
+  ResolverQueuedCallCanceller* resolver_call_canceller_
+      ABSL_GUARDED_BY(&ClientChannel::resolution_mu_) = nullptr;
 
   grpc_closure* original_recv_trailing_metadata_ready_ = nullptr;
   grpc_closure recv_trailing_metadata_ready_;
@@ -884,9 +884,8 @@ class ClientChannel::SubchannelWrapper : public SubchannelInterface {
   // corresponding WrapperWatcher to cancel on the underlying subchannel.
   std::map<ConnectivityStateWatcherInterface*, WatcherWrapper*> watcher_map_
       ABSL_GUARDED_BY(*chand_->work_serializer_);
-  std::set<std::unique_ptr<DataWatcherInterface>,
-           DataWatcherLessThan> data_watchers_
-      ABSL_GUARDED_BY(*chand_->work_serializer_);
+  std::set<std::unique_ptr<DataWatcherInterface>, DataWatcherLessThan>
+      data_watchers_ ABSL_GUARDED_BY(*chand_->work_serializer_);
 };
 
 //

src/core/lib/surface/call_trace.cc

@@ -109,7 +109,8 @@ const grpc_channel_filter* PromiseTracingFilterFor(
   struct Globals {
     Mutex mu;
     absl::flat_hash_map<const grpc_channel_filter*,
-                        std::unique_ptr<DerivedFilter>> map ABSL_GUARDED_BY(mu);
+                        std::unique_ptr<DerivedFilter>>
+        map ABSL_GUARDED_BY(mu);
   };
   auto* globals = NoDestructSingleton<Globals>::Get();
   MutexLock lock(&globals->mu);

src/core/lib/transport/transport.h

@@ -288,28 +288,28 @@ class CallSpineInterface {
 
 class CallSpine final : public CallSpineInterface {
  public:
-  Pipe<ClientMetadataHandle>& client_initial_metadata() {
+  Pipe<ClientMetadataHandle>& client_initial_metadata() override {
     return client_initial_metadata_;
   }
-  Pipe<ServerMetadataHandle>& server_initial_metadata() {
+  Pipe<ServerMetadataHandle>& server_initial_metadata() override {
     return server_initial_metadata_;
   }
-  Pipe<MessageHandle>& client_to_server_messages() {
+  Pipe<MessageHandle>& client_to_server_messages() override {
     return client_to_server_messages_;
   }
-  Pipe<MessageHandle>& server_to_client_messages() {
+  Pipe<MessageHandle>& server_to_client_messages() override {
     return server_to_client_messages_;
   }
-  Pipe<ServerMetadataHandle>& server_trailing_metadata() {
+  Pipe<ServerMetadataHandle>& server_trailing_metadata() override {
     return server_trailing_metadata_;
   }
-  absl::nullopt_t Cancel(ServerMetadataHandle metadata) {
+  absl::nullopt_t Cancel(ServerMetadataHandle metadata) override {
     GPR_DEBUG_ASSERT(Activity::current() == &party());
     if (cancel_latch_.is_set()) return absl::nullopt;
     cancel_latch_.Set(std::move(metadata));
     return absl::nullopt;
   }
-  Party& party() { Crash("unimplemented"); }
+  Party& party() override { Crash("unimplemented"); }
 
  private:
   // Initial metadata from client to server