summaryrefslogtreecommitdiff
path: root/test/files/neg/t6048.check
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@epfl.ch>2012-08-14 08:56:26 +0200
committerAdriaan Moors <adriaan.moors@epfl.ch>2012-08-14 09:37:19 +0200
commit3ccaa1026e7e74d99fe39c9608e28c48b422e2c9 (patch)
treea1187b22900d5904f9ba6e5664440a8248491f5a /test/files/neg/t6048.check
parent48d9fb7307fb6519fe786a7d9be97996c5812fb7 (diff)
parent12baa2ea399b4f281c62fd20479c1e626f244d03 (diff)
downloadscala-3ccaa1026e7e74d99fe39c9608e28c48b422e2c9.tar.gz
scala-3ccaa1026e7e74d99fe39c9608e28c48b422e2c9.tar.bz2
scala-3ccaa1026e7e74d99fe39c9608e28c48b422e2c9.zip
Merge branch '2.10.x'
Conflicts: src/compiler/scala/tools/nsc/Global.scala src/compiler/scala/tools/nsc/typechecker/Typers.scala test/files/neg/t6048.check
Diffstat (limited to 'test/files/neg/t6048.check')
-rw-r--r--test/files/neg/t6048.check7
1 files changed, 5 insertions, 2 deletions
diff --git a/test/files/neg/t6048.check b/test/files/neg/t6048.check
index 319e3fa620..5e11d24fde 100644
--- a/test/files/neg/t6048.check
+++ b/test/files/neg/t6048.check
@@ -4,9 +4,12 @@ t6048.scala:3: warning: unreachable code
t6048.scala:8: warning: unreachable code
case _ if false => x // unreachable
^
-t6048.scala:14: warning: unreachable code
+t6048.scala:13: warning: patterns after a variable pattern cannot match (SLS 8.1.1)
+ case _ => x
+ ^
+t6048.scala:14: warning: unreachable code due to variable pattern on line 13
case 5 if true => x // unreachable
^
error: No warnings can be incurred under -Xfatal-warnings.
-three warnings found
+four warnings found
one error found