maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup: Remove singleton()

Browse source
This commit is contained in:
Eelco Dolstra 2016-05-04 16:04:52 +02:00
parent 0d4a10e910
commit 6c75cf69c3
9 changed files with 23 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libstore/build.cc
View file

@ -2145,8 +2145,7 @@ void DerivationGoal::startBuilder()
/* parent */
pid.setSeparatePG(true);
builderOut.writeSide.close();
worker.childStarted(shared_from_this(),
singleton<set<int> >(builderOut.readSide), true, true);
worker.childStarted(shared_from_this(), {builderOut.readSide}, true, true);
/* Check if setting up the build environment failed. */
while (true) {
@ -3698,7 +3697,7 @@ void LocalStore::ensurePath(const Path & path)
Worker worker(*this);
GoalPtr goal = worker.makeSubstitutionGoal(path);
Goals goals = singleton<Goals>(goal);
Goals goals = {goal};
worker.run(goals);
@ -3711,7 +3710,7 @@ void LocalStore::repairPath(const Path & path)
{
Worker worker(*this);
GoalPtr goal = worker.makeSubstitutionGoal(path, true);
Goals goals = singleton<Goals>(goal);
Goals goals = {goal};
worker.run(goals);

4
src/libstore/local-store.cc
View file

@ -949,7 +949,7 @@ Path LocalStore::addToStoreFromDump(const string & dump, const string & name,
/* The first check above is an optimisation to prevent
unnecessary lock acquisition. */
PathLocks outputLock(singleton<PathSet, Path>(dstPath));
PathLocks outputLock({dstPath});
if (repair || !isValidPath(dstPath)) {
@ -1018,7 +1018,7 @@ Path LocalStore::addTextToStore(const string & name, const string & s,
if (repair || !isValidPath(dstPath)) {
PathLocks outputLock(singleton<PathSet, Path>(dstPath));
PathLocks outputLock({dstPath});
if (repair || !isValidPath(dstPath)) {

3
src/libstore/profiles.cc
View file

@ -222,8 +222,7 @@ void switchLink(Path link, Path target)
void lockProfile(PathLocks & lock, const Path & profile)
{
lock.lockPaths(singleton<PathSet>(profile),
(format("waiting for lock on profile ‘%1%’") % profile).str());
lock.lockPaths({profile}, (format("waiting for lock on profile ‘%1%’") % profile).str());
lock.setDeletion(true);
}