formatting and a few minor changes

src/libexpr/parser.y

@@ -427,7 +427,6 @@ expr_simple
                   .hint = hintfmt("URL literals are disabled"),
                   .nixCode = NixCode { .errPos = CUR_POS }
               });
-
       $$ = new ExprString(data->symbols.create($1));
   }
   | '(' expr ')' { $$ = $2; }
@@ -696,7 +695,6 @@ Path EvalState::findFile(SearchPath & searchPath, const string & path, const Pos
         Path res = r.second + suffix;
         if (pathExists(res)) return canonPath(res);
     }
-
     throw ThrownError(
         ErrorInfo { 
             .hint = hintfmt("file '%1%' was not found in the Nix search path (add it using $NIX_PATH or -I)", path),

src/libexpr/primops.cc

@@ -99,7 +99,6 @@ static void prim_scopedImport(EvalState & state, const Pos & pos, Value * * args
                         path, e.path),
                 .nixCode = NixCode { .errPos = pos }
             });
-
     }
 
     Path realPath = state.checkSourcePath(state.toRealPath(path, context));
@@ -199,8 +198,8 @@ void prim_importNative(EvalState & state, const Pos & pos, Value * * args, Value
         if (message)
             throw EvalError("could not load symbol '%1%' from '%2%': %3%", sym, path, message);
         else
-            throw EvalError("symbol '%1%' from '%2%' resolved to NULL when a function pointer was expected"
+            throw EvalError("symbol '%1%' from '%2%' resolved to NULL when a function pointer was expected",
-                   , sym, path);
+                sym, path);
     }
 
     (func)(state, v);
@@ -233,8 +232,8 @@ void prim_exec(EvalState & state, const Pos & pos, Value * * args, Value & v)
     } catch (InvalidPathError & e) {
         throw EvalError(
             ErrorInfo {
-                .hint = hintfmt("cannot execute '%1%', since path '%2%' is not valid"
+                .hint = hintfmt("cannot execute '%1%', since path '%2%' is not valid",
-                     , program, e.path),
+                    program, e.path),
                 .nixCode = NixCode { .errPos = pos }
             });}
 
@@ -625,8 +624,6 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
                             .hint = hintfmt("duplicate derivation output '%1%'", j),
                             .nixCode = NixCode { .errPos = posDrvName }
                         });
-
-
                 /* !!! Check whether j is a valid attribute
                    name. */
                 /* Derivations cannot be named ‘drv’, because
@@ -638,7 +635,6 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
                             .hint = hintfmt("invalid derivation output name 'drv'" ),
                             .nixCode = NixCode { .errPos = posDrvName }
                         });
-
                 outputs.insert(j);
             }
             if (outputs.empty())
@@ -1236,7 +1232,6 @@ static void prim_path(EvalState & state, const Pos & pos, Value * * args, Value
                             path),
                         .nixCode = NixCode { .errPos = *attr.pos }
                     });
-
         } else if (attr.name == state.sName)
             name = state.forceStringNoCtx(*attr.value, *attr.pos);
         else if (n == "filter") {
@@ -1322,7 +1317,6 @@ void prim_getAttr(EvalState & state, const Pos & pos, Value * * args, Value & v)
                 .hint = hintfmt("attribute '%1%' missing", attr),
                 .nixCode = NixCode { .errPos = pos }
             });
-
     // !!! add to stack trace?
     if (state.countCalls && i->pos) state.attrSelects[*i->pos]++;
     state.forceValue(*i->value, pos);
@@ -1407,7 +1401,6 @@ static void prim_listToAttrs(EvalState & state, const Pos & pos, Value * * args,
                     .hint = hintfmt("'name' attribute missing in a call to 'listToAttrs'"), 
                     .nixCode = NixCode { .errPos = pos }
                 });
-
         string name = state.forceStringNoCtx(*j->value, pos);
 
         Symbol sym = state.symbols.create(name);
@@ -1419,7 +1412,6 @@ static void prim_listToAttrs(EvalState & state, const Pos & pos, Value * * args,
                         .hint = hintfmt("'value' attribute missing in a call to 'listToAttrs'"), 
                         .nixCode = NixCode { .errPos = pos }
                     });
-
             v.attrs->push_back(Attr(sym, j2->value, j2->pos));
         }
     }
@@ -1498,7 +1490,6 @@ static void prim_functionArgs(EvalState & state, const Pos & pos, Value * * args
                 .nixCode = NixCode { .errPos = pos }
             });
 
-
     if (!args[0]->lambda.fun->matchAttrs) {
         state.mkAttrs(v, 0);
         return;

src/libexpr/primops/context.cc

@@ -151,7 +151,6 @@ static void prim_appendContext(EvalState & state, const Pos & pos, Value * * arg
                     .hint = hintfmt("Context key '%s' is not a store path", i.name),
                     .nixCode = NixCode { .errPos = *i.pos }
                 });
-
         if (!settings.readOnlyMode)
             state.store->ensurePath(state.store->parseStorePath(i.name));
         state.forceAttrs(*i.value, *i.pos);
@@ -170,7 +169,6 @@ static void prim_appendContext(EvalState & state, const Pos & pos, Value * * arg
                             .hint = hintfmt("Tried to add all-outputs context of %s, which is not a derivation, to a string", i.name),
                             .nixCode = NixCode { .errPos = *i.pos }
                         });
-
                 }
                 context.insert("=" + string(i.name));
             }

src/libexpr/primops/fetchMercurial.cc

@@ -43,7 +43,6 @@ static void prim_fetchMercurial(EvalState & state, const Pos & pos, Value * * ar
                         .hint = hintfmt("unsupported argument '%s' to 'fetchMercurial'", attr.name),
                         .nixCode = NixCode { .errPos = *attr.pos }
                     });
-
         }
 
         if (url.empty())

src/libstore/build.cc

@@ -497,8 +497,8 @@ void handleDiffHook(
                 printError(chomp(diffRes.second));
         } catch (Error & error) {
             ErrorInfo ei = error.info();
-            string prevhint = (error.info().hint.has_value() ? error.info().hint->str() : "");
+            ei.hint = hintfmt("diff hook execution failed: %s",
-            ei.hint = std::optional(hintfmt("diff hook execution failed: %s", prevhint));
+                (error.info().hint.has_value() ? error.info().hint->str() : ""));
             logError(ei);
         }
     }
@@ -1312,7 +1312,6 @@ void DerivationGoal::repairClosure()
                     "found corrupted or missing path '%s' in the output closure of '%s'",
                     worker.store.printStorePath(i), worker.store.printStorePath(drvPath))
         });
-
         auto drvPath2 = outputsToDrv.find(i);
         if (drvPath2 == outputsToDrv.end())
             addWaitee(worker.makeSubstitutionGoal(i, Repair));
@@ -4969,9 +4968,6 @@ void Worker::waitForInput()
 }
 
 
-
-
-
 unsigned int Worker::exitStatus()
 {
     /*
@@ -5136,8 +5132,4 @@ void LocalStore::repairPath(const StorePath & path)
 }
 
 
-
 }
-
-
-

src/libstore/gc.cc

@@ -129,7 +129,6 @@ Path LocalFSStore::addPermRoot(const StorePath & storePath,
     if (settings.checkRootReachability) {
         auto roots = findRoots(false);
         if (roots[storePath.clone()].count(gcRoot) == 0)
-
             logWarning(
                 ErrorInfo { 
                     .name = "GC root",

src/libstore/sqlite.cc

@@ -196,7 +196,7 @@ SQLiteTxn::~SQLiteTxn()
     }
 }
 
-void handleSQLiteBusy(SQLiteBusy & e)
+void handleSQLiteBusy(const SQLiteBusy & e)
 {
     static std::atomic<time_t> lastWarned{0};
 

src/libstore/sqlite.hh

@@ -99,7 +99,7 @@ MakeError(SQLiteBusy, SQLiteError);
 
 [[noreturn]] void throwSQLiteError(sqlite3 * db, const FormatOrString & fs);
 
-void handleSQLiteBusy(SQLiteBusy & e);
+void handleSQLiteBusy(const SQLiteBusy & e);
 
 /* Convenience function for retrying a SQLite transaction when the
    database is busy. */

src/libutil/types.hh

@@ -15,13 +15,13 @@ using std::set;
 using std::vector;
 using std::string;
 
-typedef list<std::string> Strings;
+typedef list<string> Strings;
-typedef set<std::string> StringSet;
+typedef set<string> StringSet;
-typedef std::map<std::string, std::string> StringMap;
+typedef std::map<string, string> StringMap;
 
 /* Paths are just strings. */
 
-typedef std::string Path;
+typedef string Path;
 typedef list<Path> Paths;
 typedef set<Path> PathSet;
 

src/nix-daemon/nix-daemon.cc

@@ -248,8 +248,8 @@ static void daemonLoop(char * * argv)
             return;
         } catch (Error & error) {
             ErrorInfo ei = error.info();
-            string prevhint = (error.info().hint.has_value() ? error.info().hint->str() : "");
+            ei.hint = std::optional(hintfmt("error processing connection: %1%",
-            ei.hint = std::optional(hintfmt("error processing connection: %1%", prevhint));
+                (error.info().hint.has_value() ? error.info().hint->str() : "")));
             logError(ei);
         }
     }

src/nix-env/nix-env.cc

@@ -69,7 +69,7 @@ typedef void (* Operation) (Globals & globals,
 static string needArg(Strings::iterator & i,
     Strings & args, const string & arg)
 {
-    if (i == args.end()) throw UsageError( "'%1%' requires an argument", arg);
+    if (i == args.end()) throw UsageError("'%1%' requires an argument", arg);
     return *i++;
 }
 
@@ -151,7 +151,7 @@ static void loadSourceExpr(EvalState & state, const Path & path, Value & v)
 {
     struct stat st;
     if (stat(path.c_str(), &st) == -1)
-        throw SysError("getting inon about '%1%'", path);
+        throw SysError("getting information about '%1%'", path);
 
     if (isNixExpr(path, st))
         state.evalFile(path, v);

src/nix-store/nix-store.cc

@@ -731,7 +731,7 @@ static void opVerifyPath(Strings opFlags, Strings opArgs)
         if (current.first != info->narHash) {
             logError(
                 ErrorInfo { 
-                    .name = "Hash match error",
+                    .name = "Hash mismatch",
                     .hint = hintfmt(
                         "path '%s' was modified! expected hash '%s', got '%s'",
                         store->printStorePath(path),