Merge pull request #12501 from DeterminateSystems/stop-progress-bar

Remove {start,stop}ProgressBar()

Author: edolstra

src/libmain/loggers.cc

@@ -50,11 +50,6 @@ void setLogFormat(const std::string & logFormatStr)
 void setLogFormat(const LogFormat & logFormat)
 {
     defaultLogFormat = logFormat;
-    createDefaultLogger();
-}
-
-void createDefaultLogger()
-{
     logger = makeDefaultLogger();
 }
 

src/libmain/loggers.hh

@@ -16,6 +16,4 @@ enum class LogFormat {
 void setLogFormat(const std::string & logFormatStr);
 void setLogFormat(const LogFormat & logFormat);
 
-void createDefaultLogger();
-
 }

src/libmain/progress-bar.cc

@@ -560,15 +560,4 @@ std::unique_ptr<Logger> makeProgressBar()
     return std::make_unique<ProgressBar>(isTTY());
 }
 
-void startProgressBar()
-{
-    logger = makeProgressBar();
-}
-
-void stopProgressBar()
-{
-    if (auto progressBar = dynamic_cast<ProgressBar *>(logger.get()))
-        progressBar->stop();
-}
-
 }

src/libmain/progress-bar.hh

@@ -7,8 +7,4 @@ namespace nix {
 
 std::unique_ptr<Logger> makeProgressBar();
 
-void startProgressBar();
-
-void stopProgressBar();
-
 }

src/libmain/shared.cc

@@ -361,7 +361,7 @@ RunPager::RunPager()
     if (!pager) pager = getenv("PAGER");
     if (pager && ((std::string) pager == "" || (std::string) pager == "cat")) return;
 
-    stopProgressBar();
+    logger->stop();
 
     Pipe toPager;
     toPager.create();

src/nix/build.cc

@@ -3,7 +3,6 @@
 #include "shared.hh"
 #include "store-api.hh"
 #include "local-fs-store.hh"
-#include "progress-bar.hh"
 
 #include <nlohmann/json.hpp>
 
@@ -120,7 +119,7 @@ struct CmdBuild : InstallablesCommand, MixDryRun, MixJSON, MixProfile
                 createOutLinks(outLink, toBuiltPaths(buildables), *store2);
 
         if (printOutputPaths) {
-            stopProgressBar();
+            logger->stop();
             for (auto & buildable : buildables) {
                 std::visit(overloaded {
                     [&](const BuiltPath::Opaque & bo) {

src/nix/cat.cc

@@ -1,7 +1,6 @@
 #include "command.hh"
 #include "store-api.hh"
 #include "nar-accessor.hh"
-#include "progress-bar.hh"
 
 using namespace nix;
 
@@ -14,7 +13,7 @@ struct MixCat : virtual Args
         auto st = accessor->lstat(CanonPath(path));
         if (st.type != SourceAccessor::Type::tRegular)
             throw Error("path '%1%' is not a regular file", path);
-        stopProgressBar();
+        logger->stop();
 
         writeFull(getStandardOutput(), accessor->readFile(CanonPath(path)));
     }

src/nix/develop.cc

@@ -7,7 +7,6 @@
 #include "store-api.hh"
 #include "outputs-spec.hh"
 #include "derivations.hh"
-#include "progress-bar.hh"
 
 #ifndef _WIN32 // TODO re-enable on Windows
 # include "run.hh"
@@ -731,7 +730,7 @@ struct CmdPrintDevEnv : Common, MixJSON
     {
         auto buildEnvironment = getBuildEnvironment(store, installable).first;
 
-        stopProgressBar();
+        logger->stop();
 
         if (json) {
             logger->writeToStdout(buildEnvironment.toJSON());

src/nix/edit.cc

@@ -3,7 +3,6 @@
 #include "shared.hh"
 #include "eval.hh"
 #include "attr-path.hh"
-#include "progress-bar.hh"
 #include "editor-for.hh"
 
 #include <unistd.h>
@@ -40,7 +39,7 @@ struct CmdEdit : InstallableValueCommand
             }
         }();
 
-        stopProgressBar();
+        logger->stop();
 
         auto args = editorFor(file, line);
 

src/nix/eval.cc

@@ -5,7 +5,6 @@
 #include "eval.hh"
 #include "eval-inline.hh"
 #include "value-to-json.hh"
-#include "progress-bar.hh"
 
 #include <nlohmann/json.hpp>
 
@@ -75,7 +74,7 @@ struct CmdEval : MixJSON, InstallableValueCommand, MixReadOnlyOption
         }
 
         if (writeTo) {
-            stopProgressBar();
+            logger->stop();
 
             if (fs::symlink_exists(*writeTo))
                 throw Error("path '%s' already exists", writeTo->string());
@@ -114,7 +113,7 @@ struct CmdEval : MixJSON, InstallableValueCommand, MixReadOnlyOption
         }
 
         else if (raw) {
-            stopProgressBar();
+            logger->stop();
             writeFull(getStandardOutput(), *state->coerceToString(noPos, *v, context, "while generating the eval command output"));
         }