diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2018-04-10 10:01:08 -0700 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-04-10 10:01:08 -0700 |
| commit | 727c2241414f5efce3188be2e601be4bd98aca6a (patch) | |
| tree | 054e40c3b6003af45eb2b3f7bf9230f05604f7b3 | |
| parent | 152da6c5fcc73099efc8fbea0d2b6d87f8283fe5 (diff) | |
| download | mill-727c2241414f5efce3188be2e601be4bd98aca6a.tar.gz mill-727c2241414f5efce3188be2e601be4bd98aca6a.tar.bz2 mill-727c2241414f5efce3188be2e601be4bd98aca6a.zip | |
rename Cached#v -> value
| -rw-r--r-- | core/src/mill/eval/Evaluator.scala | 4 | ||||
| -rw-r--r-- | main/src/mill/main/RunScript.scala | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/src/mill/eval/Evaluator.scala b/core/src/mill/eval/Evaluator.scala index a728ec97..c0df83ff 100644 --- a/core/src/mill/eval/Evaluator.scala +++ b/core/src/mill/eval/Evaluator.scala @@ -138,7 +138,7 @@ case class Evaluator[T](home: Path, if cached.inputsHash == inputsHash reader <- labelledNamedTask.format parsed <- - try Some(upickle.default.read(cached.v)(reader)) + try Some(upickle.default.read(cached.value)(reader)) catch {case e: Throwable => None} } yield (parsed, cached.valueHash) @@ -323,7 +323,7 @@ case class Evaluator[T](home: Path, object Evaluator{ - case class Cached(v: Js.Value, + case class Cached(value: Js.Value, valueHash: Int, inputsHash: Int) object Cached{ diff --git a/main/src/mill/main/RunScript.scala b/main/src/mill/main/RunScript.scala index 75042dea..3c2cb1fe 100644 --- a/main/src/mill/main/RunScript.scala +++ b/main/src/mill/main/RunScript.scala @@ -228,7 +228,7 @@ object RunScript{ .resolveDestPaths(evaluator.outPath, t.ctx.segments) .meta val metadata = upickle.default.readJs[Evaluator.Cached](ujson.read(jsonFile.toIO)) - Some(metadata.v) + Some(metadata.value) case _ => None } |