Merge pull request #5622 from edmundnoble/extra-errs

Improved error messages for identically named, differently prefixed types

3 files changed, 8 insertions, 8 deletions

diff --git a/test/files/neg/no-predef.check b/test/files/neg/no-predef.check
index a63d8c5ba5..f5c2e82fe1 100644
--- a/test/files/neg/no-predef.check
+++ b/test/files/neg/no-predef.check
@@ -1,11 +1,11 @@
 no-predef.scala:2: error: type mismatch;
- found   : scala.Long(5L)
- required: java.lang.Long
+ found   : Long (in scala)
+ required: Long (in java.lang)
   def f1 = 5L: java.lang.Long
            ^
 no-predef.scala:3: error: type mismatch;
- found   : java.lang.Long
- required: scala.Long
+ found   : Long (in java.lang)
+ required: Long (in scala)
   def f2 = new java.lang.Long(5) : Long
            ^
 no-predef.scala:4: error: value map is not a member of String
diff --git a/test/files/neg/t2102.check b/test/files/neg/t2102.check
index b4f91a5319..6f70839d22 100644
--- a/test/files/neg/t2102.check
+++ b/test/files/neg/t2102.check
@@ -1,6 +1,6 @@
 t2102.scala:2: error: type mismatch;
- found   : java.util.Iterator[Int]
- required: scala.collection.Iterator[_]
+ found   : Iterator[Int] (in java.util)
+ required: Iterator[_]   (in scala.collection)
   val x: Iterator[_] = new java.util.ArrayList[Int]().iterator
                                                       ^
 one error found
diff --git a/test/files/neg/type-diagnostics.check b/test/files/neg/type-diagnostics.check
index c5e6dec3f8..fd327bcb66 100644
--- a/test/files/neg/type-diagnostics.check
+++ b/test/files/neg/type-diagnostics.check
@@ -1,6 +1,6 @@
 type-diagnostics.scala:4: error: type mismatch;
- found   : scala.collection.Set[String]
- required: scala.collection.immutable.Set[String]
+ found   : Set[String] (in scala.collection)
+ required: Set[String] (in scala.collection.immutable)
   def f = Calculator("Hello", binding.keySet: collection.Set[String])
                                             ^
 type-diagnostics.scala:13: error: type mismatch;