From 18fd93b5ec7e439b59b75f96e976aad6025a76f4 Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Sat, 29 Sep 2012 13:34:25 -0700
Subject: Revert "SI-4881 infer variance from formals, then result"

This reverts commit 5c5e8d4dcd151a6e2bf9e7c259c618b9b4eff00f.
---
 test/files/neg/t5845.check |  5 ++++-
 test/files/pos/t4881.scala | 31 -------------------------------
 2 files changed, 4 insertions(+), 32 deletions(-)
 delete mode 100644 test/files/pos/t4881.scala

(limited to 'test')

diff --git a/test/files/neg/t5845.check b/test/files/neg/t5845.check
index c0b402fccb..8c6100d6de 100644
--- a/test/files/neg/t5845.check
+++ b/test/files/neg/t5845.check
@@ -1,4 +1,7 @@
+t5845.scala:9: error: value +++ is not a member of Int
+  println(5 +++ 5)
+            ^
 t5845.scala:15: error: value +++ is not a member of Int
   println(5 +++ 5)
             ^
-one error found
+two errors found
diff --git a/test/files/pos/t4881.scala b/test/files/pos/t4881.scala
deleted file mode 100644
index 46cfad9793..0000000000
--- a/test/files/pos/t4881.scala
+++ /dev/null
@@ -1,31 +0,0 @@
-class Contra[-T]
-trait A
-trait B extends A
-trait C extends B
-
-// test improved variance inference: first try formals to see in which variance positions the type param appears;
-// only when that fails to determine variance, look at result type
-object Test {
-  def contraLBUB[a >: C <: A](): Contra[a] = null
-  def contraLB[a >: C](): Contra[a] = null
-
-{
-  val x = contraLBUB() //inferred Contra[C] instead of Contra[A]
-  val x1: Contra[A] = x
-}
-
-{
-  val x = contraLB() //inferred Contra[C] instead of Contra[Any]
-  val x1: Contra[Any] = x
-}
-
-{
-  val x = contraLBUB // make sure it does the same thing as its ()-less counterpart
-  val x1: Contra[A] = x
-}
-
-{
-  val x = contraLB
-  val x1: Contra[Any] = x
-}
-}
-- 
cgit v1.2.3