From d2f063c3b95f4b07664ebee109e24aa949ab0409 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Thu, 28 Feb 2013 08:56:58 -0500 Subject: [PATCH] implicit-search-higher-kinded test did not require higher kinds- it tests the companion scope search --- .../implicit-search-companion-scope/changes/A1.scala | 2 ++ .../implicit-search-companion-scope/changes/A2.scala | 4 ++++ .../changes/B.scala | 0 .../changes/C.scala | 0 .../implicit-search-companion-scope/changes/M.scala | 4 ++++ .../pending | 2 -- .../implicit-search-higher-kinded/changes/A1.scala | 3 --- .../implicit-search-higher-kinded/changes/A2.scala | 5 ----- .../implicit-search-higher-kinded/changes/M.scala | 6 ------ 9 files changed, 10 insertions(+), 16 deletions(-) create mode 100644 sbt/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A1.scala create mode 100644 sbt/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A2.scala rename sbt/src/sbt-test/source-dependencies/{implicit-search-higher-kinded => implicit-search-companion-scope}/changes/B.scala (100%) rename sbt/src/sbt-test/source-dependencies/{implicit-search-higher-kinded => implicit-search-companion-scope}/changes/C.scala (100%) create mode 100644 sbt/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/M.scala rename sbt/src/sbt-test/source-dependencies/{implicit-search-higher-kinded => implicit-search-companion-scope}/pending (72%) delete mode 100644 sbt/src/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/A1.scala delete mode 100644 sbt/src/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/A2.scala delete mode 100644 sbt/src/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/M.scala diff --git a/sbt/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A1.scala b/sbt/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A1.scala new file mode 100644 index 000000000..5a58c097b --- /dev/null +++ b/sbt/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A1.scala @@ -0,0 +1,2 @@ +trait A +object A diff --git a/sbt/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A2.scala b/sbt/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A2.scala new file mode 100644 index 000000000..8a0b629bc --- /dev/null +++ b/sbt/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A2.scala @@ -0,0 +1,4 @@ +trait A +object A { + implicit def m[A]: M[A] = ??? +} diff --git a/sbt/src/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/B.scala b/sbt/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/B.scala similarity index 100% rename from sbt/src/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/B.scala rename to sbt/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/B.scala diff --git a/sbt/src/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/C.scala b/sbt/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/C.scala similarity index 100% rename from sbt/src/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/C.scala rename to sbt/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/C.scala diff --git a/sbt/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/M.scala b/sbt/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/M.scala new file mode 100644 index 000000000..9464f4238 --- /dev/null +++ b/sbt/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/M.scala @@ -0,0 +1,4 @@ +class M[A](a: A) +object M { + implicit def m[A]: M[A] = ??? +} diff --git a/sbt/src/sbt-test/source-dependencies/implicit-search-higher-kinded/pending b/sbt/src/sbt-test/source-dependencies/implicit-search-companion-scope/pending similarity index 72% rename from sbt/src/sbt-test/source-dependencies/implicit-search-higher-kinded/pending rename to sbt/src/sbt-test/source-dependencies/implicit-search-companion-scope/pending index e5f50944f..701b2c9a5 100644 --- a/sbt/src/sbt-test/source-dependencies/implicit-search-higher-kinded/pending +++ b/sbt/src/sbt-test/source-dependencies/implicit-search-companion-scope/pending @@ -1,6 +1,4 @@ # Tests if dependencies on implicit scope are tracked properly -# We use higher kinded types in order to make type checker to -# infer more and thus obscure true dependencies $ copy-file changes/A1.scala A.scala $ copy-file changes/B.scala B.scala $ copy-file changes/M.scala M.scala diff --git a/sbt/src/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/A1.scala b/sbt/src/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/A1.scala deleted file mode 100644 index c56e4578f..000000000 --- a/sbt/src/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/A1.scala +++ /dev/null @@ -1,3 +0,0 @@ -import scala.languageFeature.higherKinds -trait A -object A diff --git a/sbt/src/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/A2.scala b/sbt/src/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/A2.scala deleted file mode 100644 index 1b749793d..000000000 --- a/sbt/src/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/A2.scala +++ /dev/null @@ -1,5 +0,0 @@ -import scala.languageFeature.higherKinds -trait A -object A { - implicit def m[MM[_], A]: MM[A] = ??? -} diff --git a/sbt/src/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/M.scala b/sbt/src/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/M.scala deleted file mode 100644 index 9fd664bea..000000000 --- a/sbt/src/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/M.scala +++ /dev/null @@ -1,6 +0,0 @@ -import scala.languageFeature.higherKinds - -class M[A](a: A) -object M { - implicit def m[MM[_], A]: MM[A] = ??? -}