summaryrefslogtreecommitdiff
path: root/test/files/pos
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2013-03-10 10:00:54 -0700
committerPaul Phillips <paulp@improving.org>2013-03-10 21:04:42 -0700
commitcb02c96bed1454e1c0702c529366f3c40d6bffd9 (patch)
treee0b7d091bf99e750188e26a150db46bd4073ea84 /test/files/pos
parent2fa2db784075dfb58cf507c45a948819ade8a6d4 (diff)
downloadscala-cb02c96bed1454e1c0702c529366f3c40d6bffd9.tar.gz
scala-cb02c96bed1454e1c0702c529366f3c40d6bffd9.tar.bz2
scala-cb02c96bed1454e1c0702c529366f3c40d6bffd9.zip
Simplified the widening logic.
Should speak for itself. Whenever someone changed @switch from an error to a warning, it broke all the tests which depended on the error. I added -Xfatal-warnings to a couple which needed it. And one of those tests was then failing, as it must now since we couldn't get away with what was being attempted, so I moved it to pending.
Diffstat (limited to 'test/files/pos')
-rw-r--r--test/files/pos/no-widen-locals.scala19
-rw-r--r--test/files/pos/switch-small.flags1
2 files changed, 1 insertions, 19 deletions
diff --git a/test/files/pos/no-widen-locals.scala b/test/files/pos/no-widen-locals.scala
deleted file mode 100644
index 013e63f0a2..0000000000
--- a/test/files/pos/no-widen-locals.scala
+++ /dev/null
@@ -1,19 +0,0 @@
-// Worked from r23262 until that was reverted somewhere
-// around r25016.
-import annotation.switch
-
-object Test {
- def f(x: Int) = {
- val X1 = 5
- val X2 = 10
- val X3 = 15
- val X4 = 20
-
- (x: @switch) match {
- case X1 => 1
- case X2 => 2
- case X3 => 3
- case X4 => 4
- }
- }
-}
diff --git a/test/files/pos/switch-small.flags b/test/files/pos/switch-small.flags
new file mode 100644
index 0000000000..85d8eb2ba2
--- /dev/null
+++ b/test/files/pos/switch-small.flags
@@ -0,0 +1 @@
+-Xfatal-warnings