From 54b350d517932ef11de4b3d638d67ffa5cec1634 Mon Sep 17 00:00:00 2001
From: Jacek Galowicz <jacek@galowicz.de>
Date: Mon, 16 Oct 2023 21:48:02 +0100
Subject: [PATCH] Drop some moves that would happen anyway but forbid NRVO
 where appicable

---
 src/libexpr/eval.cc             | 2 +-
 src/libexpr/paths.cc            | 2 +-
 src/libstore/content-address.cc | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index 5280614a1..511a5f434 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -2290,7 +2290,7 @@ BackedStringView EvalState::coerceToString(
                     && (!v2->isList() || v2->listSize() != 0))
                     result += " ";
             }
-            return std::move(result);
+            return result;
         }
     }
 
diff --git a/src/libexpr/paths.cc b/src/libexpr/paths.cc
index 1d690b722..b6a696f47 100644
--- a/src/libexpr/paths.cc
+++ b/src/libexpr/paths.cc
@@ -4,7 +4,7 @@ namespace nix {
 
 SourcePath EvalState::rootPath(CanonPath path)
 {
-    return std::move(path);
+    return path;
 }
 
 }
diff --git a/src/libstore/content-address.cc b/src/libstore/content-address.cc
index e290a8d38..ae91b859b 100644
--- a/src/libstore/content-address.cc
+++ b/src/libstore/content-address.cc
@@ -83,7 +83,7 @@ static std::pair<ContentAddressMethod, HashType> parseContentAddressMethodPrefix
         if (!hashTypeRaw)
             throw UsageError("content address hash must be in form '<algo>:<hash>', but found: %s", wholeInput);
         HashType hashType = parseHashType(*hashTypeRaw);
-        return std::move(hashType);
+        return hashType;
     };
 
     // Switch on prefix