fixes to merged code

src/libutil/args.cc

@@ -101,15 +101,8 @@ bool Args::processFlag(Strings::iterator & pos, Strings::iterator end)
         std::vector<std::string> args;
         for (size_t n = 0 ; n < flag.handler.arity; ++n) {
             if (pos == end) {
-<<<<<<< HEAD
-                if (flag.arity == ArityAny) break;
-                throw UsageError("flag '%1%' requires %2% argument(s)",
-                    name,
-                    flag.arity);
-=======
                 if (flag.handler.arity == ArityAny) break;
                 throw UsageError("flag '%s' requires %d argument(s)", name, flag.handler.arity);
->>>>>>> master
             }
             args.push_back(*pos++);
         }

src/libutil/error.hh

@@ -2,6 +2,7 @@
 
 
 #include "ref.hh"
+#include "types.hh"
 
 #include <list>
 #include <memory>
@@ -21,9 +22,6 @@
 
 namespace nix {
 
-using std::list;
-using std::vector;
-
 typedef enum {
     lvlError = 0,
     lvlWarn,

src/libutil/logging.hh

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "types.hh"
+#include "error.hh"
 
 namespace nix {
 

src/libutil/types.hh

@@ -13,6 +13,7 @@ namespace nix {
 using std::list;
 using std::set;
 using std::vector;
+using std::string;
 
 typedef list<std::string> Strings;
 typedef set<std::string> StringSet;

src/libutil/url.hh

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "types.hh"
+#include "error.hh"
 
 #include <regex>
 

src/libutil/util.cc

@@ -276,7 +276,7 @@ DirEntries readDirectory(DIR *dir, const Path & path)
 DirEntries readDirectory(const Path & path)
 {
     AutoCloseDir dir(opendir(path.c_str()));
-    if (!dir) throw SysError(format("opening directory '%1%'") % path);
+    if (!dir) throw SysError("opening directory '%1%'", path);
 
     return readDirectory(dir.get(), path);
 }
@@ -306,7 +306,7 @@ string readFile(const Path & path)
 {
     AutoCloseFD fd = open(path.c_str(), O_RDONLY | O_CLOEXEC);
     if (!fd)
-        throw SysError(format("opening file '%1%'") % path);
+        throw SysError("opening file '%1%'", path);
     return readFile(fd.get());
 }
 
@@ -394,15 +394,15 @@ static void _deletePath(int parentfd, const Path & path, unsigned long long & by
         const auto PERM_MASK = S_IRUSR | S_IWUSR | S_IXUSR;
         if ((st.st_mode & PERM_MASK) != PERM_MASK) {
             if (fchmodat(parentfd, name.c_str(), st.st_mode | PERM_MASK, 0) == -1)
-                throw SysError(format("chmod '%1%'") % path);
+                throw SysError("chmod '%1%'", path);
         }
 
         int fd = openat(parentfd, path.c_str(), O_RDONLY);
         if (!fd)
-            throw SysError(format("opening directory '%1%'") % path);
+            throw SysError("opening directory '%1%'", path);
         AutoCloseDir dir(fdopendir(fd));
         if (!dir)
-            throw SysError(format("opening directory '%1%'") % path);
+            throw SysError("opening directory '%1%'", path);
         for (auto & i : readDirectory(dir.get(), path))
             _deletePath(dirfd(dir.get()), path + "/" + i.name, bytesFreed);
     }
@@ -426,7 +426,7 @@ static void _deletePath(const Path & path, unsigned long long & bytesFreed)
         // for backwards compatibility.
         if (errno == ENOENT) return;
 
-        throw SysError(format("opening directory '%1%'") % path);
+        throw SysError("opening directory '%1%'", path);
     }
 
     _deletePath(dirfd.get(), path, bytesFreed);
@@ -845,7 +845,7 @@ int Pid::kill()
 {
     assert(pid != -1);
 
-    debug(format("killing process %1%") % pid);
+    debug("killing process %1%", pid);
 
     /* Send the requested signal to the child.  If it has its own
        process group, send the signal to every process in the child
@@ -903,7 +903,7 @@ pid_t Pid::release()
 
 void killUser(uid_t uid)
 {
-    debug(format("killing all processes running under uid '%1%'") % uid);
+    debug("killing all processes running under uid '%1%'", uid);
 
     assert(uid != 0); /* just to be safe... */