1 files changed, 34 insertions, 33 deletions

diff --git a/src/error-demo/error-demo.cc b/src/error-demo/error-demo.cc
index a9ff6057c..b7dd4cc22 100644
--- a/src/error-demo/error-demo.cc
+++ b/src/error-demo/error-demo.cc
@@ -1,4 +1,4 @@
-#include "error.hh"
+#include "logging.hh"
 #include "nixexpr.hh"
 
 #include <iostream>
@@ -8,24 +8,25 @@ int main()
 {
     using namespace nix;
 
+    std::unique_ptr<Logger> logger(makeDefaultLogger());
+
+    verbosity = lvlError;
+
     // In each program where errors occur, this has to be set.
     ErrorInfo::programName = std::optional("error-demo");
 
     // Error in a program; no hint and no nix code.
-    printErrorInfo(
-        ErrorInfo { .level = elError,
-                    .name = "name",
+    logError(
+        ErrorInfo { .name = "name",
                     .description = "error description",
                   });
 
     // Warning with name, description, and hint.
     // The hintfmt function makes all the substituted text yellow.
-    printErrorInfo(
-        ErrorInfo { .level = elWarning,
-                    .name = "name",
+    logWarning(
+        ErrorInfo { .name = "name",
                     .description = "error description",
-                    .hint =  std::optional(
-                                 hintfmt("there was a %1%", "warning")),
+                    .hint = hintfmt("there was a %1%", "warning"),
                   });
 
 
@@ -34,32 +35,32 @@ int main()
     SymbolTable testTable;
     auto problem_file = testTable.create("myfile.nix");
 
-    printErrorInfo(
-        ErrorInfo{
-            .level = elWarning,
-            .name = "warning name",
-            .description = "warning description",
-            .hint = hintfmt("this hint has %1% templated %2%!!", "yellow", "values"),
-            .nixCode = NixCode {
-                .errPos = Pos(problem_file, 40, 13),
-                .prevLineOfCode = std::nullopt,
-                .errLineOfCode = "this is the problem line of code",
-                .nextLineOfCode = std::nullopt
-            }});
+    logWarning(
+        ErrorInfo { .name = "warning name",
+                    .description = "warning description",
+                    .hint = hintfmt("this hint has %1% templated %2%!!",
+                                    "yellow",
+                                    "values"),
+                    .nixCode = NixCode {
+                        .errPos = Pos(problem_file, 40, 13),
+                        .prevLineOfCode = std::nullopt,
+                        .errLineOfCode = "this is the problem line of code",
+                        .nextLineOfCode = std::nullopt
+                    }});
 
     // Error with previous and next lines of code.
-    printErrorInfo(
-        ErrorInfo{
-            .level = elError,
-            .name = "error name",
-            .description = "error description",
-            .hint = hintfmt("this hint has %1% templated %2%!!", "yellow", "values"),
-            .nixCode = NixCode {
-                .errPos = Pos(problem_file, 40, 13),
-                .prevLineOfCode = std::optional("previous line of code"),
-                .errLineOfCode = "this is the problem line of code",
-                .nextLineOfCode = std::optional("next line of code"),
-            }});
+    logError(
+        ErrorInfo { .name = "error name",
+                    .description = "error description",
+                    .hint = hintfmt("this hint has %1% templated %2%!!",
+                                    "yellow",
+                                    "values"),
+                    .nixCode = NixCode {
+                        .errPos = Pos(problem_file, 40, 13),
+                        .prevLineOfCode = std::optional("previous line of code"),
+                        .errLineOfCode = "this is the problem line of code",
+                        .nextLineOfCode = std::optional("next line of code"),
+                    }});
 
 
     return 0;