diff options
author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-06 08:14:50 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-06 08:14:50 -0700 |
commit | c632aaca8bdf1dc7c8eac24f5dd0acb18b4683b6 (patch) | |
tree | a264d2f32b95c9c06b516cfd22c926d564dd4edb /test | |
parent | c39c7276c38f9ef66fd7054609ef33627efe5177 (diff) | |
parent | ddcb351a2e0aeea9373a891a05c8db73334470a9 (diff) | |
download | scala-c632aaca8bdf1dc7c8eac24f5dd0acb18b4683b6.tar.gz scala-c632aaca8bdf1dc7c8eac24f5dd0acb18b4683b6.tar.bz2 scala-c632aaca8bdf1dc7c8eac24f5dd0acb18b4683b6.zip |
Merge pull request #834 from paulp/issue/3836-2
Fix SI-3836 not-really-ambiguous import detection.
Diffstat (limited to 'test')
-rw-r--r-- | test/files/neg/t3836.check | 13 | ||||
-rw-r--r-- | test/files/neg/t3836.scala | 28 | ||||
-rw-r--r-- | test/files/pos/t3836.scala | 14 |
3 files changed, 55 insertions, 0 deletions
diff --git a/test/files/neg/t3836.check b/test/files/neg/t3836.check new file mode 100644 index 0000000000..ff2fc36ae9 --- /dev/null +++ b/test/files/neg/t3836.check @@ -0,0 +1,13 @@ +t3836.scala:17: error: reference to IOException is ambiguous; +it is imported twice in the same scope by +import foo.bar._ +and import java.io._ + def f = new IOException // genuinely different + ^ +t3836.scala:26: error: reference to Bippy is ambiguous; +it is imported twice in the same scope by +import baz._ +and import bar._ + def f: Bippy[Int] = ??? + ^ +two errors found diff --git a/test/files/neg/t3836.scala b/test/files/neg/t3836.scala new file mode 100644 index 0000000000..a68f6e172f --- /dev/null +++ b/test/files/neg/t3836.scala @@ -0,0 +1,28 @@ +package foo + +package object bar { + type IOException = Object + type Bippy[T] = List[T] +} + +package object baz { + type Bippy[+T] = List[T] +} + +package baz { + import java.io._ + import foo.bar._ + + object Test { + def f = new IOException // genuinely different + } +} + +package baz2 { + import bar._ + import baz._ + + object Test2 { + def f: Bippy[Int] = ??? + } +} diff --git a/test/files/pos/t3836.scala b/test/files/pos/t3836.scala new file mode 100644 index 0000000000..840f171164 --- /dev/null +++ b/test/files/pos/t3836.scala @@ -0,0 +1,14 @@ +package foo + +package object bar { + type IOException = java.io.IOException +} + +package baz { + import java.io._ + import foo.bar._ + + object Test { + def f = new IOException + } +} |