clang-tidy: fixes error in common::Cleanup class (#37377)

part of #28566 Signed-off-by: Takeshi Yoneda <[email protected]>
envoyproxy · Nov 27, 2024 · d9e1d22 · d9e1d22
1 parent 1f0e89b
commit d9e1d22
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/envoy/common/execution_context.h b/envoy/common/execution_context.h
@@ -115,7 +115,7 @@ class ScopedExecutionContext : NonCopyable {
       [execution_context = ExecutionContext::fromStreamInfo(trackedStream),                        \
        scoped_object = (scopedObject)] {                                                           \
         if (execution_context == nullptr) {                                                        \
-          return Envoy::Cleanup::Noop();                                                           \
+          return Envoy::Cleanup::noop();                                                           \
         }                                                                                          \
         return execution_context->onScopeEnter(scoped_object);                                     \
       }()

diff --git a/source/common/common/cleanup.h b/source/common/common/cleanup.h
@@ -24,8 +24,8 @@ class Cleanup {
 
   bool cancelled() { return cancelled_; }
 
-  static Cleanup Noop() {
-    return Cleanup([] {});
+  static Cleanup noop() {
+    return {[]() {}};
   }
 
 private:

diff --git a/test/common/common/execution_context_test.cc b/test/common/common/execution_context_test.cc
@@ -22,11 +22,11 @@ thread_local const Http::FilterContext* current_filter_context = nullptr;
 
 class TestExecutionContext : public ExecutionContext {
 public:
-  Envoy::Cleanup onScopeEnter(Envoy::Tracing::Span*) override { return Envoy::Cleanup::Noop(); }
+  Envoy::Cleanup onScopeEnter(Envoy::Tracing::Span*) override { return Envoy::Cleanup::noop(); }
 
   Envoy::Cleanup onScopeEnter(const Http::FilterContext* filter_context) override {
     if (filter_context == nullptr) {
-      return Envoy::Cleanup::Noop();
+      return Envoy::Cleanup::noop();
     }
     const Http::FilterContext* old_filter_context = current_filter_context;
     current_filter_context = filter_context;