summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-04-01 22:57:43 -0700
committerLi Haoyi <haoyi.sg@gmail.com>2018-04-06 13:33:31 -0700
commit36eb8bd6bfd534d002b01f8800e4b5d896aa4e77 (patch)
tree8c3d7ea982a6e5fba52e1d6dc7b02958e7e1c2f0 /core
parent7d80dd1f0847e38db54966ea7fbd08400840ba7d (diff)
downloadmill-36eb8bd6bfd534d002b01f8800e4b5d896aa4e77.tar.gz
mill-36eb8bd6bfd534d002b01f8800e4b5d896aa4e77.tar.bz2
mill-36eb8bd6bfd534d002b01f8800e4b5d896aa4e77.zip
- Add `mill version` command
- Make `Evaluator` robust against `null` results
Diffstat (limited to 'core')
-rw-r--r--core/src/mill/eval/Evaluator.scala6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/src/mill/eval/Evaluator.scala b/core/src/mill/eval/Evaluator.scala
index f423092b..a1bbf142 100644
--- a/core/src/mill/eval/Evaluator.scala
+++ b/core/src/mill/eval/Evaluator.scala
@@ -171,10 +171,10 @@ case class Evaluator[T](home: Path,
newResults(labelledNamedTask.task) match{
case Result.Failure(_, Some((v, hashCode))) =>
- handleTaskResult(v, v.hashCode, paths.meta, inputsHash, labelledNamedTask)
+ handleTaskResult(v, v.##, paths.meta, inputsHash, labelledNamedTask)
case Result.Success((v, hashCode)) =>
- handleTaskResult(v, v.hashCode, paths.meta, inputsHash, labelledNamedTask)
+ handleTaskResult(v, v.##, paths.meta, inputsHash, labelledNamedTask)
case _ =>
// Wipe out any cached meta.json file that exists, so
@@ -301,7 +301,7 @@ case class Evaluator[T](home: Path,
newResults(task) = for(v <- res) yield {
(v,
if (task.isInstanceOf[Worker[_]]) inputsHash
- else v.hashCode
+ else v.##
)
}
}