diff options
| author | Stefan Zeiger <szeiger@novocode.com> | 2016-07-05 12:37:04 +0200 |
|---|---|---|
| committer | Stefan Zeiger <szeiger@novocode.com> | 2016-07-07 21:37:18 +0200 |
| commit | cd9240ed524e69f01fcd872b9791754102c6530b (patch) | |
| tree | 8b1a0c01b2181b55403cc7b382d1a09ec1dbea26 /test/files/neg | |
| parent | 6612ba010b0e70c53550d1e47141c8dc89a55f23 (diff) | |
| download | scala-cd9240ed524e69f01fcd872b9791754102c6530b.tar.gz scala-cd9240ed524e69f01fcd872b9791754102c6530b.tar.bz2 scala-cd9240ed524e69f01fcd872b9791754102c6530b.zip | |
SI-7301 Make tuple classes final
This includes undoing the special case for `-Xfuture` introduced in
https://github.com/scala/scala/pull/2299 and updating tests to take
the new errors into account.
Diffstat (limited to 'test/files/neg')
| -rw-r--r-- | test/files/neg/t7294.check | 6 | ||||
| -rw-r--r-- | test/files/neg/t7294.flags | 1 | ||||
| -rw-r--r-- | test/files/neg/t7294b.check | 4 | ||||
| -rw-r--r-- | test/files/neg/t7294b.flags | 1 |
4 files changed, 6 insertions, 6 deletions
diff --git a/test/files/neg/t7294.check b/test/files/neg/t7294.check index f15289c1c0..a308f2457d 100644 --- a/test/files/neg/t7294.check +++ b/test/files/neg/t7294.check @@ -1,6 +1,10 @@ t7294.scala:4: warning: fruitless type test: a value of type (Int, Int) cannot also be a Seq[A] (1, 2) match { case Seq() => 0; case _ => 1 } ^ -error: No warnings can be incurred under -Xfatal-warnings. +t7294.scala:4: error: pattern type is incompatible with expected type; + found : Seq[A] + required: (Int, Int) + (1, 2) match { case Seq() => 0; case _ => 1 } + ^ one warning found one error found diff --git a/test/files/neg/t7294.flags b/test/files/neg/t7294.flags deleted file mode 100644 index 3f3381a45b..0000000000 --- a/test/files/neg/t7294.flags +++ /dev/null @@ -1 +0,0 @@ --Xfuture -Xfatal-warnings diff --git a/test/files/neg/t7294b.check b/test/files/neg/t7294b.check index 707266f0cc..3390cb7278 100644 --- a/test/files/neg/t7294b.check +++ b/test/files/neg/t7294b.check @@ -1,6 +1,4 @@ -t7294b.scala:1: warning: inheritance from class Tuple2 in package scala is deprecated (since 2.11.0): Tuples will be made final in a future version. +t7294b.scala:1: error: illegal inheritance from final class Tuple2 class C extends Tuple2[Int, Int](0, 0) ^ -error: No warnings can be incurred under -Xfatal-warnings. -one warning found one error found diff --git a/test/files/neg/t7294b.flags b/test/files/neg/t7294b.flags deleted file mode 100644 index d1b831ea87..0000000000 --- a/test/files/neg/t7294b.flags +++ /dev/null @@ -1 +0,0 @@ --deprecation -Xfatal-warnings
\ No newline at end of file |