summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-02-25 11:54:33 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-02-25 11:54:33 -0800
commit19219cbbd18efb819e45b0af221f08065ad5c982 (patch)
tree1fbd4852af11a35d64c0d4d0558d95743544f35c /main
parent63f72399537331d30a32d1e71e238c6e97dabc3e (diff)
downloadmill-19219cbbd18efb819e45b0af221f08065ad5c982.tar.gz
mill-19219cbbd18efb819e45b0af221f08065ad5c982.tar.bz2
mill-19219cbbd18efb819e45b0af221f08065ad5c982.zip
cache hashCodes as part of meta.json to avoid needlessly re-hashing things
Diffstat (limited to 'main')
-rw-r--r--main/src/mill/main/RunScript.scala4
-rw-r--r--main/test/src/mill/util/TestEvaluator.scala5
2 files changed, 6 insertions, 3 deletions
diff --git a/main/src/mill/main/RunScript.scala b/main/src/mill/main/RunScript.scala
index 6f8c5293..85930e9b 100644
--- a/main/src/mill/main/RunScript.scala
+++ b/main/src/mill/main/RunScript.scala
@@ -235,8 +235,8 @@ object RunScript{
val jsonFile = Evaluator
.resolveDestPaths(evaluator.outPath, t.ctx.segments)
.meta
- val metadata = upickle.json.read(jsonFile.toIO)
- Some(metadata(1))
+ val metadata = upickle.default.readJs[Evaluator.Cached](upickle.json.read(jsonFile.toIO))
+ Some(metadata.v)
case _ => None
}
diff --git a/main/test/src/mill/util/TestEvaluator.scala b/main/test/src/mill/util/TestEvaluator.scala
index be91abaa..078254f1 100644
--- a/main/test/src/mill/util/TestEvaluator.scala
+++ b/main/test/src/mill/util/TestEvaluator.scala
@@ -26,7 +26,10 @@ class TestEvaluator[T <: TestUtil.BaseModule](module: T)
val outPath = TestUtil.getOutPath()
val logger = DummyLogger
-// val logger = new PrintLogger(true, ammonite.util.Colors.Default, System.out, System.out, System.err)
+// val logger = new PrintLogger(
+// true,
+// ammonite.util.Colors.Default, System.out, System.out, System.err, System.in
+// )
val evaluator = new Evaluator(outPath, TestEvaluator.externalOutPath, module, logger)
def apply[T](t: Task[T]): Either[Result.Failing[T], (T, Int)] = {