From 98f525dc3cb20fe3a196976bac08bcb62fa30618 Mon Sep 17 00:00:00 2001 From: Benety Goh Date: Sat, 1 Aug 2020 12:00:53 -0400 Subject: SERVER-49800 remove unnecessary std::move() calls - std::move() on const ref argument to MatchExpression::parse() - noop std::move on const lambda capture (CollectionCatalog::setCollectionNamespace() rollback handler) - redundant noexcept check in embedded --- src/mongo/embedded/mongo_embedded/mongo_embedded.cpp | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'src/mongo/embedded') diff --git a/src/mongo/embedded/mongo_embedded/mongo_embedded.cpp b/src/mongo/embedded/mongo_embedded/mongo_embedded.cpp index 852a503c56f..752098ce9b9 100644 --- a/src/mongo/embedded/mongo_embedded/mongo_embedded.cpp +++ b/src/mongo/embedded/mongo_embedded/mongo_embedded.cpp @@ -439,19 +439,12 @@ void client_wire_protocol_rpc(mongo_embedded_v1_client* const client, auto outParams = std::make_tuple(client->response.response.size(), client->response.response.buf()); - // We force the output parameters to be set in a `noexcept` enabled way. If the operation - // itself - // is safely noexcept, we just run it, otherwise we force a `noexcept` over it to catch errors. - if (noexcept(std::tie(*output_size, *output) = std::move(outParams))) { + // Assigning primitives in a tied tuple should be noexcept, so we force it to be so, for + // our purposes. This facilitates a runtime check should something WEIRD happen. + [ output, output_size, &outParams ]() noexcept { std::tie(*output_size, *output) = std::move(outParams); - } else { - // Assigning primitives in a tied tuple should be noexcept, so we force it to be so, for - // our purposes. This facilitates a runtime check should something WEIRD happen. - [ output, output_size, &outParams ]() noexcept { - std::tie(*output_size, *output) = std::move(outParams); - } - (); } + (); } int capi_status_get_error(const mongo_embedded_v1_status* const status) noexcept { -- cgit v1.2.1