Merge pull request #21 from danslapman/master

Fix 2.12.0-RC1 compatibility

Author: danslapman

build.sbt

@@ -30,7 +30,10 @@ val pluginJar = packageTask in (plugin, Compile)
 // TODO: the library project's test are really plugin tests, but we first need that jar
 lazy val library = project settings (scalaModuleOsgiSettings: _*) settings (MimaPlugin.mimaDefaultSettings: _*) settings (
   name                       := "scala-continuations-library",
-  MimaKeys.mimaPreviousArtifacts  := Set(organization.value % s"${name.value}_2.11.0-RC1" % "1.0.0"),
+  MimaKeys.mimaPreviousArtifacts  := Set(
+    organization.value % s"${name.value}_2.11.0-RC1" % "1.0.0",
+    organization.value % s"${name.value}_2.11" % "1.0.2"
+  ),
   scalacOptions       ++= Seq(
     // add the plugin to the compiler
     s"-Xplugin:${pluginJar.value.getAbsolutePath}",

library/src/test/scala/scala/tools/selectivecps/TestSuite.scala

@@ -661,12 +661,8 @@ class HigherOrder {
   @Test def t5472 = {
     val map = Map("foo" -> 1, "bar" -> 2)
     reset {
-      val mapped =
-        for {
-          (location, accessors) <- new ContinuationizedParallelIterable(map)
-        } yield {
-          shiftUnit0[Int, Unit](23)
-        }
+      val mapped = new ContinuationizedParallelIterable(map)
+        .map(strIntTpl => shiftUnit0[Int, Unit](23))
       assertEquals(List(23, 23), mapped.toList)
     }
   }
@@ -792,7 +788,7 @@ class HigherOrder {
   }
   class ExecutionContext
 
-  implicit def defaultExecutionContext = new ExecutionContext
+  implicit def defaultExecutionContext: ExecutionContext = new ExecutionContext
 
   case class Future[+T](x: T) {
     final def map[A](f: T => A): Future[A] = new Future[A](f(x))

plugin/src/main/scala/scala/tools/selectivecps/SelectiveANFTransform.scala renamed to plugin/src/main/scala-2.11/scala/tools/selectivecps/SelectiveANFTransform.scala

@@ -2,9 +2,9 @@
 
 package scala.tools.selectivecps
 
-import scala.tools.nsc.transform._
-import scala.tools.nsc.symtab._
 import scala.tools.nsc.plugins._
+import scala.tools.nsc.symtab._
+import scala.tools.nsc.transform._
 
 /**
  * In methods marked @cps, explicitly name results of calls to other @cps methods
@@ -13,9 +13,8 @@ abstract class SelectiveANFTransform extends PluginComponent with Transform with
   TypingTransformers with CPSUtils {
   // inherits abstract value `global` and class `Phase` from Transform
 
-  import global._                  // the global environment
-  import definitions._             // standard classes and methods
-  import typer.atOwner             // methods to type trees
+  import global._
+  import definitions._             // methods to type trees
 
   override def description = "ANF pre-transform for @cps"