Never cast FileIngestionMethod to or from boolean

2020-03-30 22:31:51 +00:00
parent c251b011cd
commit 51afea3af2
4 changed files with 28 additions and 14 deletions
@@ -724,9 +724,12 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *

        auto outPath = state.store->makeFixedOutputPath(outputHashRecursive, h, drvName);
        if (!jsonObject) drv.env["out"] = state.store->printStorePath(outPath);
-        drv.outputs.insert_or_assign("out", DerivationOutput(std::move(outPath),
-                (static_cast<bool>(outputHashRecursive) ? "r:" : "") + printHashType(h.type),
-                h.to_string(Base16, false)));
+        drv.outputs.insert_or_assign("out", DerivationOutput {
+            std::move(outPath),
+            (outputHashRecursive == FileIngestionMethod::Recursive ? "r:" : "")
+                + printHashType(h.type),
+            h.to_string(Base16, false),
+        });
    }

    else {