Remove useless type parameters for {Test,}Evaluator (#416)

* Remove useless type parameters for {Test,}Evaluator

* Update Evaluator.scala

5 files changed, 18 insertions, 18 deletions

diff --git a/scalalib/src/mill/scalalib/Dependency.scala b/scalalib/src/mill/scalalib/Dependency.scala
index 858e479b..0c589663 100644
--- a/scalalib/src/mill/scalalib/Dependency.scala
+++ b/scalalib/src/mill/scalalib/Dependency.scala
@@ -8,7 +8,7 @@ import mill.scalalib.dependency.DependencyUpdatesImpl
 
 object Dependency extends ExternalModule {
 
-  def updates(ev: Evaluator[Any], allowPreRelease: Boolean = false) =
+  def updates(ev: Evaluator, allowPreRelease: Boolean = false) =
     T.command {
       DependencyUpdatesImpl(implicitly,
                             ev.rootModule,
diff --git a/scalalib/src/mill/scalalib/GenIdeaImpl.scala b/scalalib/src/mill/scalalib/GenIdeaImpl.scala
index b235dfdd..f71a7856 100644
--- a/scalalib/src/mill/scalalib/GenIdeaImpl.scala
+++ b/scalalib/src/mill/scalalib/GenIdeaImpl.scala
@@ -15,7 +15,7 @@ import scala.util.Try
 
 object GenIdea extends ExternalModule {
 
-  def idea(ev: Evaluator[Any]) = T.command{
+  def idea(ev: Evaluator) = T.command{
     mill.scalalib.GenIdeaImpl(
       implicitly,
       ev.rootModule,
@@ -58,10 +58,10 @@ object GenIdeaImpl {
     }.getOrElse(None)
   }
 
-  def xmlFileLayout[T](evaluator: Evaluator[T],
-                       rootModule: mill.Module,
-                       jdkInfo: (String,String),
-                       fetchMillModules: Boolean = true): Seq[(RelPath, scala.xml.Node)] = {
+  def xmlFileLayout(evaluator: Evaluator,
+                    rootModule: mill.Module,
+                    jdkInfo: (String,String),
+                    fetchMillModules: Boolean = true): Seq[(RelPath, scala.xml.Node)] = {
 
     val modules = rootModule.millInternal.segmentsToModules.values
       .collect{ case x: scalalib.JavaModule => (x.millModuleSegments, x)}
@@ -297,7 +297,7 @@ object GenIdeaImpl {
     fixedFiles ++ libraries ++ moduleFiles
   }
 
-  def evalOrElse[T](evaluator: Evaluator[_], e: Task[T], default: => T): T = {
+  def evalOrElse[T](evaluator: Evaluator, e: Task[T], default: => T): T = {
     evaluator.evaluate(Agg(e)).values match {
       case Seq() => default
       case Seq(e: T) => e
diff --git a/scalalib/src/mill/scalalib/dependency/versions/VersionsFinder.scala b/scalalib/src/mill/scalalib/dependency/versions/VersionsFinder.scala
index efb8cb64..abe6e012 100644
--- a/scalalib/src/mill/scalalib/dependency/versions/VersionsFinder.scala
+++ b/scalalib/src/mill/scalalib/dependency/versions/VersionsFinder.scala
@@ -23,7 +23,7 @@ private[dependency] object VersionsFinder {
     resolveVersions(resolvedDependencies)
   }
 
-  private def resolveDependencies(evaluator: Evaluator[_],
+  private def resolveDependencies(evaluator: Evaluator,
                                   javaModules: Seq[JavaModule]) =
     javaModules.map { javaModule =>
       val depToDependency =
@@ -56,13 +56,13 @@ private[dependency] object VersionsFinder {
         ModuleDependenciesVersions(javaModule, versions)
     }
 
-  private def eval[T](evaluator: Evaluator[_], e: Task[T]): T =
+  private def eval[T](evaluator: Evaluator, e: Task[T]): T =
     evaluator.evaluate(Strict.Agg(e)).values match {
       case Seq()     => throw new NoSuchElementException
       case Seq(e: T) => e
     }
 
-  private def evalOrElse[T](evaluator: Evaluator[_],
+  private def evalOrElse[T](evaluator: Evaluator,
                             e: Task[T],
                             default: => T): T =
     evaluator.evaluate(Strict.Agg(e)).values match {
diff --git a/scalalib/test/src/mill/scalalib/HelloWorldTests.scala b/scalalib/test/src/mill/scalalib/HelloWorldTests.scala
index 1a89a0e3..e1ac8bb7 100644
--- a/scalalib/test/src/mill/scalalib/HelloWorldTests.scala
+++ b/scalalib/test/src/mill/scalalib/HelloWorldTests.scala
@@ -269,9 +269,9 @@ object HelloWorldTests extends TestSuite {
     "Person$.class"
   )
 
-  def workspaceTest[T, M <: TestUtil.BaseModule](m: M, resourcePath: Path = resourcePath)
-                                                (t: TestEvaluator[M] => T)
-                                                (implicit tp: TestPath): T = {
+  def workspaceTest[T](m: TestUtil.BaseModule, resourcePath: Path = resourcePath)
+                      (t: TestEvaluator => T)
+                      (implicit tp: TestPath): T = {
     val eval = new TestEvaluator(m)
     rm(m.millSourcePath)
     rm(eval.outPath)
@@ -397,7 +397,7 @@ object HelloWorldTests extends TestSuite {
         )
       }
       'runCross - {
-        def cross(eval: TestEvaluator[_], v: String, expectedOut: String) {
+        def cross(eval: TestEvaluator, v: String, expectedOut: String) {
 
           val runResult = eval.outPath / "hello-mill"
 
diff --git a/scalalib/test/src/mill/scalalib/scalafmt/ScalafmtTests.scala b/scalalib/test/src/mill/scalalib/scalafmt/ScalafmtTests.scala
index fcff52a3..89d549ff 100644
--- a/scalalib/test/src/mill/scalalib/scalafmt/ScalafmtTests.scala
+++ b/scalalib/test/src/mill/scalalib/scalafmt/ScalafmtTests.scala
@@ -22,9 +22,9 @@ object ScalafmtTests extends TestSuite {
 
   val resourcePath = pwd / 'scalalib / 'test / 'resources / 'scalafmt
 
-  def workspaceTest[T, M <: TestUtil.BaseModule](
-      m: M,
-      resourcePath: Path = resourcePath)(t: TestEvaluator[M] => T)(
+  def workspaceTest[T](
+      m: TestUtil.BaseModule,
+      resourcePath: Path = resourcePath)(t: TestEvaluator => T)(
       implicit tp: TestPath): T = {
     val eval = new TestEvaluator(m)
     rm(m.millSourcePath)
@@ -91,7 +91,7 @@ object ScalafmtTests extends TestSuite {
 
   case class FileInfo(content: String, modifyTime: Long, path: Path)
 
-  def getProjectFiles(m: ScalaModule, eval: TestEvaluator[_]) = {
+  def getProjectFiles(m: ScalaModule, eval: TestEvaluator) = {
     val Right((sources, _)) = eval.apply(m.sources)
     val Right((resources, _)) = eval.apply(m.resources)