Merge pull request #217 from Philippus/update/scala-2.13.0-RC1

Update scala 2.13.0-M5 to 2.13.0-RC1
scala · Apr 5, 2019 · a425e4f · a425e4f
2 parents b052e47 + c9a06d6
commit a425e4f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/build.sbt b/build.sbt
@@ -4,7 +4,7 @@ scalaModuleSettings
 
 scalaVersionsByJvm in ThisBuild := {
   val v212 = "2.12.8"
-  val v213 = "2.13.0-M5"
+  val v213 = "2.13.0-RC1"
 
   val allFalse = List(v212 -> false, v213 -> false)
   Map(

diff --git a/src/main/scala/scala/async/internal/TransformUtils.scala b/src/main/scala/scala/async/internal/TransformUtils.scala
@@ -554,9 +554,9 @@ private[async] trait TransformUtils {
       // we have to create the trio of members manually.
       val ACCESSOR = (1L << 27).asInstanceOf[FlagSet]
       val STABLE = (1L << 22).asInstanceOf[FlagSet]
-      val field = ValDef(Modifiers(Flag.MUTABLE | Flag.PRIVATE | Flag.LOCAL), TermName(name + " "), TypeTree(tpt), init)
+      val field = ValDef(Modifiers(Flag.MUTABLE | Flag.PRIVATE | Flag.LOCAL), TermName(name.toString + " "), TypeTree(tpt), init)
       val getter = DefDef(Modifiers(ACCESSOR | STABLE), name, Nil, Nil, TypeTree(tpt), Select(This(typeNames.EMPTY), field.name))
-      val setter = DefDef(Modifiers(ACCESSOR), TermName(name + "_="), Nil, List(List(ValDef(NoMods, TermName("x"), TypeTree(tpt), EmptyTree))), TypeTree(definitions.UnitTpe), Assign(Select(This(typeNames.EMPTY), field.name), Ident(TermName("x"))))
+      val setter = DefDef(Modifiers(ACCESSOR), TermName(name.toString + "_="), Nil, List(List(ValDef(NoMods, TermName("x"), TypeTree(tpt), EmptyTree))), TypeTree(definitions.UnitTpe), Assign(Select(This(typeNames.EMPTY), field.name), Ident(TermName("x"))))
       field :: getter :: setter :: Nil
     } else {
       val result = ValDef(NoMods, name, TypeTree(tpt), init)

diff --git a/src/test/scala/scala/async/run/futures/FutureSpec.scala b/src/test/scala/scala/async/run/futures/FutureSpec.scala
@@ -86,11 +86,7 @@ class FutureSpec {
       }
       Await.ready(waiting, 2000 millis)
 
-      // commented out like https://github.com/scala/scala/blob/23e8f087e143b118cfac6ed7e83b0a865c798ccc/test/files/jvm/future-spec/FutureTests.scala#L79
-      // (https://github.com/scala/scala/commit/5cd3442419ba8fcbf6798740d00d4cdbd0f47c0c)
-      // doesn't pass in 2.13.0-M5 in particular
-      //   ms.size mustBe (4)
-      //FIXME should check
+      ms.size mustBe (4)
     }
 
     import ExecutionContext.Implicits._