diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2017-11-09 03:59:35 -0800 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2017-11-09 03:59:35 -0800 |
| commit | cdecfeedc1900aff0c4acfd284b07bf36087c3c9 (patch) | |
| tree | b0ce149f551d211103c62eee45c4fce5bc109657 /core | |
| parent | a861ea9dd39ab3c4cc74ec3e1cf73355219d1836 (diff) | |
| download | mill-cdecfeedc1900aff0c4acfd284b07bf36087c3c9.tar.gz mill-cdecfeedc1900aff0c4acfd284b07bf36087c3c9.tar.bz2 mill-cdecfeedc1900aff0c4acfd284b07bf36087c3c9.zip | |
make scalaplugin.Subproject use the builtin destination folder
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/forge/Main.scala | 6 | ||||
| -rw-r--r-- | core/src/main/scala/forge/define/Target.scala | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/src/main/scala/forge/Main.scala b/core/src/main/scala/forge/Main.scala index a06d7d6f..e66f5fd8 100644 --- a/core/src/main/scala/forge/Main.scala +++ b/core/src/main/scala/forge/Main.scala @@ -24,9 +24,9 @@ object Main { else{ val (obj, discovered) = result.asInstanceOf[Res.Success[(Any, Discovered[Any])]].s - val consErrors = Discovered.consistencyCheck(obj, discovered) - pprint.log(consErrors) - if (consErrors.nonEmpty) println("Failed Discovered.consistencyCheck: " + consErrors) + val consistencyErrors = Discovered.consistencyCheck(obj, discovered) + pprint.log(consistencyErrors) + if (consistencyErrors.nonEmpty) println("Failed Discovered.consistencyCheck: " + consistencyErrors) else { val mapping = Discovered.mapping(obj)(discovered) val workspacePath = pwd / 'out diff --git a/core/src/main/scala/forge/define/Target.scala b/core/src/main/scala/forge/define/Target.scala index 753a63e8..9cb2dd1a 100644 --- a/core/src/main/scala/forge/define/Target.scala +++ b/core/src/main/scala/forge/define/Target.scala @@ -6,6 +6,7 @@ import forge.eval.PathRef import forge.util.{Args, JsonFormatters} import play.api.libs.json.{Format, Json} +import scala.annotation.compileTimeOnly import scala.language.experimental.macros import scala.reflect.macros.blackbox.Context |