diff options
author | Paul Phillips <paulp@improving.org> | 2013-02-01 18:19:11 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2013-02-02 01:41:44 -0800 |
commit | e3d9a08e08088cf6631eb0a7dbabf8360c4618a0 (patch) | |
tree | 99346a8b24535f0776fb04cce2c7b74db9ee9fd4 /test/files | |
parent | 29128012800ac99e05552b0d52246c2691f18b83 (diff) | |
download | scala-e3d9a08e08088cf6631eb0a7dbabf8360c4618a0.tar.gz scala-e3d9a08e08088cf6631eb0a7dbabf8360c4618a0.tar.bz2 scala-e3d9a08e08088cf6631eb0a7dbabf8360c4618a0.zip |
Cleaning up after brutal merge of 2.10.x into master.
That's the best I can do. The tests pass, if someone wants
a cleaner merge it is all theirs.
For reference, the merge leading up to this commit was achieved
as follows. The lines with -s ours are where the merge commit
being merged was completely made up of backports from master.
git merge -s ours eff78b852e c1dd8bbaa4 && \
git merge 7026376dcc ccd7abe897 && \
git merge -s ours 62681e191a && \
git merge 74b3e9aefe 7d80e08469 d24f341f08 c4f49759fe \
27d73a2352 ba72ee7c6f 42c4cc7a1e d672102fd8 644eb7078a && \
git merge -s ours 08596af059 b573c287d2 && \
git merge d1b6d8b20f && \
git merge -s ours 110b54a575 36f78dd606 309ff57ba6 && \
git merge 06295f9682 d3886086c3 adf51eef76 b403234a27 && \
git merge -s ours 09d1433064 && \
git merge 9ddcc1b90e cabf626bbc && \
git merge -s ours 283924bfa5
Diffstat (limited to 'test/files')
-rw-r--r-- | test/files/neg/t6963a.check | 4 | ||||
-rw-r--r-- | test/files/neg/t6963b.check | 13 | ||||
-rw-r--r-- | test/files/neg/t6963b.flags | 1 | ||||
-rw-r--r-- | test/files/neg/t6963b.scala | 20 |
4 files changed, 3 insertions, 35 deletions
diff --git a/test/files/neg/t6963a.check b/test/files/neg/t6963a.check index 159896fd10..5858e7740a 100644 --- a/test/files/neg/t6963a.check +++ b/test/files/neg/t6963a.check @@ -1,5 +1,7 @@ -t6963a.scala:4: error: method scanRight in trait TraversableLike has changed semantics in version 2.9.0: +t6963a.scala:4: warning: method scanRight in trait TraversableLike has changed semantics in version 2.9.0: The behavior of `scanRight` has changed. The previous behavior can be reproduced with scanRight.reverse. List(1,2,3,4,5).scanRight(0)(_+_) ^ +error: No warnings can be incurred under -Xfatal-warnings. +one warning found one error found diff --git a/test/files/neg/t6963b.check b/test/files/neg/t6963b.check deleted file mode 100644 index 7e205a41d0..0000000000 --- a/test/files/neg/t6963b.check +++ /dev/null @@ -1,13 +0,0 @@ -t6963b.scala:2: error: An Array will no longer match as Seq[_]. - def f1(x: Any) = x.isInstanceOf[Seq[_]] - ^ -t6963b.scala:4: error: An Array will no longer match as Seq[_]. - case _: Seq[_] => true - ^ -t6963b.scala:16: error: An Array will no longer match as Seq[_]. - case (Some(_: Seq[_]), Nil, _) => 1 - ^ -t6963b.scala:17: error: An Array will no longer match as Seq[_]. - case (None, List(_: List[_], _), _) => 2 - ^ -four errors found diff --git a/test/files/neg/t6963b.flags b/test/files/neg/t6963b.flags deleted file mode 100644 index 83caa2b147..0000000000 --- a/test/files/neg/t6963b.flags +++ /dev/null @@ -1 +0,0 @@ --Xmigration:2.7 -Xfatal-warnings
\ No newline at end of file diff --git a/test/files/neg/t6963b.scala b/test/files/neg/t6963b.scala deleted file mode 100644 index 3cfa8f0dca..0000000000 --- a/test/files/neg/t6963b.scala +++ /dev/null @@ -1,20 +0,0 @@ -object Test { - def f1(x: Any) = x.isInstanceOf[Seq[_]] - def f2(x: Any) = x match { - case _: Seq[_] => true - case _ => false - } - - def f3(x: Any) = x match { - case _: Array[_] => true - case _ => false - } - - def f4(x: Any) = x.isInstanceOf[Traversable[_]] - - def f5(x1: Any, x2: Any, x3: AnyRef) = (x1, x2, x3) match { - case (Some(_: Seq[_]), Nil, _) => 1 - case (None, List(_: List[_], _), _) => 2 - case _ => 3 - } -} |