diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2014-11-19 09:59:47 +1000 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2014-11-19 09:59:47 +1000 |
commit | 74046bb943f33dfa6009af0ddfa9e2f7949b1d58 (patch) | |
tree | 3b0f905f198936c981d7d1f04ab789eb0d1d40e0 /test/files/pos | |
parent | b2ba80ac84f7125fd9e5c40adf0a2874c3fa9e3c (diff) | |
parent | a77f01f546312cf6601f03794f909a09d34c5445 (diff) | |
download | scala-74046bb943f33dfa6009af0ddfa9e2f7949b1d58.tar.gz scala-74046bb943f33dfa6009af0ddfa9e2f7949b1d58.tar.bz2 scala-74046bb943f33dfa6009af0ddfa9e2f7949b1d58.zip |
Merge pull request #4118 from retronym/ticket/5639
SI-5639 Fix spurious discarding of implicit import
Diffstat (limited to 'test/files/pos')
-rw-r--r-- | test/files/pos/t5639.flags | 1 | ||||
-rw-r--r-- | test/files/pos/t5639/A_1.scala | 17 | ||||
-rw-r--r-- | test/files/pos/t5639/A_2.scala | 11 | ||||
-rw-r--r-- | test/files/pos/t5639/Bar.scala | 7 | ||||
-rw-r--r-- | test/files/pos/t5639/Foo.scala | 7 |
5 files changed, 29 insertions, 14 deletions
diff --git a/test/files/pos/t5639.flags b/test/files/pos/t5639.flags new file mode 100644 index 0000000000..0acce1e7ce --- /dev/null +++ b/test/files/pos/t5639.flags @@ -0,0 +1 @@ +-Xsource:2.12 diff --git a/test/files/pos/t5639/A_1.scala b/test/files/pos/t5639/A_1.scala new file mode 100644 index 0000000000..c5da10eae4 --- /dev/null +++ b/test/files/pos/t5639/A_1.scala @@ -0,0 +1,17 @@ +import Implicits._ + +class Baz + +object Test { + implicitly[Int] +} + +object Implicits { + implicit val Baz: Int = 0 + // This implicit was being ignored by `isQualifyingImplicit` + // if the classpath contained a class file for `class Baz`. + // This is because the package scope contains a speculative + // symbol for `object Baz` which is entered by `SymbolLoaders` + // before looking inside the class file. (A Java originated + // classfile results in the class/module symbol pair.) +} diff --git a/test/files/pos/t5639/A_2.scala b/test/files/pos/t5639/A_2.scala new file mode 100644 index 0000000000..2bb36273e0 --- /dev/null +++ b/test/files/pos/t5639/A_2.scala @@ -0,0 +1,11 @@ +import Implicits._ + +class Baz + +object Test { + implicitly[Int] +} + +object Implicits { + implicit val Baz: Int = 0 +} diff --git a/test/files/pos/t5639/Bar.scala b/test/files/pos/t5639/Bar.scala deleted file mode 100644 index f577500acd..0000000000 --- a/test/files/pos/t5639/Bar.scala +++ /dev/null @@ -1,7 +0,0 @@ -package pack.age - -import pack.age.Implicits._ - -object Quux { - def baz : Baz = 1 -} diff --git a/test/files/pos/t5639/Foo.scala b/test/files/pos/t5639/Foo.scala deleted file mode 100644 index 1a07734a8e..0000000000 --- a/test/files/pos/t5639/Foo.scala +++ /dev/null @@ -1,7 +0,0 @@ -package pack.age - -class Baz - -object Implicits { - implicit def Baz(n: Int): Baz = new Baz -} |