diff options
| author | Paul Phillips <paulp@improving.org> | 2010-12-06 04:04:56 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2010-12-06 04:04:56 +0000 |
| commit | 8922c4ed092a2fb4c3f6002f7c49d304f299cd02 (patch) | |
| tree | 7ca9c695328777ad292deac95b4c0347b6c38280 /test/files/neg | |
| parent | b6db478a9641dd488f00fab0c0a113ef83fec5d3 (diff) | |
| download | scala-8922c4ed092a2fb4c3f6002f7c49d304f299cd02.tar.gz scala-8922c4ed092a2fb4c3f6002f7c49d304f299cd02.tar.bz2 scala-8922c4ed092a2fb4c3f6002f7c49d304f299cd02.zip | |
Moved ClassfileAnnotation/StaticAnnotation/Anno...
Moved ClassfileAnnotation/StaticAnnotation/Annotation/TypeConstraint
into scala.annotation and enabled the deprecated type aliases in scala.*
to point there. Also enclosed is a new starr to bootstrap. No review.
Diffstat (limited to 'test/files/neg')
| -rw-r--r-- | test/files/neg/bug935.check | 4 | ||||
| -rw-r--r-- | test/files/neg/bug935.scala | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/test/files/neg/bug935.check b/test/files/neg/bug935.check index 63b267964b..6a4129eee3 100644 --- a/test/files/neg/bug935.check +++ b/test/files/neg/bug935.check @@ -1,7 +1,7 @@ -bug935.scala:5: error: type arguments [Test3.B] do not conform to class E's type parameter bounds [T <: String] +bug935.scala:7: error: type arguments [Test3.B] do not conform to class E's type parameter bounds [T <: String] @E[B](new B) val b = "hi" ^ -bug935.scala:11: error: type arguments [Test4.B] do not conform to class E's type parameter bounds [T <: String] +bug935.scala:13: error: type arguments [Test4.B] do not conform to class E's type parameter bounds [T <: String] val b: String @E[B](new B) = "hi" ^ two errors found diff --git a/test/files/neg/bug935.scala b/test/files/neg/bug935.scala index 8677efaf3f..299062adb8 100644 --- a/test/files/neg/bug935.scala +++ b/test/files/neg/bug935.scala @@ -1,3 +1,5 @@ +import annotation.Annotation + object Test3 { class E[T >: Nothing <: String](s: T) extends Annotation class B |