diff options
author | Paul Phillips <paulp@improving.org> | 2012-06-11 13:49:10 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-07-05 21:08:29 -0700 |
commit | ddcb351a2e0aeea9373a891a05c8db73334470a9 (patch) | |
tree | ec0e0efe4a0a1fcb1ef3be96a227770fd5695910 /test/files/neg | |
parent | 34d36108bf152469a934408da2b55c1df9c70a7a (diff) | |
download | scala-ddcb351a2e0aeea9373a891a05c8db73334470a9.tar.gz scala-ddcb351a2e0aeea9373a891a05c8db73334470a9.tar.bz2 scala-ddcb351a2e0aeea9373a891a05c8db73334470a9.zip |
Fix SI-3836 not-really-ambiguous import detection.
Normalize types before declaring that two imports are ambiguous,
because they might be the same thing. Review by @moors.
Diffstat (limited to 'test/files/neg')
-rw-r--r-- | test/files/neg/t3836.check | 13 | ||||
-rw-r--r-- | test/files/neg/t3836.scala | 28 |
2 files changed, 41 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] = ??? + } +} |