diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-05-04T14·04+0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-05-04T14·16+0200 |
commit | 6c75cf69c34af676b6b39ff69fcb439e7a4bda6e (patch) | |
tree | c66abd02ca1a5b5b9dedcc8d2477696f7414af23 /src/nix-env/nix-env.cc | |
parent | 0d4a10e910e1916a6f36cb9af6b68817172b51a9 (diff) |
Cleanup: Remove singleton()
Diffstat (limited to 'src/nix-env/nix-env.cc')
-rw-r--r-- | src/nix-env/nix-env.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc index 6bc8d79bc1bb..6b6c245d3637 100644 --- a/src/nix-env/nix-env.cc +++ b/src/nix-env/nix-env.cc @@ -224,7 +224,7 @@ static bool isPrebuilt(EvalState & state, DrvInfo & elem) { Path path = elem.queryOutPath(); if (state.store->isValidPath(path)) return true; - PathSet ps = state.store->querySubstitutablePaths(singleton<PathSet>(path)); + PathSet ps = state.store->querySubstitutablePaths({path}); return ps.find(path) != ps.end(); } @@ -710,13 +710,13 @@ static void opSet(Globals & globals, Strings opFlags, Strings opArgs) drv.name = globals.forceName; if (drv.queryDrvPath() != "") { - PathSet paths = singleton<PathSet>(drv.queryDrvPath()); + PathSet paths = {drv.queryDrvPath()}; printMissing(globals.state->store, paths); if (globals.dryRun) return; globals.state->store->buildPaths(paths, globals.state->repair ? bmRepair : bmNormal); } else { - printMissing(globals.state->store, singleton<PathSet>(drv.queryOutPath())); + printMissing(globals.state->store, {drv.queryOutPath()}); if (globals.dryRun) return; globals.state->store->ensurePath(drv.queryOutPath()); } |