Merge pull request #7 from retronym/topic/scala-2.10.1

Scala 2.10.1 compatibility

2 files changed, 12 insertions, 9 deletions

diff --git a/src/test/scala/scala/async/TreeInterrogation.scala b/src/test/scala/scala/async/TreeInterrogation.scala
index 93cfdf5..4d611e5 100644
--- a/src/test/scala/scala/async/TreeInterrogation.scala
+++ b/src/test/scala/scala/async/TreeInterrogation.scala
@@ -69,16 +69,19 @@ object TreeInterrogation extends App {
   withDebug {
     val cm = reflect.runtime.currentMirror
     val tb = mkToolbox("-cp target/scala-2.10/classes -Xprint:flatten")
+    import scala.async.Async._
     val tree = tb.parse(
-      """ import scala.async.AsyncId.{async, await}
+      """ import scala.async.AsyncId._
         | async {
-        |   await(1)
-        |   val neg1 = -1
-        |   val a = await(1)
-        |   val f = { case x => ({case x => neg1 * x}: PartialFunction[Int, Int])(x + a) }: PartialFunction[Int, Int]
-        |   await(f(2))
+        |   val x = 1
+        |   val opt = Some("")
+        |   await(0)
+        |   val o @ Some(y) = opt
+        |
+        |   {
+        |     val o @ Some(y) = Some(".")
+        |   }
         | }
-        | ()
         | """.stripMargin)
     println(tree)
     val tree1 = tb.typeCheck(tree.duplicate)
diff --git a/src/test/scala/scala/async/run/nesteddef/NestedDef.scala b/src/test/scala/scala/async/run/nesteddef/NestedDef.scala
index 2baef0d..ee0a78e 100644
--- a/src/test/scala/scala/async/run/nesteddef/NestedDef.scala
+++ b/src/test/scala/scala/async/run/nesteddef/NestedDef.scala
@@ -20,7 +20,7 @@ class NestedDef {
       def foo(z: Any) = (a.toDouble, bar(x).toDouble, z)
       foo(await(2))
     }
-    result mustBe (0d, 44d, 2)
+    result mustBe ((0d, 44d, 2))
   }
 
 
@@ -35,6 +35,6 @@ class NestedDef {
       val foo = (z: Any) => (a.toDouble, bar(x).toDouble, z)
       foo(await(2))
     }
-    result mustBe (0d, 44d, 2)
+    result mustBe ((0d, 44d, 2))
   }
 }