summaryrefslogtreecommitdiff
path: root/test/files/neg/variances.check
diff options
context:
space:
mode:
authorJosh Suereth <joshua.suereth@gmail.com>2011-11-23 14:14:34 -0500
committerJosh Suereth <joshua.suereth@gmail.com>2011-11-23 14:14:34 -0500
commit26aee7eb070ae35984be1d0c3d3b02d4909a6e26 (patch)
tree2448b2ee277b4a3bfd1df64e5b3e7eb02138ac32 /test/files/neg/variances.check
parentb7b81ca286b1f426cd19befd50fbc513bb82282f (diff)
downloadscala-26aee7eb070ae35984be1d0c3d3b02d4909a6e26.tar.gz
scala-26aee7eb070ae35984be1d0c3d3b02d4909a6e26.tar.bz2
scala-26aee7eb070ae35984be1d0c3d3b02d4909a6e26.zip
Added *.log and build/ to gitignore so partest/...
Added *.log and build/ to gitignore so partest/ant artifacts don't show up in our commit messages. Also fixed whitespace issues arising from the filter-branch history rewrite for git move.
Diffstat (limited to 'test/files/neg/variances.check')
-rw-r--r--test/files/neg/variances.check4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/files/neg/variances.check b/test/files/neg/variances.check
index 4eaab56cef..b134a9a68c 100644
--- a/test/files/neg/variances.check
+++ b/test/files/neg/variances.check
@@ -1,8 +1,8 @@
variances.scala:4: error: covariant type A occurs in contravariant position in type test.Vector[A] of value x
- def append(x: Vector[A]): Vector[A]
+ def append(x: Vector[A]): Vector[A]
^
variances.scala:14: error: covariant type A occurs in contravariant position in type A of value a
- private[this] def setA(a : A) = this.a = a
+ private[this] def setA(a : A) = this.a = a
^
variances.scala:16: error: covariant type A occurs in invariant position in supertype test.C[A] with ScalaObject of object Baz
object Baz extends C[A]