diff options
| author | Guillaume Martres <smarter@ubuntu.com> | 2018-09-15 03:49:33 +0200 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-09-15 09:49:33 +0800 |
| commit | be441e786ead9cc251418856189751b3e51d325e (patch) | |
| tree | f208233923315690d4750c5ae6f1bf8731ff4d45 /scalalib/test/src | |
| parent | fc86e68cb3ae31d1cd1b07df9665d34cf617954d (diff) | |
| download | mill-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/test/src')
| -rw-r--r-- | scalalib/test/src/mill/scalalib/HelloWorldTests.scala | 8 | ||||
| -rw-r--r-- | scalalib/test/src/mill/scalalib/scalafmt/ScalafmtTests.scala | 8 |
2 files changed, 8 insertions, 8 deletions
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) |