summaryrefslogtreecommitdiff
path: root/test/files/neg/bug1183.check
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-05-19 20:06:19 +0000
committerPaul Phillips <paulp@improving.org>2011-05-19 20:06:19 +0000
commit4afa092314487c0095ff9fd5756d05340f6150b0 (patch)
treed3cf421e67192041f78858fe10735505f4891b3c /test/files/neg/bug1183.check
parent7595671ec3929aa4ac978826521300a900250214 (diff)
downloadscala-4afa092314487c0095ff9fd5756d05340f6150b0.tar.gz
scala-4afa092314487c0095ff9fd5756d05340f6150b0.tar.bz2
scala-4afa092314487c0095ff9fd5756d05340f6150b0.zip
Removes SUnit (long deprecated!) from the stand...
Removes SUnit (long deprecated!) from the standard library. the relatively small number of partest tests in Scala's suite that were still using SUnit now either just use regular asserts, or they print stuff that partest checks with a .check file. Also fixed some bad indentation, removed ancient useless-looking commented-out code, etc. Contributed by Seth Tisue (way to go seth) no review.
Diffstat (limited to 'test/files/neg/bug1183.check')
-rw-r--r--test/files/neg/bug1183.check8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/files/neg/bug1183.check b/test/files/neg/bug1183.check
index ebbf8aca23..9e20592d08 100644
--- a/test/files/neg/bug1183.check
+++ b/test/files/neg/bug1183.check
@@ -1,16 +1,16 @@
-bug1183.scala:10: error: name clash: class Foo defines object Baz
+bug1183.scala:6: error: name clash: class Foo defines object Baz
and its companion object Foo also defines class Baz
object Baz
^
-bug1183.scala:11: error: name clash: class Foo defines class Bam
+bug1183.scala:7: error: name clash: class Foo defines class Bam
and its companion object Foo also defines object Bam
class Bam
^
-bug1183.scala:12: error: name clash: class Foo defines object Bar
+bug1183.scala:8: error: name clash: class Foo defines object Bar
and its companion object Foo also defines class Bar
object Bar
^
-bug1183.scala:13: error: name clash: class Foo defines class Bar
+bug1183.scala:9: error: name clash: class Foo defines class Bar
and its companion object Foo also defines class Bar
case class Bar(i:Int)
^