summaryrefslogtreecommitdiff
path: root/test/files/neg
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2008-09-05 13:33:01 +0000
committerMartin Odersky <odersky@gmail.com>2008-09-05 13:33:01 +0000
commitd0eb6ae1a2a6136ed90d7cbab0efcacc4cd4c337 (patch)
tree91038a37e13639d6a70178c4dc067452a116d981 /test/files/neg
parent5d1339b1211dce7469fddaccecdc0437db41252f (diff)
downloadscala-d0eb6ae1a2a6136ed90d7cbab0efcacc4cd4c337.tar.gz
scala-d0eb6ae1a2a6136ed90d7cbab0efcacc4cd4c337.tar.bz2
scala-d0eb6ae1a2a6136ed90d7cbab0efcacc4cd4c337.zip
updated test
Diffstat (limited to 'test/files/neg')
-rw-r--r--test/files/neg/null-unsoundness.check2
-rw-r--r--test/files/neg/null-unsoundness.scala2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/files/neg/null-unsoundness.check b/test/files/neg/null-unsoundness.check
index 5f28e76d06..bc0b5c996c 100644
--- a/test/files/neg/null-unsoundness.check
+++ b/test/files/neg/null-unsoundness.check
@@ -1,5 +1,5 @@
null-unsoundness.scala:8: error: stable identifier required, but A.this.x found.
- Note that value x is not stable because its type, A.this.D with A.this.A, is volatile.
+ Note that value x is not stable because its type, A.this.A with A.this.D, is volatile.
var y: x.T = new C("abc")
^
one error found
diff --git a/test/files/neg/null-unsoundness.scala b/test/files/neg/null-unsoundness.scala
index d30ff613b1..15dedfbb97 100644
--- a/test/files/neg/null-unsoundness.scala
+++ b/test/files/neg/null-unsoundness.scala
@@ -4,7 +4,7 @@ class C(x: String) extends B
class A {
type A >: Null
class D { type T >: C <: B }
- val x: D with A = null
+ val x: A with D = null
var y: x.T = new C("abc")
}
object Test extends A with Application {