summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/files/pos/widen-existential.scala4
-rw-r--r--test/files/run/constrained-types.check2
-rw-r--r--test/pending/pos/no-widen-locals.scala (renamed from test/files/pos/no-widen-locals.scala)2
3 files changed, 7 insertions, 1 deletions
diff --git a/test/files/pos/widen-existential.scala b/test/files/pos/widen-existential.scala
index 90a62e461b..d7fa3cc1d8 100644
--- a/test/files/pos/widen-existential.scala
+++ b/test/files/pos/widen-existential.scala
@@ -1,3 +1,7 @@
class A {
{ val x = classOf[List[_]] }
+ def f = {
+ val g = classOf[List[_]]
+ List(g, g)
+ }
} \ No newline at end of file
diff --git a/test/files/run/constrained-types.check b/test/files/run/constrained-types.check
index 6919eca9bc..66580f063a 100644
--- a/test/files/run/constrained-types.check
+++ b/test/files/run/constrained-types.check
@@ -100,7 +100,7 @@ scala> def m = {
val y : String @Annot(x) = x
y
} // x should not escape the local scope with a narrow type
-m: String @Annot("three")
+m: java.lang.String @Annot(x) forSome { val x: java.lang.String }
scala>
diff --git a/test/files/pos/no-widen-locals.scala b/test/pending/pos/no-widen-locals.scala
index 32579404b2..ba568f64eb 100644
--- a/test/files/pos/no-widen-locals.scala
+++ b/test/pending/pos/no-widen-locals.scala
@@ -1,3 +1,5 @@
+// Worked from r23262 until that was reverted somewhere
+// around r25016.
import annotation.switch
object Test {