aboutsummaryrefslogtreecommitdiff
path: root/src/nix-store
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-05-04 16:04:52 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2016-05-04 16:16:53 +0200
commit6c75cf69c34af676b6b39ff69fcb439e7a4bda6e (patch)
treec66abd02ca1a5b5b9dedcc8d2477696f7414af23 /src/nix-store
parent0d4a10e910e1916a6f36cb9af6b68817172b51a9 (diff)
Cleanup: Remove singleton()
Diffstat (limited to 'src/nix-store')
-rw-r--r--src/nix-store/nix-store.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc
index 9bb1ac50a..0038fff03 100644
--- a/src/nix-store/nix-store.cc
+++ b/src/nix-store/nix-store.cc
@@ -64,7 +64,7 @@ static PathSet realisePath(Path path, bool build = true)
DrvPathWithOutputs p = parseDrvPathWithOutputs(path);
if (isDerivation(p.first)) {
- if (build) store->buildPaths(singleton<PathSet>(path));
+ if (build) store->buildPaths({path});
Derivation drv = store->derivationFromPath(p.first);
rootNr++;
@@ -101,7 +101,7 @@ static PathSet realisePath(Path path, bool build = true)
if (rootNr > 1) rootName += "-" + std::to_string(rootNr);
path = store->addPermRoot(path, rootName, indirectRoot);
}
- return singleton<PathSet>(path);
+ return {path};
}
}
@@ -222,7 +222,7 @@ static PathSet maybeUseOutputs(const Path & storePath, bool useOutput, bool forc
outputs.insert(i.second.path);
return outputs;
}
- else return singleton<PathSet>(storePath);
+ else return {storePath};
}
@@ -537,7 +537,7 @@ static void opDumpDB(Strings opFlags, Strings opArgs)
throw UsageError("no arguments expected");
PathSet validPaths = store->queryAllValidPaths();
for (auto & i : validPaths)
- cout << store->makeValidityRegistration(singleton<PathSet>(i), true, true);
+ cout << store->makeValidityRegistration({i}, true, true);
}