From 3f192157811eb268d46f3a71011a5b2b966faa14 Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Thu, 26 May 2011 04:43:01 +0000
Subject: Finished reverting the misbegotten r23262, no r...

Finished reverting the misbegotten r23262, no review.
---
 test/files/pos/no-widen-locals.scala   | 17 -----------------
 test/files/pos/widen-existential.scala |  4 ++++
 test/files/run/constrained-types.check |  2 +-
 3 files changed, 5 insertions(+), 18 deletions(-)
 delete mode 100644 test/files/pos/no-widen-locals.scala

(limited to 'test/files')

diff --git a/test/files/pos/no-widen-locals.scala b/test/files/pos/no-widen-locals.scala
deleted file mode 100644
index 32579404b2..0000000000
--- a/test/files/pos/no-widen-locals.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-import annotation.switch
-
-object Test {
-  def f(x: Int) = {
-    val X1 = 5
-    val X2 = 10
-    val X3 = 15
-    val X4 = 20
-
-    (x: @switch) match {
-      case X1 => 1
-      case X2 => 2
-      case X3 => 3
-      case X4 => 4
-    }
-  }
-}
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> 
 
-- 
cgit v1.2.3