From ce0e7dcf8721d3ef595d6f245aa5cf7c1c8389a9 Mon Sep 17 00:00:00 2001 From: Philippus Date: Fri, 5 Apr 2019 19:34:23 +0200 Subject: [PATCH 1/3] Update scala 2.13.0-M5 to 2.13.0-RC1 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 21967fb8..02b7a393 100644 --- 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( From 437d60047827e2eaecebce0e13825291db4a7b7e Mon Sep 17 00:00:00 2001 From: Philippus Date: Fri, 5 Apr 2019 19:35:56 +0200 Subject: [PATCH 2/3] Convert to String to call + --- src/main/scala/scala/async/internal/TransformUtils.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/scala/async/internal/TransformUtils.scala b/src/main/scala/scala/async/internal/TransformUtils.scala index c8d3eb23..1c1dd17a 100644 --- 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) From c9a06d645a55d04d09028224080291a0d385d2a7 Mon Sep 17 00:00:00 2001 From: Philippus Date: Fri, 5 Apr 2019 19:36:51 +0200 Subject: [PATCH 3/3] Reinstate test that now passes --- src/test/scala/scala/async/run/futures/FutureSpec.scala | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/test/scala/scala/async/run/futures/FutureSpec.scala b/src/test/scala/scala/async/run/futures/FutureSpec.scala index 9407ae93..52566894 100644 --- 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._