From 20859263f2a2cf85464b333b9842bb31c020ee5e Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Mon, 15 Aug 2011 20:48:25 +0000
Subject: Removing the code which has been deprecated sin...

Removing the code which has been deprecated since 2.8.0. Contributed by
Simon Ochsenreither, although deleting code is such fun one hesitates to
call it a contribution. Still, we will. Closes SI-4860, no review.
---
 test/files/pos/MailBox.scala        | 3 ++-
 test/files/pos/bug927.scala         | 2 +-
 test/files/pos/depexists.scala      | 2 +-
 test/files/pos/unapplyComplex.scala | 6 +++---
 4 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'test/files/pos')

diff --git a/test/files/pos/MailBox.scala b/test/files/pos/MailBox.scala
index 67b923ea3e..8e27bd362d 100644
--- a/test/files/pos/MailBox.scala
+++ b/test/files/pos/MailBox.scala
@@ -1,8 +1,9 @@
 package test;
 
-import scala.concurrent._;
+import scala.actors.TIMEOUT;
 
 class MailBox {
+
   private class LinkedList[a] {
     var elem: a = _;
     var next: LinkedList[a] = null;
diff --git a/test/files/pos/bug927.scala b/test/files/pos/bug927.scala
index 7d4c59d94c..c903f19867 100644
--- a/test/files/pos/bug927.scala
+++ b/test/files/pos/bug927.scala
@@ -5,7 +5,7 @@ object Test {
       case Stream.Empty => 0
       case Stream.cons(hd, tl) => hd + sum(tl)
     }
-  val str: Stream[Int] = Stream.fromIterator(List(1,2,3).iterator)
+  val str: Stream[Int] = List(1,2,3).iterator.toStream
   assert(sum(str) == 6)
 
 }
diff --git a/test/files/pos/depexists.scala b/test/files/pos/depexists.scala
index d539c844c1..dff1917a47 100644
--- a/test/files/pos/depexists.scala
+++ b/test/files/pos/depexists.scala
@@ -1,5 +1,5 @@
 object depexists {
 
-  val c: Cell[(a, b)] forSome { type a <: Number; type b <: (a, a) } = null
+  val c: Option[(a, b)] forSome { type a <: Number; type b <: (a, a) } = null
   val d = c
 }
diff --git a/test/files/pos/unapplyComplex.scala b/test/files/pos/unapplyComplex.scala
index 70158348c3..148fcc1bb6 100644
--- a/test/files/pos/unapplyComplex.scala
+++ b/test/files/pos/unapplyComplex.scala
@@ -14,14 +14,14 @@ object ComplexRect {
   def unapply(z:Complex): Option[Complex] = {
     if(z.isInstanceOf[ComplexRect]) Some(z) else z match {
       case ComplexPolar(mod, arg) =>
-	Some(new ComplexRect(mod*Math.cos(arg), mod*Math.sin(arg)))
+	Some(new ComplexRect(mod*math.cos(arg), mod*math.sin(arg)))
 } } }
 
 object ComplexPolar {
   def unapply(z:Complex): Option[Complex] = {
     if(z.isInstanceOf[ComplexPolar]) Some(z) else z match {
       case ComplexRect(re,im) =>
-	Some(new ComplexPolar(Math.sqrt(re*re + im*im), Math.atan(re/im)))
+	Some(new ComplexPolar(math.sqrt(re*re + im*im), math.atan(re/im)))
 } } }
 
 object Test {
@@ -31,7 +31,7 @@ object Test {
 	Console.println("mod"+mod+"arg"+arg)
     }
     val Komplex = ComplexRect
-    new ComplexPolar(Math.sqrt(2),Math.Pi / 4.0) match {
+    new ComplexPolar(math.sqrt(2),math.Pi / 4.0) match {
       case Komplex(re,im) => // z @ ???
 	Console.println("re"+re+" im"+im)
     }
-- 
cgit v1.2.3