Remove redundant std::move's

XRPLF · Oct 21, 2024 · 633707a · 633707a
1 parent 0b2abe6
commit 633707a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
diff --git a/src/web/ng/Server.cpp b/src/web/ng/Server.cpp
@@ -24,7 +24,6 @@
 #include "util/config/Config.hpp"
 #include "util/log/Logger.hpp"
 #include "web/ng/Connection.hpp"
-#include "web/ng/Error.hpp"
 #include "web/ng/MessageHandler.hpp"
 #include "web/ng/impl/HttpConnection.hpp"
 #include "web/ng/impl/ServerSslContext.hpp"
@@ -87,7 +86,7 @@ makeAcceptor(boost::asio::io_context& context, boost::asio::ip::tcp::endpoint co
     } catch (boost::system::system_error const& error) {
         return std::unexpected{fmt::format("Error creating TCP acceptor: {}", error.what())};
     }
-    return std::move(acceptor);
+    return acceptor;
 }
 
 std::expected<std::string, boost::system::system_error>

diff --git a/src/web/ng/impl/HttpConnection.hpp b/src/web/ng/impl/HttpConnection.hpp
@@ -127,7 +127,7 @@ class HttpConnection : public UpgradableConnection {
         if (request_.has_value()) {
             Request result{std::move(request_).value()};
             request_.reset();
-            return std::move(result);
+            return result;
         }
         auto expectedRequest = fetch(yield, timeout);
         if (expectedRequest.has_value())
@@ -208,7 +208,7 @@ class HttpConnection : public UpgradableConnection {
         boost::beast::http::async_read(stream_, buffer_, request, yield[error]);
         if (error)
             return std::unexpected{error};
-        return std::move(request);
+        return request;
     }
 };
 

diff --git a/src/web/ng/impl/WsConnection.cpp b/src/web/ng/impl/WsConnection.cpp
@@ -51,7 +51,7 @@ make_PlainWsConnection(
     auto maybeError = connection->performHandshake(yield);
     if (maybeError.has_value())
         return std::unexpected{maybeError.value()};
-    return std::move(connection);
+    return connection;
 }
 
 std::expected<std::unique_ptr<SslWsConnection>, Error>
@@ -71,7 +71,7 @@ make_SslWsConnection(
     auto maybeError = connection->performHandshake(yield);
     if (maybeError.has_value())
         return std::unexpected{maybeError.value()};
-    return std::move(connection);
+    return connection;
 }
 
 }  // namespace web::ng::impl
diff --git a/src/web/ng/impl/WsConnection.hpp b/src/web/ng/impl/WsConnection.hpp
@@ -122,7 +122,7 @@ class WsConnection : public Connection {
             [this, &response](auto&& yield) { stream_.async_write(response.asConstBuffer(), yield); }, yield, timeout
         );
         if (error)
-            return std::move(error);
+            return error;
         return std::nullopt;
     }
 

diff --git a/tests/common/util/TestHttpClient.cpp b/tests/common/util/TestHttpClient.cpp
@@ -232,7 +232,7 @@ HttpAsyncClient::receive(boost::asio::yield_context yield, std::chrono::steady_c
     http::async_read(stream_, buffer_, response, yield[error]);
     if (error)
         return std::unexpected{error};
-    return std::move(response);
+    return response;
 }
 
 void

diff --git a/tests/unit/web/ng/impl/ConnectionHandlerTests.cpp b/tests/unit/web/ng/impl/ConnectionHandlerTests.cpp
@@ -295,9 +295,13 @@ TEST_F(ConnectionHandlerSequentialProcessingTest, Stop)
 }
 
 struct ConnectionHandlerParallelProcessingTest : ConnectionHandlerTest {
-    static size_t const maxParallelRequests = 3;
+    static size_t constexpr maxParallelRequests = 3;
+
     ConnectionHandlerParallelProcessingTest()
-        : ConnectionHandlerTest(ConnectionHandler::ProcessingPolicy::Parallel, maxParallelRequests)
+        : ConnectionHandlerTest(
+              ConnectionHandler::ProcessingPolicy::Parallel,
+              ConnectionHandlerParallelProcessingTest::maxParallelRequests
+          )
     {
     }