elide the 'ErrorInfo' in logError and logWarning calls

4 files changed, 82 insertions, 102 deletions

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 4630432c9..04e8d2ebe 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -1158,10 +1158,9 @@ void DerivationGoal::loadDerivation()
     trace("loading derivation");
 
     if (nrFailed != 0) {
-        logError(
-            ErrorInfo {
-                .name = "missing derivation during build",
-                .hint = hintfmt("cannot build missing derivation '%s'", worker.store.printStorePath(drvPath))
+        logError({
+            .name = "missing derivation during build",
+            .hint = hintfmt("cannot build missing derivation '%s'", worker.store.printStorePath(drvPath))
         });
         done(BuildResult::MiscFailure);
         return;
@@ -1313,12 +1312,11 @@ void DerivationGoal::repairClosure()
     /* Check each path (slow!). */
     for (auto & i : outputClosure) {
         if (worker.pathContentsGood(i)) continue;
-        logError(
-            ErrorInfo {
-                .name = "Corrupt path in closure",
-                .hint = hintfmt(
-                    "found corrupted or missing path '%s' in the output closure of '%s'",
-                    worker.store.printStorePath(i), worker.store.printStorePath(drvPath))
+        logError({
+            .name = "Corrupt path in closure",
+            .hint = hintfmt(
+                "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())
@@ -1353,12 +1351,11 @@ void DerivationGoal::inputsRealised()
     if (nrFailed != 0) {
         if (!useDerivation)
             throw Error("some dependencies of '%s' are missing", worker.store.printStorePath(drvPath));
-        logError(
-            ErrorInfo {
-                .name = "Dependencies could not be built",
-                .hint = hintfmt(
-                    "cannot build derivation '%s': %s dependencies couldn't be built",
-                    worker.store.printStorePath(drvPath), nrFailed)
+        logError({
+            .name = "Dependencies could not be built",
+            .hint = hintfmt(
+                "cannot build derivation '%s': %s dependencies couldn't be built",
+                worker.store.printStorePath(drvPath), nrFailed)
         });
         done(BuildResult::DependencyFailed);
         return;
@@ -1844,12 +1841,11 @@ HookReply DerivationGoal::tryBuildHook()
 
     } catch (SysError & e) {
         if (e.errNo == EPIPE) {
-            logError(
-                ErrorInfo {
-                    .name = "Build hook died",
-                    .hint = hintfmt(
-                        "build hook died unexpectedly: %s",
-                        chomp(drainFD(worker.hook->fromHook.readSide.get())))
+            logError({
+                .name = "Build hook died",
+                .hint = hintfmt(
+                    "build hook died unexpectedly: %s",
+                    chomp(drainFD(worker.hook->fromHook.readSide.get())))
             });
             worker.hook = 0;
             return rpDecline;
@@ -3692,11 +3688,10 @@ void DerivationGoal::registerOutputs()
         /* Apply hash rewriting if necessary. */
         bool rewritten = false;
         if (!outputRewrites.empty()) {
-            logWarning(
-                ErrorInfo {
-                    .name = "Rewriting hashes",
-                    .hint = hintfmt("rewriting hashes in '%1%'; cross fingers", path)
-                    });
+            logWarning({
+                .name = "Rewriting hashes",
+                .hint = hintfmt("rewriting hashes in '%1%'; cross fingers", path)
+            });
 
             /* Canonicalise first.  This ensures that the path we're
                rewriting doesn't contain a hard link to /etc/shadow or
@@ -3875,10 +3870,9 @@ void DerivationGoal::registerOutputs()
                 if (settings.enforceDeterminism)
                     throw NotDeterministic(hint);
 
-                logError(
-                    ErrorInfo {
-                        .name = "Output determinism error",
-                        .hint = hint
+                logError({
+                    .name = "Output determinism error",
+                    .hint = hint
                 });
 
 
@@ -4145,12 +4139,11 @@ void DerivationGoal::handleChildOutput(int fd, const string & data)
     {
         logSize += data.size();
         if (settings.maxLogSize && logSize > settings.maxLogSize) {
-            logError(
-                ErrorInfo {
-                    .name = "Max log size exceeded",
-                    .hint = hintfmt(
-                        "%1% killed after writing more than %2% bytes of log output",
-                        getName(), settings.maxLogSize)
+            logError({
+                .name = "Max log size exceeded",
+                .hint = hintfmt(
+                    "%1% killed after writing more than %2% bytes of log output",
+                    getName(), settings.maxLogSize)
             });
             killChild();
             done(BuildResult::LogLimitExceeded);
@@ -4467,12 +4460,11 @@ void SubstitutionGoal::tryNext()
         && !sub->isTrusted
         && !info->checkSignatures(worker.store, worker.store.getPublicKeys()))
     {
-        logWarning(
-            ErrorInfo {
-                .name = "Invalid path signature",
-                .hint = hintfmt("substituter '%s' does not have a valid signature for path '%s'",
-                    sub->getUri(), worker.store.printStorePath(storePath))
-            });
+        logWarning({
+            .name = "Invalid path signature",
+            .hint = hintfmt("substituter '%s' does not have a valid signature for path '%s'",
+                sub->getUri(), worker.store.printStorePath(storePath))
+        });
         tryNext();
         return;
     }
@@ -4954,12 +4946,11 @@ void Worker::waitForInput()
             j->respectTimeouts &&
             after - j->lastOutput >= std::chrono::seconds(settings.maxSilentTime))
         {
-            logError(
-                ErrorInfo {
-                    .name = "Silent build timeout",
-                    .hint = hintfmt(
-                        "%1% timed out after %2% seconds of silence",
-                        goal->getName(), settings.maxSilentTime)
+            logError({
+                .name = "Silent build timeout",
+                .hint = hintfmt(
+                    "%1% timed out after %2% seconds of silence",
+                    goal->getName(), settings.maxSilentTime)
             });
             goal->timedOut();
         }
@@ -4969,12 +4960,11 @@ void Worker::waitForInput()
             j->respectTimeouts &&
             after - j->timeStarted >= std::chrono::seconds(settings.buildTimeout))
         {
-            logError(
-                ErrorInfo {
-                    .name = "Build timeout",
-                    .hint = hintfmt(
-                        "%1% timed out after %2% seconds",
-                        goal->getName(), settings.buildTimeout)
+            logError({
+                .name = "Build timeout",
+                .hint = hintfmt(
+                    "%1% timed out after %2% seconds",
+                    goal->getName(), settings.buildTimeout)
             });
             goal->timedOut();
         }
@@ -5035,10 +5025,9 @@ bool Worker::pathContentsGood(const StorePath & path)
     }
     pathContentsGoodCache.insert_or_assign(path.clone(), res);
     if (!res)
-        logError(
-            ErrorInfo {
-                .name = "Corrupted path",
-                .hint = hintfmt("path '%s' is corrupted or missing!", store.printStorePath(path))
+        logError({
+            .name = "Corrupted path",
+            .hint = hintfmt("path '%s' is corrupted or missing!", store.printStorePath(path))
         });
     return res;
 }
diff --git a/src/libstore/filetransfer.cc b/src/libstore/filetransfer.cc
index 89588d662..6ca3393ab 100644
--- a/src/libstore/filetransfer.cc
+++ b/src/libstore/filetransfer.cc
@@ -599,12 +599,11 @@ struct curlFileTransfer : public FileTransfer
             workerThreadMain();
         } catch (nix::Interrupted & e) {
         } catch (std::exception & e) {
-            logError(
-                ErrorInfo { 
-                    .name = "File transfer",
-                    .hint = hintfmt("unexpected error in download thread: %s", 
-                                    e.what())
-                });
+            logError({ 
+                .name = "File transfer",
+                .hint = hintfmt("unexpected error in download thread: %s", 
+                                e.what())
+            });
         }
 
         {
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index abcfe5271..53fb4ce68 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -87,12 +87,11 @@ LocalStore::LocalStore(const Params & params)
 
         struct group * gr = getgrnam(settings.buildUsersGroup.get().c_str());
         if (!gr)
-            logError(
-                ErrorInfo { 
-                    .name = "'build-users-group' not found",
-                    .hint = hintfmt(
-                        "warning: the group '%1%' specified in 'build-users-group' does not exist",
-                        settings.buildUsersGroup)
+            logError({ 
+                .name = "'build-users-group' not found",
+                .hint = hintfmt(
+                    "warning: the group '%1%' specified in 'build-users-group' does not exist",
+                    settings.buildUsersGroup)
             });
         else {
             struct stat st;
@@ -1242,12 +1241,11 @@ bool LocalStore::verifyStore(bool checkContents, RepairFlag repair)
             Path linkPath = linksDir + "/" + link.name;
             string hash = hashPath(htSHA256, linkPath).first.to_string(Base32, false);
             if (hash != link.name) {
-                logError(
-                    ErrorInfo { 
-                        .name = "Invalid hash",
-                        .hint = hintfmt(
-                    "link '%s' was modified! expected hash '%s', got '%s'",
-                    linkPath, link.name, hash)
+                logError({ 
+                    .name = "Invalid hash",
+                    .hint = hintfmt(
+                        "link '%s' was modified! expected hash '%s', got '%s'",
+                        linkPath, link.name, hash)
                 });
                 if (repair) {
                     if (unlink(linkPath.c_str()) == 0)
@@ -1281,11 +1279,10 @@ bool LocalStore::verifyStore(bool checkContents, RepairFlag repair)
                 auto current = hashSink->finish();
 
                 if (info->narHash != nullHash && info->narHash != current.first) {
-                    logError(
-                        ErrorInfo { 
-                            .name = "Invalid hash - path modified",
-                            .hint = hintfmt("path '%s' was modified! expected hash '%s', got '%s'",
-                            printStorePath(i), info->narHash.to_string(), current.first.to_string())
+                    logError({ 
+                        .name = "Invalid hash - path modified",
+                        .hint = hintfmt("path '%s' was modified! expected hash '%s', got '%s'",
+                        printStorePath(i), info->narHash.to_string(), current.first.to_string())
                     });
                     if (repair) repairPath(i); else errors = true;
                 } else {
@@ -1337,10 +1334,9 @@ void LocalStore::verifyPath(const Path & pathS, const StringSet & store,
     if (!done.insert(pathS).second) return;
 
     if (!isStorePath(pathS)) {
-        logError(
-            ErrorInfo { 
-                .name = "Nix path not found",
-                .hint = hintfmt("path '%s' is not in the Nix store", pathS)
+        logError({ 
+            .name = "Nix path not found",
+            .hint = hintfmt("path '%s' is not in the Nix store", pathS)
         });
         return;
     }
@@ -1364,10 +1360,9 @@ void LocalStore::verifyPath(const Path & pathS, const StringSet & store,
             auto state(_state.lock());
             invalidatePath(*state, path);
         } else {
-            logError(
-                ErrorInfo { 
-                    .name = "Missing path with referrers",
-                    .hint = hintfmt("path '%s' disappeared, but it still has valid referrers!", pathS)
+            logError({ 
+                .name = "Missing path with referrers",
+                .hint = hintfmt("path '%s' disappeared, but it still has valid referrers!", pathS)
             });
             if (repair)
                 try {
diff --git a/src/libstore/optimise-store.cc b/src/libstore/optimise-store.cc
index c9ecca5a8..cc0507be2 100644
--- a/src/libstore/optimise-store.cc
+++ b/src/libstore/optimise-store.cc
@@ -130,10 +130,9 @@ void LocalStore::optimisePath_(Activity * act, OptimiseStats & stats,
        NixOS (example: $fontconfig/var/cache being modified).  Skip
        those files.  FIXME: check the modification time. */
     if (S_ISREG(st.st_mode) && (st.st_mode & S_IWUSR)) {
-        logWarning(
-            ErrorInfo { 
-                .name = "Suspicious file",
-                .hint = hintfmt("skipping suspicious writable file '%1%'", path)
+        logWarning({ 
+            .name = "Suspicious file",
+            .hint = hintfmt("skipping suspicious writable file '%1%'", path)
         });
         return;
     }
@@ -198,10 +197,9 @@ void LocalStore::optimisePath_(Activity * act, OptimiseStats & stats,
     }
 
     if (st.st_size != stLink.st_size) {
-        logWarning(
-            ErrorInfo { 
-                .name = "Corrupted link",
-                .hint = hintfmt("removing corrupted link '%1%'", linkPath)
+        logWarning({ 
+            .name = "Corrupted link",
+            .hint = hintfmt("removing corrupted link '%1%'", linkPath)
         });
         unlink(linkPath.c_str());
         goto retry;
@@ -237,10 +235,9 @@ void LocalStore::optimisePath_(Activity * act, OptimiseStats & stats,
     /* Atomically replace the old file with the new hard link. */
     if (rename(tempLink.c_str(), path.c_str()) == -1) {
         if (unlink(tempLink.c_str()) == -1)
-            logError(
-                ErrorInfo { 
-                    .name = "Unlink error",
-                    .hint = hintfmt("unable to unlink '%1%'", tempLink)
+            logError({ 
+                .name = "Unlink error",
+                .hint = hintfmt("unable to unlink '%1%'", tempLink)
             });
         if (errno == EMLINK) {
             /* Some filesystems generate too many links on the rename,