ClangTidy issue in lib/system/Route.hpp #1296

Author: HIROSN

lib/offline/StorageObserver.cpp

@@ -45,7 +45,7 @@ namespace MAT_NS_BEGIN {
     {
         auto consumer = [&ctx, this](StorageRecord&& record) -> bool {
             bool wantMore = true;
-            retrievedEvent(ctx, std::move(record), wantMore);
+            retrievedEvent(ctx, record, wantMore);
             return wantMore;
         };
 

lib/system/Route.hpp

@@ -99,15 +99,15 @@ namespace MAT_NS_BEGIN {
         }
 
         template<typename... TRealArgs>
-        void operator()(TRealArgs&& ... args) const
+        void operator()(TRealArgs ... args) const
         {
             for (IRoutePassThrough<TArgs...>* target : m_passthroughs) {
-                if (!(*target)(std::forward<TRealArgs>(args) ...)) {
+                if (!(*target)(args ...)) {
                     return;
                 }
             }
             if (m_target) {
-                (*m_target)(std::forward<TRealArgs>(args) ...);
+                (*m_target)(args ...);
             }
         }
 

tests/unittests/RouteTests.cpp

@@ -64,19 +64,16 @@ class RouteTests : public StrictMock<Test> {
     RouteSink<RouteTests, int>                                                             sink1{this, &RouteTests::handleSink1};
     RoutePassThrough<RouteTests, int>                                                      passThrough1a{this, &RouteTests::handlePassThrough1a};
     RoutePassThrough<RouteTests, int>                                                      passThrough1b{this, &RouteTests::handlePassThrough1b};
-    RouteSink<RouteTests, int, bool&, NonCopyableThing const&, Canary, std::vector<int>&&> sink5{this, &RouteTests::handleSink5x};
+    RouteSink<RouteTests, int, bool&, NonCopyableThing const&, Canary, std::vector<int>&>  sink5{this, &RouteTests::handleSink5x};
 
     MOCK_METHOD0(handleSink0, void());
     MOCK_METHOD1(handleSink1, void(int));
     MOCK_METHOD1(handlePassThrough1a, bool(int));
     MOCK_METHOD1(handlePassThrough1b, bool(int));
     MOCK_METHOD4(handleSink5, void(int, bool&, NonCopyableThing const &, Canary));
 
-    void handleSink5x(int a, bool& b, NonCopyableThing const& c, Canary d, std::vector<int>&& e)
+    void handleSink5x(int a, bool& b, NonCopyableThing const& c, Canary d, std::vector<int>& e)
     {
-        // This extra function exists just to handle the r-value reference.
-        // The move cannot be done properly in a mocked method.
-        std::vector<int> x = std::move(e);
         handleSink5(a, b, c, d);
     }
 };
@@ -99,7 +96,7 @@ TEST_F(RouteTests, SinkPassesArgsAsDefined)
         SetArgReferee<1>(true),
         InvokeArgument<3>()
         ));
-    sink5(123, flag, thing, canary, std::move(data));
+    sink5(123, flag, thing, canary, data);
 
     EXPECT_THAT(flag, true);
     EXPECT_THAT(canary, Eq("alive"));
@@ -117,7 +114,7 @@ TEST_F(RouteTests, SourceCallsSink)
     RouteSource<> source0;
     source0 >> sink0;
 
-    RouteSource<int, bool&, NonCopyableThing const&, Canary, std::vector<int>&&> source5;
+    RouteSource<int, bool&, NonCopyableThing const&, Canary, std::vector<int>&> source5;
     source5 >> sink5;
 
 
@@ -137,7 +134,7 @@ TEST_F(RouteTests, SourceCallsSink)
         SetArgReferee<1>(true),
         InvokeArgument<3>()
         ));
-    source5(123, flag, thing, canary, std::move(data));
+    source5(123, flag, thing, canary, data);
     EXPECT_THAT(flag, true);
     EXPECT_THAT(canary, Eq("alive"));
     EXPECT_THAT(data, IsEmpty());