diff options
| author | michelou <michelou@epfl.ch> | 2007-05-31 18:43:38 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2007-05-31 18:43:38 +0000 |
| commit | 96d7374b9bfd9c4917793a55149ac227fabbc3f3 (patch) | |
| tree | 56e369a0975fca7376283918f669d937a53dc578 /test | |
| parent | aac8bba0c25aef3c2e410d1f28818c8b1fe9266f (diff) | |
| download | scala-96d7374b9bfd9c4917793a55149ac227fabbc3f3.tar.gz scala-96d7374b9bfd9c4917793a55149ac227fabbc3f3.tar.bz2 scala-96d7374b9bfd9c4917793a55149ac227fabbc3f3.zip | |
Capitalized type params in Predef, fixed bug in...
Capitalized type params in Predef, fixed bug in URLZipArchive
Diffstat (limited to 'test')
| -rw-r--r-- | test/files/neg/bug900.check | 2 | ||||
| -rw-r--r-- | test/files/neg/variances.check | 4 | ||||
| -rw-r--r-- | test/files/neg/variances.scala | 6 | ||||
| -rw-r--r-- | test/files/neg/viewtest.check | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/test/files/neg/bug900.check b/test/files/neg/bug900.check index f5687ac645..3ba577bbcd 100644 --- a/test/files/neg/bug900.check +++ b/test/files/neg/bug900.check @@ -3,7 +3,7 @@ bug900.scala:4: error: type mismatch; required: AnyRef Note that implicit conversions are not applicable because they are ambiguous: both method any2stringadd in object Predef of type (Any)scala.runtime.StringAdd - and method any2ArrowAssoc in object Predef of type [a](a)ArrowAssoc[a] + and method any2ArrowAssoc in object Predef of type [A](A)ArrowAssoc[A] are possible conversion functions from Foo.this.x.type to AnyRef def break(): x.type ^ diff --git a/test/files/neg/variances.check b/test/files/neg/variances.check index 006fd49e9f..7f46b656bc 100644 --- a/test/files/neg/variances.check +++ b/test/files/neg/variances.check @@ -1,4 +1,4 @@ -variances.scala:2: error: covariant type a occurs in contravariant position in type Vector[a] of value x - def append(x: Vector[a]): Vector[a] +variances.scala:2: error: covariant type A occurs in contravariant position in type Vector[A] of value x + def append(x: Vector[A]): Vector[A] ^ one error found diff --git a/test/files/neg/variances.scala b/test/files/neg/variances.scala index cebe8ce5e6..38d6617beb 100644 --- a/test/files/neg/variances.scala +++ b/test/files/neg/variances.scala @@ -1,5 +1,5 @@ -trait Vector[+a] { - def append(x: Vector[a]): Vector[a] - private[this] def append3(x: Vector[a]): Vector[a] = append(x) +trait Vector[+A] { + def append(x: Vector[A]): Vector[A] + private[this] def append3(x: Vector[A]): Vector[A] = append(x) } diff --git a/test/files/neg/viewtest.check b/test/files/neg/viewtest.check index 05b5fe0b16..5415ba4f92 100644 --- a/test/files/neg/viewtest.check +++ b/test/files/neg/viewtest.check @@ -5,7 +5,7 @@ viewtest.scala:43: error: type mismatch; ^ viewtest.scala:104: error: ambiguous implicit values: both method view4 in object O of type [a](a)a - and method identity in object Predef of type [a](a)a + and method identity in object Predef of type [A](A)A match expected type (test.Str) => test.Ordered[test.Str] t = t insert Str(s) ^ |