summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2010-12-03 06:17:08 +0000
committerPaul Phillips <paulp@improving.org>2010-12-03 06:17:08 +0000
commit979c57cd8732a2f9c9de066d532971986bcdff7d (patch)
tree7fb0cda14859f5075b90705bd09185a01f05ac09 /test/files
parent811c7f9ba664fcb339c09474af65fa4874f23543 (diff)
downloadscala-979c57cd8732a2f9c9de066d532971986bcdff7d.tar.gz
scala-979c57cd8732a2f9c9de066d532971986bcdff7d.tar.bz2
scala-979c57cd8732a2f9c9de066d532971986bcdff7d.zip
immutable.Map keySet returns immutable.Set.
Diffstat (limited to 'test/files')
-rw-r--r--test/files/neg/type-diagnostics.check4
-rw-r--r--test/files/neg/type-diagnostics.scala2
2 files changed, 3 insertions, 3 deletions
diff --git a/test/files/neg/type-diagnostics.check b/test/files/neg/type-diagnostics.check
index 0ed9f4631b..c5e6dec3f8 100644
--- a/test/files/neg/type-diagnostics.check
+++ b/test/files/neg/type-diagnostics.check
@@ -1,8 +1,8 @@
type-diagnostics.scala:4: error: type mismatch;
found : scala.collection.Set[String]
required: scala.collection.immutable.Set[String]
- def f = Calculator("Hello",binding.keySet)
- ^
+ def f = Calculator("Hello", binding.keySet: collection.Set[String])
+ ^
type-diagnostics.scala:13: error: type mismatch;
found : List[a(in method f2)]
required: List[a(in method f1)]
diff --git a/test/files/neg/type-diagnostics.scala b/test/files/neg/type-diagnostics.scala
index fcc49812f4..c4171328de 100644
--- a/test/files/neg/type-diagnostics.scala
+++ b/test/files/neg/type-diagnostics.scala
@@ -1,7 +1,7 @@
object SetVsSet {
case class Calculator[+T](name: String, parameters: Set[String])
val binding = Map.empty[String, String]
- def f = Calculator("Hello",binding.keySet)
+ def f = Calculator("Hello", binding.keySet: collection.Set[String])
}
object TParamConfusion {