Commita425e4f

authored

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

Update scala 2.13.0-M5 to 2.13.0-RC1

2 parentsb052e47 +c9a06d6 commita425e4fCopy full SHA for a425e4f

File tree

-8

lines changed

build.sbt
src
- main/scala/scala/async/internal
  - TransformUtils.scala
- test/scala/scala/async/run/futures
  - FutureSpec.scala

-8

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ scalaModuleSettings`
`4`	`4`
`5`	`5`	`scalaVersionsByJvm inThisBuild:= {`
`6`	`6`	`valv212="2.12.8"`
`7`		`-valv213="2.13.0-M5"`
	`7`	`+valv213="2.13.0-RC1"`
`8`	`8`
`9`	`9`	`valallFalse=List(v212->false, v213->false)`
`10`	`10`	`Map(`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -554,9 +554,9 @@ private[async] trait TransformUtils {`
`554`	`554`	`// we have to create the trio of members manually.`
`555`	`555`	`valACCESSOR= (1L<<27).asInstanceOf[FlagSet]`
`556`	`556`	`valSTABLE= (1L<<22).asInstanceOf[FlagSet]`
`557`		`-valfield=ValDef(Modifiers(Flag.MUTABLE\|Flag.PRIVATE\|Flag.LOCAL),TermName(name+""),TypeTree(tpt), init)`
	`557`	`+valfield=ValDef(Modifiers(Flag.MUTABLE\|Flag.PRIVATE\|Flag.LOCAL),TermName(name.toString+""),TypeTree(tpt), init)`
`558`	`558`	`valgetter=DefDef(Modifiers(ACCESSOR\|STABLE), name,Nil,Nil,TypeTree(tpt),Select(This(typeNames.EMPTY), field.name))`
`559`		`-valsetter=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"))))`
	`559`	`+valsetter=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"))))`
`560`	`560`	`field:: getter:: setter::Nil`
`561`	`561`	`}else {`
`562`	`562`	`valresult=ValDef(NoMods, name,TypeTree(tpt), init)`

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -86,11 +86,7 @@ class FutureSpec {`
`86`	`86`	`}`
`87`	`87`	`Await.ready(waiting,2000 millis)`
`88`	`88`
`89`		`-// commented out like https://github.com/scala/scala/blob/23e8f087e143b118cfac6ed7e83b0a865c798ccc/test/files/jvm/future-spec/FutureTests.scala#L79`
`90`		`-// (https://github.com/scala/scala/commit/5cd3442419ba8fcbf6798740d00d4cdbd0f47c0c)`
`91`		`-// doesn't pass in 2.13.0-M5 in particular`
`92`		`-// ms.size mustBe (4)`
`93`		`-//FIXME should check`
	`89`	`+ ms.size mustBe (4)`
`94`	`90`	`}`
`95`	`91`
`96`	`92`	`importExecutionContext.Implicits._`

Comments

(0)