summaryrefslogtreecommitdiff
path: root/scalalib/src/mill
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 /scalalib/src/mill
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 'scalalib/src/mill')
-rw-r--r--scalalib/src/mill/scalalib/Dependency.scala2
-rw-r--r--scalalib/src/mill/scalalib/GenIdeaImpl.scala12
-rw-r--r--scalalib/src/mill/scalalib/dependency/versions/VersionsFinder.scala6
3 files changed, 10 insertions, 10 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 {