diff options
author | michelou <michelou@epfl.ch> | 2008-01-18 21:46:34 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2008-01-18 21:46:34 +0000 |
commit | 0cbafac8afe0e7ead50b38533e246aea8b9ccf94 (patch) | |
tree | 50ec801ad86f2eb92c96065d065ec0bc4fbb37a7 /test | |
parent | 3267a516f95b4ab0a8c375d5e8f53204f05289af (diff) | |
download | scala-0cbafac8afe0e7ead50b38533e246aea8b9ccf94.tar.gz scala-0cbafac8afe0e7ead50b38533e246aea8b9ccf94.tar.bz2 scala-0cbafac8afe0e7ead50b38533e246aea8b9ccf94.zip |
Character -> Char
Diffstat (limited to 'test')
-rw-r--r-- | test/files/neg/variances.check | 10 | ||||
-rw-r--r-- | test/files/neg/variances.scala | 6 |
2 files changed, 3 insertions, 13 deletions
diff --git a/test/files/neg/variances.check b/test/files/neg/variances.check index f335035b5b..d809d0f598 100644 --- a/test/files/neg/variances.check +++ b/test/files/neg/variances.check @@ -1,12 +1,3 @@ -variances.scala:53: warning: type Character in object Predef is deprecated - val a : Foo[Character] = new Foo[Character] - ^ -variances.scala:53: warning: type Character in object Predef is deprecated - val a : Foo[Character] = new Foo[Character] - ^ -variances.scala:58: warning: type Character in object Predef is deprecated - val x : Character = test.a.getA - ^ 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] ^ @@ -16,5 +7,4 @@ variances.scala:14: error: covariant type A occurs in contravariant position in variances.scala:16: error: covariant type A occurs in invariant position in type test.C[A] with ScalaObject{def this(): object Foo.this.Baz} of object Baz object Baz extends C[A] ^ -three warnings found three errors found diff --git a/test/files/neg/variances.scala b/test/files/neg/variances.scala index f84ee8d5d5..fbd50d7065 100644 --- a/test/files/neg/variances.scala +++ b/test/files/neg/variances.scala @@ -50,12 +50,12 @@ object Covariant { val b : Int = 42 } class Test extends AbstractTest { - val a : Foo[Character] = new Foo[Character] + val a : Foo[Char] = new Foo[Char] } - def main(args : Array[String]) : Unit = { + def main(args : Array[String]) { val test = new Test test.c.doit(test.b) - val x : Character = test.a.getA + val x : Char = test.a.getA Console.println("XXX " + x) } } |