diff --git a/src/libmain/progress-bar.cc b/src/libmain/progress-bar.cc index 46390406f..5960740cf 100644 --- a/src/libmain/progress-bar.cc +++ b/src/libmain/progress-bar.cc @@ -586,16 +586,16 @@ public: } else if (type == resExpectBuild) - actInfo.buildsRemaining.insert(getS(fields, 0)); + actInfo.buildsRemaining.insert(std::string { getS(fields, 0) }); else if (type == resUnexpectBuild) - actInfo.buildsRemaining.erase(getS(fields, 0)); + actInfo.buildsRemaining.erase(std::string { getS(fields, 0) }); else if (type == resExpectSubstitution) - actInfo.substitutionsRemaining.insert(getS(fields, 0)); + actInfo.substitutionsRemaining.insert(std::string { getS(fields, 0) }); else if (type == resUnexpectSubstitution) - actInfo.substitutionsRemaining.erase(getS(fields, 0)); + actInfo.substitutionsRemaining.erase(std::string { getS(fields, 0) }); } void update(State & state) @@ -815,7 +815,7 @@ public: s += "\r\e[K"; if (msg) { - s += replaceStrings(*msg, "\n", "\r\n"); + s += replaceStrings(std::string { *msg }, "\n", "\r\n"); s += ANSI_NORMAL "\e[K\n\r"; } diff --git a/src/nix/main.cc b/src/nix/main.cc index 154b8808b..d64ba0ebc 100644 --- a/src/nix/main.cc +++ b/src/nix/main.cc @@ -359,8 +359,6 @@ void mainWrapped(int argc, char * * argv) setLogFormat(LogFormat::bar); - Finally f([] { logger->stop(); }); - if (!args.command) throw UsageError("no subcommand specified");