Remove std::move of const value and avoid non-movable intermediate variables

1 files changed, 8 insertions, 12 deletions

diff --git a/src/buildtool/execution_api/execution_service/execution_server.cpp b/src/buildtool/execution_api/execution_service/execution_server.cpp
index 2a1e8bca..61fd3434 100644
--- a/src/buildtool/execution_api/execution_service/execution_server.cpp
+++ b/src/buildtool/execution_api/execution_service/execution_server.cpp
@@ -287,19 +287,17 @@ namespace {
         LocalCasReader reader(&storage.CAS());
         auto const tree = reader.MakeTree(digest);
         if (not tree) {
-            auto const error =
-                fmt::format("Failed to build bazel Tree for {}", digest.hash());
-            return unexpected{std::move(error)};
+            return unexpected{fmt::format("Failed to build bazel Tree for {}",
+                                          digest.hash())};
         }
 
         auto const cas_digest =
             storage.CAS().StoreBlob(tree->SerializeAsString(),
                                     /*is_executable=*/false);
         if (not cas_digest) {
-            auto const error = fmt::format(
+            return unexpected{fmt::format(
                 "Failed to add to the storage the bazel Tree for {}",
-                digest.hash());
-            return unexpected{std::move(error)};
+                digest.hash())};
         }
         (*out_dir.mutable_tree_digest()) =
             ArtifactDigestFactory::ToBazel(*cas_digest);
@@ -317,16 +315,14 @@ namespace {
     auto const cas_path =
         storage.CAS().BlobPath(digest, /*is_executable=*/false);
     if (not cas_path) {
-        auto const error =
-            fmt::format("Failed to recover the symlink for {}", digest.hash());
-        return unexpected{std::move(error)};
+        return unexpected{
+            fmt::format("Failed to recover the symlink for {}", digest.hash())};
     }
 
     auto content = FileSystemManager::ReadFile(*cas_path);
     if (not content) {
-        auto const error = fmt::format(
-            "Failed to read the symlink content for {}", digest.hash());
-        return unexpected{std::move(error)};
+        return unexpected{fmt::format(
+            "Failed to read the symlink content for {}", digest.hash())};
     }
 
     *(out_link.mutable_target()) = *std::move(content);