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 /contrib | |
| 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 'contrib')
3 files changed, 9 insertions, 10 deletions
diff --git a/contrib/buildinfo/test/src/mill/contrib/BuildInfoTests.scala b/contrib/buildinfo/test/src/mill/contrib/BuildInfoTests.scala index 9e1549de..e2147bac 100644 --- a/contrib/buildinfo/test/src/mill/contrib/BuildInfoTests.scala +++ b/contrib/buildinfo/test/src/mill/contrib/BuildInfoTests.scala @@ -45,9 +45,9 @@ object BuildInfoTests extends TestSuite { val resourcePath = pwd / 'contrib / 'buildinfo / 'test / 'resources / "buildinfo" - 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) diff --git a/contrib/scalapblib/test/src/mill/contrib/scalapblib/TutorialTests.scala b/contrib/scalapblib/test/src/mill/contrib/scalapblib/TutorialTests.scala index f88d3a5f..8542d60e 100644 --- a/contrib/scalapblib/test/src/mill/contrib/scalapblib/TutorialTests.scala +++ b/contrib/scalapblib/test/src/mill/contrib/scalapblib/TutorialTests.scala @@ -27,12 +27,11 @@ object TutorialTests extends TestSuite { val resourcePath: Path = pwd / 'contrib / 'scalapblib / 'test / 'protobuf / 'tutorial - def protobufOutPath[M <: TestUtil.BaseModule](eval: TestEvaluator[M]): Path = + def protobufOutPath(eval: TestEvaluator): Path = eval.outPath / 'core / 'compileScalaPB / 'dest / 'com / 'example / 'tutorial - def workspaceTest[T, M <: TestUtil.BaseModule](m: M) - (t: TestEvaluator[M] => T) - (implicit tp: TestPath): T = { + def workspaceTest[T](m: TestUtil.BaseModule)(t: TestEvaluator => T) + (implicit tp: TestPath): T = { val eval = new TestEvaluator(m) rm(m.millSourcePath) println(m.millSourcePath) diff --git a/contrib/twirllib/test/src/mill/twirllib/HelloWorldTests.scala b/contrib/twirllib/test/src/mill/twirllib/HelloWorldTests.scala index 01576975..8ef6ee3e 100644 --- a/contrib/twirllib/test/src/mill/twirllib/HelloWorldTests.scala +++ b/contrib/twirllib/test/src/mill/twirllib/HelloWorldTests.scala @@ -24,9 +24,9 @@ object HelloWorldTests extends TestSuite { val resourcePath: Path = pwd / 'contrib / 'twirllib / 'test / 'resources / "hello-world" - 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) |