diff options
| author | Martin Odersky <odersky@gmail.com> | 2007-06-29 14:41:55 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2007-06-29 14:41:55 +0000 |
| commit | 674015b30bb6191f955548b6eff705506bf5591c (patch) | |
| tree | ecfc465dc9a75e427065873379e2b1c808009c05 /test | |
| parent | 2096c0622247b4abd0f7420289044e2c97122780 (diff) | |
| download | scala-674015b30bb6191f955548b6eff705506bf5591c.tar.gz scala-674015b30bb6191f955548b6eff705506bf5591c.tar.bz2 scala-674015b30bb6191f955548b6eff705506bf5591c.zip | |
fxied .check files for tcpoly
Diffstat (limited to 'test')
| -rw-r--r-- | test/files/neg/tcpoly_bounds.check | 2 | ||||
| -rw-r--r-- | test/files/neg/tcpoly_typealias.check | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/files/neg/tcpoly_bounds.check b/test/files/neg/tcpoly_bounds.check index 206d862825..8b65c8d7fe 100644 --- a/test/files/neg/tcpoly_bounds.check +++ b/test/files/neg/tcpoly_bounds.check @@ -1,4 +1,4 @@ -tcpoly_bounds.scala:3: error: type arguments [List] do not conform to class A's type parameter bounds [m<: [x]>: Nothing <: Option[x]] +tcpoly_bounds.scala:3: error: type arguments [List] do not conform to class A's type parameter bounds [m[x] <: Option[x]] object b extends A[List] ^ one error found diff --git a/test/files/neg/tcpoly_typealias.check b/test/files/neg/tcpoly_typealias.check index d7cf719127..670add2c04 100644 --- a/test/files/neg/tcpoly_typealias.check +++ b/test/files/neg/tcpoly_typealias.check @@ -1,12 +1,12 @@ -tcpoly_typealias.scala:37: error: The kind of type m does not conform to the expected kind of type m<: [+x]>: Nothing <: Any in trait A. +tcpoly_typealias.scala:37: error: The kind of type m does not conform to the expected kind of type m[+x] in trait A. BInv.this.m's type parameters do not match type m's expected parameters: type x (in trait BInv) is invariant, but type x (in trait A) is declared covariant type m[x] = FooCov[x] // error: invariant x in alias def ^ -tcpoly_typealias.scala:41: error: The kind of type m does not conform to the expected kind of type m<: [+x]>: Nothing <: Any in trait A. +tcpoly_typealias.scala:41: error: The kind of type m does not conform to the expected kind of type m[+x] in trait A. BCon.this.m's type parameters do not match type m's expected parameters: type x (in trait BCon) is contravariant, but type x (in trait A) is declared covariant type m[-x] = FooCon[x] // error: contravariant x ^ -tcpoly_typealias.scala:45: error: The kind of type m does not conform to the expected kind of type m<: [+x]>: Nothing <: Any in trait A. +tcpoly_typealias.scala:45: error: The kind of type m does not conform to the expected kind of type m[+x] in trait A. BBound.this.m's type parameters do not match type m's expected parameters: type x (in trait BBound)'s bounds >: Nothing <: String are stricter than type x (in trait A)'s declared bounds >: Nothing <: Any type m[+x <: String] = FooBound[x] // error: x with stricter bound ^ |