Drop some moves that would happen anyway but forbid NRVO where appicable

This commit is contained in:
Jacek Galowicz 2023-10-16 21:48:02 +01:00
parent abf7df2b37
commit 54b350d517
3 changed files with 3 additions and 3 deletions

View file

@ -2290,7 +2290,7 @@ BackedStringView EvalState::coerceToString(
&& (!v2->isList() || v2->listSize() != 0)) && (!v2->isList() || v2->listSize() != 0))
result += " "; result += " ";
} }
return std::move(result); return result;
} }
} }

View file

@ -4,7 +4,7 @@ namespace nix {
SourcePath EvalState::rootPath(CanonPath path) SourcePath EvalState::rootPath(CanonPath path)
{ {
return std::move(path); return path;
} }
} }

View file

@ -83,7 +83,7 @@ static std::pair<ContentAddressMethod, HashType> parseContentAddressMethodPrefix
if (!hashTypeRaw) if (!hashTypeRaw)
throw UsageError("content address hash must be in form '<algo>:<hash>', but found: %s", wholeInput); throw UsageError("content address hash must be in form '<algo>:<hash>', but found: %s", wholeInput);
HashType hashType = parseHashType(*hashTypeRaw); HashType hashType = parseHashType(*hashTypeRaw);
return std::move(hashType); return hashType;
}; };
// Switch on prefix // Switch on prefix