diff options
author | Paul Phillips <paulp@improving.org> | 2012-01-28 00:44:36 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-01-28 00:44:36 -0800 |
commit | 3e49826ca0c0c57ef14bc107a45084def5520d80 (patch) | |
tree | 8907f7ecdbdc99aff50f3860b94b0928b12824dd /test/files/neg | |
parent | 09544b756a1274c7cc2bdd302fd9bd1d33a16b70 (diff) | |
parent | e61eff23df977eeed19bfe253b01b69cce47dfa3 (diff) | |
download | scala-3e49826ca0c0c57ef14bc107a45084def5520d80.tar.gz scala-3e49826ca0c0c57ef14bc107a45084def5520d80.tar.bz2 scala-3e49826ca0c0c57ef14bc107a45084def5520d80.zip |
Merge branch 'unsealed-anyval' into inline
Conflicts:
src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala
Diffstat (limited to 'test/files/neg')
-rw-r--r-- | test/files/neg/nopredefs.check | 2 | ||||
-rw-r--r-- | test/files/neg/suggest-similar.check | 6 | ||||
-rw-r--r-- | test/files/neg/t2870.check | 2 | ||||
-rw-r--r-- | test/files/neg/t3854.check | 5 | ||||
-rw-r--r-- | test/files/neg/t3854.scala | 15 |
5 files changed, 25 insertions, 5 deletions
diff --git a/test/files/neg/nopredefs.check b/test/files/neg/nopredefs.check index e6c1af78a0..0a0ab34482 100644 --- a/test/files/neg/nopredefs.check +++ b/test/files/neg/nopredefs.check @@ -1,4 +1,4 @@ -nopredefs.scala:5: error: not found: value Set (similar: Seq) +nopredefs.scala:5: error: not found: value Set val y = Set(3) ^ one error found diff --git a/test/files/neg/suggest-similar.check b/test/files/neg/suggest-similar.check index 0a858aaf2e..057aa8b250 100644 --- a/test/files/neg/suggest-similar.check +++ b/test/files/neg/suggest-similar.check @@ -1,10 +1,10 @@ -suggest-similar.scala:8: error: not found: value flippitx (similar: flippity) +suggest-similar.scala:8: error: not found: value flippitx flippitx = 123 ^ -suggest-similar.scala:9: error: not found: value identiyt (similar: identity) +suggest-similar.scala:9: error: not found: value identiyt Nil map identiyt ^ -suggest-similar.scala:10: error: not found: type Bingus (similar: Dingus) +suggest-similar.scala:10: error: not found: type Bingus new Bingus ^ three errors found diff --git a/test/files/neg/t2870.check b/test/files/neg/t2870.check index ab962d48c8..99522eca65 100644 --- a/test/files/neg/t2870.check +++ b/test/files/neg/t2870.check @@ -1,4 +1,4 @@ -t2870.scala:1: error: not found: type Jar (similar: Jars) +t2870.scala:1: error: not found: type Jar class Jars(jar: Jar) ^ t2870.scala:4: error: encountered unrecoverable cycle resolving import. diff --git a/test/files/neg/t3854.check b/test/files/neg/t3854.check new file mode 100644 index 0000000000..c478481a6f --- /dev/null +++ b/test/files/neg/t3854.check @@ -0,0 +1,5 @@ +t3854.scala:1: error: class Bar needs to be abstract, since method foo in trait Foo of type [G[_]](implicit n: N[G,F])X[F] is not defined +(Note that N[G,F] does not match M[G]) +class Bar[F[_]] extends Foo[F] { + ^ +one error found diff --git a/test/files/neg/t3854.scala b/test/files/neg/t3854.scala new file mode 100644 index 0000000000..e8db76c0a5 --- /dev/null +++ b/test/files/neg/t3854.scala @@ -0,0 +1,15 @@ +class Bar[F[_]] extends Foo[F] { + def foo[G[_[_], _]](implicit M: M[G]): X[({type λ[α] = G[F, α] })#λ] = null +} +// vim: set ts=4 sw=4 et: + +trait M[F[_[_], _]] +trait N[F[_], G[_]] + +trait X[F[_]] { + def apply[A]: F[A] +} + +trait Foo[F[_]] { + def foo[G[_]](implicit n: N[G, F]): X[F] +} |