wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 00:11:17 +02:00
Code Activity

Merge pull request #5932 from edolstra/remove-shared-strings

Browse source 
Remove shared strings
This commit is contained in:
Eelco Dolstra 2022-01-18 11:14:18 +01:00 • committed by GitHub
commit 3157028fc1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 145 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libutil/util.cc
View file

@ -672,7 +672,7 @@ string drainFD(int fd, bool block, const size_t reserveSize)
// not care very much about the extra memory.
StringSink sink(reserveSize + 2);
drainFD(fd, sink, block);
return std::move(*sink.s);
return std::move(sink.s);
}
@ -1057,7 +1057,7 @@ std::pair<int, std::string> runProgram(RunOptions && options)
status = e.status;
}
return {status, std::move(*sink.s)};
return {status, std::move(sink.s)};
}
void runProgram2(const RunOptions & options)