aboutsummaryrefslogtreecommitdiff
path: root/src/nix/repl.cc
diff options
context:
space:
mode:
authorBen Burdette <bburdette@gmail.com>2020-04-21 17:07:07 -0600
committerBen Burdette <bburdette@gmail.com>2020-04-21 17:07:07 -0600
commite4fb9a38493a041861fe5c75bc8ddd129a2e5262 (patch)
tree114bedc4dd31da6ebaf6e9b2ebe5f3d6b7b6d274 /src/nix/repl.cc
parentd3052197feababc312fd874e08ae48050d985eb3 (diff)
remove 'format' from Error constructor calls
Diffstat (limited to 'src/nix/repl.cc')
-rw-r--r--src/nix/repl.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nix/repl.cc b/src/nix/repl.cc
index 27727bd25..c770fd4a4 100644
--- a/src/nix/repl.cc
+++ b/src/nix/repl.cc
@@ -252,12 +252,12 @@ void NixRepl::mainLoop(const std::vector<std::string> & files)
// input without clearing the input so far.
continue;
} else {
- printMsg(lvlError, format(error + "%1%%2%") % (settings.showTrace ? e.prefix() : "") % e.msg());
+ printMsg(lvlError, error + "%1%%2%", (settings.showTrace ? e.prefix() : ""), e.msg());
}
} catch (Error & e) {
- printMsg(lvlError, format(error + "%1%%2%") % (settings.showTrace ? e.prefix() : "") % e.msg());
+ printMsg(lvlError, error + "%1%%2%", (settings.showTrace ? e.prefix() : ""), e.msg());
} catch (Interrupted & e) {
- printMsg(lvlError, format(error + "%1%%2%") % (settings.showTrace ? e.prefix() : "") % e.msg());
+ printMsg(lvlError, error + "%1%%2%", (settings.showTrace ? e.prefix() : ""), e.msg());
}
// We handled the current input fully, so we should clear it
@@ -546,7 +546,7 @@ bool NixRepl::processLine(string line)
return false;
else if (command != "")
- throw Error(format("unknown command '%1%'") % command);
+ throw Error("unknown command '%1%'", command);
else {
size_t p = line.find('=');