minor cleanup

src/libcmd/repl.cc

@@ -547,8 +547,6 @@ bool NixRepl::processLine(std::string line)
                      loadDebugTraceEnv(*iter);
                      break;
                  }
-                 // std::cout << "\n" << ANSI_BLUE << idx << ANSI_NORMAL << ": ";
-                 // showDebugTrace(std::cout, *iter);
             }
         }
         else if (arg == "step") {

src/libexpr/eval.cc

@@ -789,6 +789,7 @@ void mapStaticEnvBindings(const StaticEnv &se, const Env &env, valmap & vm)
       auto map = valmap();
       if (env.type == Env::HasWithAttrs)
       {
+          // add 'with' bindings.
           Bindings::iterator j = env.values[0]->attrs->begin();
           while (j != env.values[0]->attrs->end()) {
               map[j->name] = j->value;
@@ -2123,8 +2124,7 @@ NixFloat EvalState::forceFloat(Value & v, const Pos & pos)
     if (v.type() == nInt)
         return v.integer;
     else if (v.type() != nFloat)
-        throwTypeError(pos, "value is %1% while a float was expected", v,
-            *this);
+        throwTypeError(pos, "value is %1% while a float was expected", v, *this);
     return v.fpoint;
 }
 
@@ -2133,8 +2133,7 @@ bool EvalState::forceBool(Value & v, const Pos & pos)
 {
     forceValue(v, pos);
     if (v.type() != nBool)
-        throwTypeError(pos, "value is %1% while a Boolean was expected", v,
-            *this);
+        throwTypeError(pos, "value is %1% while a Boolean was expected", v, *this);
     return v.boolean;
 }
 
@@ -2149,8 +2148,7 @@ void EvalState::forceFunction(Value & v, const Pos & pos)
 {
     forceValue(v, pos);
     if (v.type() != nFunction && !isFunctor(v))
-        throwTypeError(pos, "value is %1% while a function was expected", v,
-            *this);
+        throwTypeError(pos, "value is %1% while a function was expected", v, *this);
 }
 
 
@@ -2158,8 +2156,7 @@ std::string_view EvalState::forceString(Value & v, const Pos & pos)
 {
     forceValue(v, pos);
     if (v.type() != nString) {
-        throwTypeError(pos, "value is %1% while a string was expected", v,
-            *this);
+        throwTypeError(pos, "value is %1% while a string was expected", v, *this);
     }
     return v.string.s;
 }

src/libexpr/parser.y

@@ -23,7 +23,6 @@
 #include "nixexpr.hh"
 #include "eval.hh"
 #include "globals.hh"
-#include <iostream>
 
 namespace nix {
 

src/libexpr/primops/fetchTree.cc

@@ -226,7 +226,8 @@ static void fetch(EvalState & state, const Pos & pos, Value * * args, Value & v,
                 expectedHash = newHashAllowEmpty(state.forceStringNoCtx(*attr.value, *attr.pos), htSHA256);
             else if (n == "name")
                 name = state.forceStringNoCtx(*attr.value, *attr.pos);
-            else {
+            else
+            {
                 auto e = EvalError({
                     .msg = hintfmt("unsupported argument '%s' to '%s'", attr.name, who),
                     .errPos = *attr.pos