From 6c75cf69c34af676b6b39ff69fcb439e7a4bda6e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 4 May 2016 16:04:52 +0200
Subject: Cleanup: Remove singleton()

---
 src/nix-env/nix-env.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/nix-env/nix-env.cc')

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());
     }
-- 
cgit 1.4.1