summaryrefslogtreecommitdiff
path: root/test/files/neg/array-not-seq.check
diff options
context:
space:
mode:
authorHeather Miller <heather.miller@epfl.ch>2012-04-15 14:51:18 +0200
committerHeather Miller <heather.miller@epfl.ch>2012-04-15 14:51:18 +0200
commite4bea920b42eaa526a9e07ad001f17443d6abeba (patch)
treec786202cc9d0fa5b1a26dfd8e1154cacca7fbaf4 /test/files/neg/array-not-seq.check
parent23aa1a8d7b08b767f90657baf9bc13a355682671 (diff)
parent364dd41c3e0e33afe6c3ec6e0c04f1d345c4b6ca (diff)
downloadscala-e4bea920b42eaa526a9e07ad001f17443d6abeba.tar.gz
scala-e4bea920b42eaa526a9e07ad001f17443d6abeba.tar.bz2
scala-e4bea920b42eaa526a9e07ad001f17443d6abeba.zip
Merge branch 'master' of https://github.com/scala/scala into wip-sip14-fixes
Diffstat (limited to 'test/files/neg/array-not-seq.check')
-rw-r--r--test/files/neg/array-not-seq.check12
1 files changed, 9 insertions, 3 deletions
diff --git a/test/files/neg/array-not-seq.check b/test/files/neg/array-not-seq.check
index c16ecdad72..a3a639e772 100644
--- a/test/files/neg/array-not-seq.check
+++ b/test/files/neg/array-not-seq.check
@@ -1,7 +1,13 @@
array-not-seq.scala:2: error: An Array will no longer match as Seq[_].
def f1(x: Any) = x.isInstanceOf[Seq[_]]
^
-error: An Array will no longer match as Seq[_].
-error: An Array will no longer match as Seq[_].
-error: An Array will no longer match as Seq[_].
+array-not-seq.scala:4: error: An Array will no longer match as Seq[_].
+ case _: Seq[_] => true
+ ^
+array-not-seq.scala:16: error: An Array will no longer match as Seq[_].
+ case (Some(_: Seq[_]), Nil, _) => 1
+ ^
+array-not-seq.scala:17: error: An Array will no longer match as Seq[_].
+ case (None, List(_: List[_], _), _) => 2
+ ^
four errors found