diff options
| author | Edmund Noble <edmundnoble@gmail.com> | 2016-12-26 17:43:04 -0500 |
|---|---|---|
| committer | Edmund Noble <Edmund Noble> | 2016-12-31 17:52:33 -0500 |
| commit | d1fc98370ad59518de96ae52e035e36b145180e2 (patch) | |
| tree | 23e6c51ecea84f4aa476be7a4ace2302d46ef345 /test | |
| parent | bf9b00ebede9ab16fc4662a3dd5f5fb5d6a5ab7c (diff) | |
| download | scala-d1fc98370ad59518de96ae52e035e36b145180e2.tar.gz scala-d1fc98370ad59518de96ae52e035e36b145180e2.tar.bz2 scala-d1fc98370ad59518de96ae52e035e36b145180e2.zip | |
Improved error messages for identically named, differently prefixed types
Diffstat (limited to 'test')
| -rw-r--r-- | test/files/neg/no-predef.check | 8 | ||||
| -rw-r--r-- | test/files/neg/t2102.check | 4 | ||||
| -rw-r--r-- | test/files/neg/type-diagnostics.check | 4 |
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..eef6945c2f 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; |