aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/libexpr/parser.y2
-rw-r--r--src/libexpr/primops.cc59
-rw-r--r--src/libexpr/primops/context.cc2
-rw-r--r--src/libexpr/primops/fetchMercurial.cc1
-rw-r--r--src/libstore/build.cc40
-rw-r--r--src/libstore/gc.cc1
-rw-r--r--src/libstore/local-store.cc2
-rw-r--r--src/libstore/sqlite.cc2
-rw-r--r--src/libstore/sqlite.hh2
-rw-r--r--src/libutil/types.hh8
-rw-r--r--src/nix-daemon/nix-daemon.cc4
-rw-r--r--src/nix-env/nix-env.cc6
-rw-r--r--src/nix-store/nix-store.cc2
13 files changed, 54 insertions, 77 deletions
diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y
index 49fb8ad37..0417a3c21 100644
--- a/src/libexpr/parser.y
+++ b/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),
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 657ce3001..d21c49813 100644
--- a/src/libexpr/primops.cc
+++ b/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));
@@ -179,7 +178,7 @@ void prim_importNative(EvalState & state, const Pos & pos, Value * * args, Value
ErrorInfo {
.hint = hintfmt(
"cannot import '%1%', since path '%2%' is not valid",
- path, e.path),
+ path, e.path),
.nixCode = NixCode { .errPos = pos }
});
}
@@ -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"
- , sym, path);
+ throw EvalError("symbol '%1%' from '%2%' resolved to NULL when a function pointer was expected",
+ 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"
- , program, e.path),
+ .hint = hintfmt("cannot execute '%1%', since path '%2%' is not valid",
+ 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;
@@ -2038,16 +2029,16 @@ void prim_match(EvalState & state, const Pos & pos, Value * * args, Value & v)
if (e.code() == std::regex_constants::error_space) {
// limit is _GLIBCXX_REGEX_STATE_LIMIT for libstdc++
throw EvalError(
- ErrorInfo {
- .hint = hintfmt("memory limit exceeded by regular expression '%s'", re),
+ ErrorInfo {
+ .hint = hintfmt("memory limit exceeded by regular expression '%s'", re),
.nixCode = NixCode { .errPos = pos }
});
} else {
- throw EvalError(
- ErrorInfo {
- .hint = hintfmt("invalid regular expression '%s'", re),
- .nixCode = NixCode { .errPos = pos }
- });
+ throw EvalError(
+ ErrorInfo {
+ .hint = hintfmt("invalid regular expression '%s'", re),
+ .nixCode = NixCode { .errPos = pos }
+ });
}
}
}
@@ -2111,19 +2102,19 @@ static void prim_split(EvalState & state, const Pos & pos, Value * * args, Value
} catch (std::regex_error &e) {
if (e.code() == std::regex_constants::error_space) {
- // limit is _GLIBCXX_REGEX_STATE_LIMIT for libstdc++
- throw EvalError(
- ErrorInfo {
- .hint = hintfmt("memory limit exceeded by regular expression '%s'", re),
- .nixCode = NixCode { .errPos = pos }
- });
- } else {
- throw EvalError(
- ErrorInfo {
- .hint = hintfmt("invalid regular expression '%s'", re),
- .nixCode = NixCode { .errPos = pos }
- });
- }
+ // limit is _GLIBCXX_REGEX_STATE_LIMIT for libstdc++
+ throw EvalError(
+ ErrorInfo {
+ .hint = hintfmt("memory limit exceeded by regular expression '%s'", re),
+ .nixCode = NixCode { .errPos = pos }
+ });
+ } else {
+ throw EvalError(
+ ErrorInfo {
+ .hint = hintfmt("invalid regular expression '%s'", re),
+ .nixCode = NixCode { .errPos = pos }
+ });
+ }
}
}
diff --git a/src/libexpr/primops/context.cc b/src/libexpr/primops/context.cc
index 768936453..7f895fc01 100644
--- a/src/libexpr/primops/context.cc
+++ b/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));
}
diff --git a/src/libexpr/primops/fetchMercurial.cc b/src/libexpr/primops/fetchMercurial.cc
index 1e8b9d4a0..bb008ba6b 100644
--- a/src/libexpr/primops/fetchMercurial.cc
+++ b/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())
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 961110d58..64bc9c4b8 100644
--- a/src/libstore/build.cc
+++ b/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 = std::optional(hintfmt("diff hook execution failed: %s", prevhint));
+ ei.hint = hintfmt("diff hook execution failed: %s",
+ (error.info().hint.has_value() ? error.info().hint->str() : ""));
logError(ei);
}
}
@@ -1151,7 +1151,7 @@ void DerivationGoal::loadDerivation()
if (nrFailed != 0) {
logError(
- ErrorInfo {
+ ErrorInfo {
.name = "missing derivation during build",
.hint = hintfmt("cannot build missing derivation '%s'", worker.store.printStorePath(drvPath))
});
@@ -1306,13 +1306,12 @@ void DerivationGoal::repairClosure()
for (auto & i : outputClosure) {
if (worker.pathContentsGood(i)) continue;
logError(
- ErrorInfo {
+ 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))
});
-
auto drvPath2 = outputsToDrv.find(i);
if (drvPath2 == outputsToDrv.end())
addWaitee(worker.makeSubstitutionGoal(i, Repair));
@@ -1347,7 +1346,7 @@ void DerivationGoal::inputsRealised()
if (!useDerivation)
throw Error("some dependencies of '%s' are missing", worker.store.printStorePath(drvPath));
logError(
- ErrorInfo {
+ ErrorInfo {
.name = "Dependencies could not be built",
.hint = hintfmt(
"cannot build derivation '%s': %s dependencies couldn't be built",
@@ -1811,7 +1810,7 @@ HookReply DerivationGoal::tryBuildHook()
} catch (SysError & e) {
if (e.errNo == EPIPE) {
logError(
- ErrorInfo {
+ ErrorInfo {
.name = "Build hook died",
.hint = hintfmt(
"build hook died unexpectedly: %s",
@@ -3676,7 +3675,7 @@ void DerivationGoal::registerOutputs()
if (!outputRewrites.empty()) {
logWarning(
ErrorInfo {
- .name = "Rewriting hashes",
+ .name = "Rewriting hashes",
.hint = hintfmt("rewriting hashes in '%1%'; cross fingers", path)
});
@@ -3856,7 +3855,7 @@ void DerivationGoal::registerOutputs()
throw NotDeterministic(hint);
logError(
- ErrorInfo {
+ ErrorInfo {
.name = "Output determinism error",
.hint = hint
});
@@ -4124,7 +4123,7 @@ void DerivationGoal::handleChildOutput(int fd, const string & data)
logSize += data.size();
if (settings.maxLogSize && logSize > settings.maxLogSize) {
logError(
- ErrorInfo {
+ ErrorInfo {
.name = "Max log size exceeded",
.hint = hintfmt(
"%1% killed after writing more than %2% bytes of log output",
@@ -4447,9 +4446,9 @@ void SubstitutionGoal::tryNext()
{
logWarning(
ErrorInfo {
- .name = "Invalid path signature",
+ .name = "Invalid path signature",
.hint = hintfmt("substituter '%s' does not have a valid signature for path '%s'",
- sub->getUri(), worker.store.printStorePath(storePath))
+ sub->getUri(), worker.store.printStorePath(storePath))
});
tryNext();
return;
@@ -4809,7 +4808,7 @@ void Worker::run(const Goals & _topGoals)
if (!children.empty() || !waitingForAWhile.empty())
waitForInput();
else {
- if (awake.empty() && 0 == settings.maxBuildJobs)
+ if (awake.empty() && 0 == settings.maxBuildJobs)
throw Error("unable to start any build; either increase '--max-jobs' "
"or enable remote builds");
assert(!awake.empty());
@@ -4933,7 +4932,7 @@ void Worker::waitForInput()
after - j->lastOutput >= std::chrono::seconds(settings.maxSilentTime))
{
logError(
- ErrorInfo {
+ ErrorInfo {
.name = "Silent build timeout",
.hint = hintfmt(
"%1% timed out after %2% seconds of silence",
@@ -4948,7 +4947,7 @@ void Worker::waitForInput()
after - j->timeStarted >= std::chrono::seconds(settings.buildTimeout))
{
logError(
- ErrorInfo {
+ ErrorInfo {
.name = "Build timeout",
.hint = hintfmt(
"%1% timed out after %2% seconds",
@@ -4969,9 +4968,6 @@ void Worker::waitForInput()
}
-
-
-
unsigned int Worker::exitStatus()
{
/*
@@ -5015,9 +5011,9 @@ bool Worker::pathContentsGood(const StorePath & path)
res = info->narHash == nullHash || info->narHash == current.first;
}
pathContentsGoodCache.insert_or_assign(path.clone(), res);
- if (!res)
+ if (!res)
logError(
- ErrorInfo {
+ ErrorInfo {
.name = "Corrupted path",
.hint = hintfmt("path '%s' is corrupted or missing!", store.printStorePath(path))
});
@@ -5136,8 +5132,4 @@ void LocalStore::repairPath(const StorePath & path)
}
-
}
-
-
-
diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc
index d53d458e9..92f9328c3 100644
--- a/src/libstore/gc.cc
+++ b/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",
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index 194eefc78..6f88a3e32 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -504,7 +504,7 @@ static void canonicalisePathMetaData_(const Path & path, uid_t fromUid, InodesSe
chown(path.c_str(), geteuid(), getegid()) == -1)
#endif
throw SysError("changing owner of '%1%' to %2%",
- path, geteuid());
+ path, geteuid());
}
if (S_ISDIR(st.st_mode)) {
diff --git a/src/libstore/sqlite.cc b/src/libstore/sqlite.cc
index 34ef5e57b..16cdb6619 100644
--- a/src/libstore/sqlite.cc
+++ b/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};
diff --git a/src/libstore/sqlite.hh b/src/libstore/sqlite.hh
index ccfac48d8..dd81ab051 100644
--- a/src/libstore/sqlite.hh
+++ b/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. */
diff --git a/src/libutil/types.hh b/src/libutil/types.hh
index 4d783b564..66072e8f7 100644
--- a/src/libutil/types.hh
+++ b/src/libutil/types.hh
@@ -15,13 +15,13 @@ using std::set;
using std::vector;
using std::string;
-typedef list<std::string> Strings;
-typedef set<std::string> StringSet;
-typedef std::map<std::string, std::string> StringMap;
+typedef list<string> Strings;
+typedef set<string> StringSet;
+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;
diff --git a/src/nix-daemon/nix-daemon.cc b/src/nix-daemon/nix-daemon.cc
index 731ab22e5..582c78d14 100644
--- a/src/nix-daemon/nix-daemon.cc
+++ b/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%", prevhint));
+ ei.hint = std::optional(hintfmt("error processing connection: %1%",
+ (error.info().hint.has_value() ? error.info().hint->str() : "")));
logError(ei);
}
}
diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc
index 0f99f5fe1..bbce5dcda 100644
--- a/src/nix-env/nix-env.cc
+++ b/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);
@@ -1233,7 +1233,7 @@ static void switchGeneration(Globals & globals, int dstGen)
if (!dst) {
if (dstGen == prevGen)
throw Error("no generation older than the current (%1%) exists",
- curGen);
+ curGen);
else
throw Error("generation %1% does not exist", dstGen);
}
diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc
index 9b5cceccf..77deea5a7 100644
--- a/src/nix-store/nix-store.cc
+++ b/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),
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 14:49:02 +0000