Skip to content

Update scala 2.13.0-M5 to 2.13.0-RC1 #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 5, 2019
Merged

Update scala 2.13.0-M5 to 2.13.0-RC1 #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce0e7dc
Update scala 2.13.0-M5 to 2.13.0-RC1
Philippus Apr 5, 2019
437d600
Convert to String to call +
Philippus Apr 5, 2019
c9a06d6
Reinstate test that now passes
Philippus Apr 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions src/main/scala/scala/async/internal/TransformUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 1 addition & 5 deletions src/test/scala/scala/async/run/futures/FutureSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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._
Expand Down