summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorSimon Ochsenreither <simon@ochsenreither.de>2012-03-12 17:20:06 +0100
committerSimon Ochsenreither <simon@ochsenreither.de>2012-03-12 20:33:12 +0100
commitfbeceb8f38f0a02bbfcc03ddbb0aea15dfa2f63a (patch)
treebb286056afd84151215c65241ad20ac09bd674c0 /test
parentee51b6e1b1bc4bd60e6f6bbaea6eb3d4be8b3c97 (diff)
downloadscala-fbeceb8f38f0a02bbfcc03ddbb0aea15dfa2f63a.tar.gz
scala-fbeceb8f38f0a02bbfcc03ddbb0aea15dfa2f63a.tar.bz2
scala-fbeceb8f38f0a02bbfcc03ddbb0aea15dfa2f63a.zip
Removed "Todo: test" where a test exists.
- Renamed t960 to a more sensible name, because SI-960 is not related to the test and I couldn't find a ticket number. - Some minor fixes to @deprecated like switched or missing versions.
Diffstat (limited to 'test')
-rw-r--r--test/files/neg/overloaded-unapply.check (renamed from test/files/neg/t960.check)6
-rw-r--r--test/files/neg/overloaded-unapply.scala (renamed from test/files/neg/t960.scala)0
2 files changed, 3 insertions, 3 deletions
diff --git a/test/files/neg/t960.check b/test/files/neg/overloaded-unapply.check
index 603b1cb032..1da93f6939 100644
--- a/test/files/neg/t960.check
+++ b/test/files/neg/overloaded-unapply.check
@@ -1,13 +1,13 @@
-t960.scala:18: error: ambiguous reference to overloaded definition,
+overloaded-unapply.scala:18: error: ambiguous reference to overloaded definition,
both method unapply in object List of type [a](xs: List[a])Option[Null]
and method unapply in object List of type [a](xs: List[a])Option[(a, List[a])]
match argument types (List[a])
case List(x, xs) => 7
^
-t960.scala:22: error: cannot resolve overloaded unapply
+overloaded-unapply.scala:22: error: cannot resolve overloaded unapply
case List(x, xs) => 7
^
-t960.scala:12: error: method unapply is defined twice in t960.scala
+overloaded-unapply.scala:12: error: method unapply is defined twice in overloaded-unapply.scala
def unapply[a](xs: List[a]): Option[Null] = xs match {
^
three errors found
diff --git a/test/files/neg/t960.scala b/test/files/neg/overloaded-unapply.scala
index 36909626c1..36909626c1 100644
--- a/test/files/neg/t960.scala
+++ b/test/files/neg/overloaded-unapply.scala