summaryrefslogtreecommitdiff
path: root/main/core/src
diff options
context:
space:
mode:
authorGuillaume Martres <smarter@ubuntu.com>2018-09-15 03:49:33 +0200
committerLi Haoyi <haoyi.sg@gmail.com>2018-09-15 09:49:33 +0800
commitbe441e786ead9cc251418856189751b3e51d325e (patch)
treef208233923315690d4750c5ae6f1bf8731ff4d45 /main/core/src
parentfc86e68cb3ae31d1cd1b07df9665d34cf617954d (diff)
downloadmill-be441e786ead9cc251418856189751b3e51d325e.tar.gz
mill-be441e786ead9cc251418856189751b3e51d325e.tar.bz2
mill-be441e786ead9cc251418856189751b3e51d325e.zip
Remove useless type parameters for {Test,}Evaluator (#416)
* Remove useless type parameters for {Test,}Evaluator * Update Evaluator.scala
Diffstat (limited to 'main/core/src')
-rw-r--r--main/core/src/mill/eval/Evaluator.scala19
1 files changed, 10 insertions, 9 deletions
diff --git a/main/core/src/mill/eval/Evaluator.scala b/main/core/src/mill/eval/Evaluator.scala
index 34e1cf6f..ded4afdd 100644
--- a/main/core/src/mill/eval/Evaluator.scala
+++ b/main/core/src/mill/eval/Evaluator.scala
@@ -28,14 +28,15 @@ case class Labelled[T](task: NamedTask[T],
case _ => None
}
}
-case class Evaluator[T](home: Path,
- outPath: Path,
- externalOutPath: Path,
- rootModule: mill.define.BaseModule,
- log: Logger,
- classLoaderSig: Seq[(Either[String, Path], Long)] = Evaluator.classLoaderSig,
- workerCache: mutable.Map[Segments, (Int, Any)] = mutable.Map.empty,
- env : Map[String, String] = Evaluator.defaultEnv){
+
+case class Evaluator(home: Path,
+ outPath: Path,
+ externalOutPath: Path,
+ rootModule: mill.define.BaseModule,
+ log: Logger,
+ classLoaderSig: Seq[(Either[String, Path], Long)] = Evaluator.classLoaderSig,
+ workerCache: mutable.Map[Segments, (Int, Any)] = mutable.Map.empty,
+ env : Map[String, String] = Evaluator.defaultEnv){
val classLoaderSignHash = classLoaderSig.hashCode()
def evaluate(goals: Agg[Task[_]]): Evaluator.Results = {
mkdir(outPath)
@@ -361,7 +362,7 @@ object Evaluator{
// the TargetScopt#read call, which does not accept additional parameters.
// Until we migrate our CLI parsing off of Scopt (so we can pass the BaseModule
// in directly) we are forced to pass it in via a ThreadLocal
- val currentEvaluator = new ThreadLocal[mill.eval.Evaluator[_]]
+ val currentEvaluator = new ThreadLocal[mill.eval.Evaluator]
val defaultEnv: Map[String, String] = System.getenv().asScala.toMap