summaryrefslogtreecommitdiff
path: root/test/files/neg
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@epfl.ch>2010-09-01 15:40:55 +0000
committerLukas Rytz <lukas.rytz@epfl.ch>2010-09-01 15:40:55 +0000
commit7f1e23872efb20a1cebe765ee319e628582dd517 (patch)
treeb23501995e1612e84612b5cbfd5181282b2a2ca2 /test/files/neg
parenta5a958146507482866c8ac9dca4210b1e8a21391 (diff)
downloadscala-7f1e23872efb20a1cebe765ee319e628582dd517.tar.gz
scala-7f1e23872efb20a1cebe765ee319e628582dd517.tar.bz2
scala-7f1e23872efb20a1cebe765ee319e628582dd517.zip
Merged revisions 22683 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk ........ r22683 | rytz | 2010-08-05 16:41:54 +0200 (Thu, 05 Aug 2010) | 1 line fix the failing test. review by dubochet. ........
Diffstat (limited to 'test/files/neg')
-rw-r--r--test/files/neg/variances.check2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/neg/variances.check b/test/files/neg/variances.check
index c5269190c2..d395e45e4e 100644
--- a/test/files/neg/variances.check
+++ b/test/files/neg/variances.check
@@ -7,7 +7,7 @@ variances.scala:14: error: covariant type A occurs in contravariant position in
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]
^
-variances.scala:63: error: covariant type A occurs in contravariant position in type => test.Covariant.T[A]{def m: (A) => A} of value x
+variances.scala:63: error: covariant type A occurs in contravariant position in type => test.Covariant.T[A]{val m: (A) => A} of value x
val x: T[A] {
^
variances.scala:79: error: covariant type T occurs in contravariant position in type => test.TestAlias.B[C.this.A] of method foo