Merge pull request #7019 from dotty-staging/upgrade/scalac-2.13

Switch to the 2.13 standard library

Author: smarter

.drone.yml

@@ -27,7 +27,7 @@ steps:
 
 - name: test
   pull: default
-  image: lampepfl/dotty:2019-04-22
+  image: lampepfl/dotty:2019-08-22
   depends_on: [ clone ]
   commands:
   - cp -R . /tmp/1/ && cd /tmp/1/
@@ -36,7 +36,7 @@ steps:
 
 - name: test_bootstrapped
   pull: default
-  image: lampepfl/dotty:2019-04-22
+  image: lampepfl/dotty:2019-08-22
   depends_on: [ clone ]
   commands:
   - cp -R . /tmp/2/ && cd /tmp/2/
@@ -45,7 +45,7 @@ steps:
 
 - name: community_build
   pull: default
-  image: lampepfl/dotty:2019-04-22
+  image: lampepfl/dotty:2019-08-22
   depends_on: [ clone ]
   commands:
   - cp -R . /tmp/3/ && cd /tmp/3/
@@ -54,7 +54,7 @@ steps:
 
 - name: test_sbt
   pull: default
-  image: lampepfl/dotty:2019-04-22
+  image: lampepfl/dotty:2019-08-22
   depends_on: [ clone ]
   commands:
   - cp -R . /tmp/4/ && cd /tmp/4/
@@ -66,7 +66,7 @@ steps:
 
 - name: test_java11
   pull: default
-  image: lampepfl/dotty:2019-04-22
+  image: lampepfl/dotty:2019-08-22
   depends_on: [ clone ]
   commands:
   - export PATH="/usr/lib/jvm/java-11-openjdk-amd64/bin:$PATH"
@@ -80,7 +80,7 @@ steps:
 
 - name: documentation
   pull: default
-  image: lampepfl/dotty:2019-04-22
+  image: lampepfl/dotty:2019-08-22
   depends_on:
   - test
   - test_bootstrapped
@@ -99,7 +99,7 @@ steps:
 
 - name: publish_nightly
   pull: default
-  image: lampepfl/dotty:2019-04-22
+  image: lampepfl/dotty:2019-08-22
   depends_on:
   - test
   - test_bootstrapped
@@ -126,7 +126,7 @@ steps:
 
 - name: publish_release
   pull: default
-  image: lampepfl/dotty:2019-04-22
+  image: lampepfl/dotty:2019-08-22
   depends_on:
   - test
   - test_bootstrapped
@@ -169,7 +169,7 @@ steps:
 
 - name: publish_sbt_release
   pull: default
-  image: lampepfl/dotty:2019-04-22
+  image: lampepfl/dotty:2019-08-22
   depends_on:
   - test
   - test_bootstrapped

.gitmodules

@@ -39,7 +39,7 @@
 	url = https://github.com/dotty-staging/sourcecode
 [submodule "community-build/community-projects/scala-xml"]
 	path = community-build/community-projects/scala-xml
-	url = https://github.com/scala/scala-xml
+	url = https://github.com/dotty-staging/scala-xml
 [submodule "community-build/community-projects/shapeless"]
 	path = community-build/community-projects/shapeless
 	url = https://github.com/milessabin/shapeless

bench/src/main/scala/Benchmarks.scala

@@ -13,7 +13,7 @@ import org.openjdk.jmh.results.format._
 import java.util.concurrent.TimeUnit
 
 import java.io.{File, FileOutputStream, BufferedWriter, FileWriter}
-import scala.collection.JavaConversions._
+import scala.collection.JavaConverters._
 import scala.io.Source
 
 object Bench {
@@ -86,7 +86,7 @@ class CompilerOptions {
 
   @Setup
   def prepare: Unit = {
-    opts = Bench.readCompileOptions.to[Array]
+    opts = Bench.readCompileOptions.toArray
   }
 }
 

community-build/community-projects/ScalaPB

@@ -9,7 +9,7 @@ import org.junit.experimental.categories.Category
 
 @Category(Array(classOf[TestCategory]))
 class CommunityBuildTest {
-  lazy val communitybuildDir: Path = Paths.get(sys.props("user.dir") + "/community-build/")
+  lazy val communitybuildDir: Path = Paths.get(sys.props("user.dir"))
 
   lazy val compilerVersion: String = {
     val file = communitybuildDir.resolve("dotty-bootstrapped.version")
@@ -153,15 +153,15 @@ class CommunityBuildTest {
 
   @Test def fastparse = test(
     project       = "fastparse",
-    testCommand   = "fastparseJVM/compile",
-    updateCommand = "fastparseJVM/update"
+    testCommand   = "dotty-community-build/compile;dotty-community-build/test:compile",
+    updateCommand = "dotty-community-build/update"
   )
 
   // TODO: revert to sourcecodeJVM/test
   @Test def sourcecode = test(
     project       = "sourcecode",
-    testCommand   = "sourcecodeJVM/compile",
-    updateCommand = "sourcecodeJVM/update"
+    testCommand   = "sourcecode/compile;sourcecode/test:compile",
+    updateCommand = "sourcecode/update"
   )
 
   @Test def stdLib213 = test(
@@ -194,8 +194,16 @@ class CommunityBuildTest {
     // We set `useEffpiPlugin := false` because we don't want to run their
     // compiler plugin since it relies on external binaries (from the model
     // checker mcrl2), however we do compile the compiler plugin.
-    testCommand   = ";set ThisBuild / useEffpiPlugin := false; effpi/test:compile; plugin/test:compile; benchmarks/test:compile; examples/test:compile; pluginBenchmarks/test:compile",
-    updateCommand = ";set ThisBuild / useEffpiPlugin := false; effpi/test:update; plugin/test:update; benchmarks/test:update; examples/test:update; pluginBenchmarks/test:update"
+
+    // We have to drop the plugin and some akka tests for now, the plugin depends on github.com/bmc/scalasti which
+    // has not been updated since 2018, so no 2.13 compat. Some akka tests are dropped due to MutableBehaviour being
+    // dropped in the 2.13 compatible release
+
+    // testCommand   = ";set ThisBuild / useEffpiPlugin := false; effpi/test:compile; plugin/test:compile; benchmarks/test:compile; examples/test:compile; pluginBenchmarks/test:compile",
+    // updateCommand = ";set ThisBuild / useEffpiPlugin := false; effpi/test:update; plugin/test:update; benchmarks/test:update; examples/test:update; pluginBenchmarks/test:update"
+
+    testCommand   = ";set ThisBuild / useEffpiPlugin := false; effpi/test:compile; benchmarks/test:compile; examples/test:compile; pluginBenchmarks/test:compile",
+    updateCommand = ";set ThisBuild / useEffpiPlugin := false; effpi/test:update; benchmarks/test:update; examples/test:update; pluginBenchmarks/test:update"
   )
 
   // TODO @oderky? It got broken by #5458

community-build/community-projects/algebra

@@ -387,7 +387,7 @@ trait BCodeHelpers extends BCodeIdiomatic with BytecodeWriters {
       }
       debuglog(s"Potentially conflicting names for forwarders: $conflictingNames")
 
-      for (m0 <- moduleClass.info.membersBasedOnFlags(ExcludedForwarderFlags, Flag_METHOD)) {
+      for (m0 <- moduleClass.info.sortedMembersBasedOnFlags(required = Flag_METHOD, excluded = ExcludedForwarderFlags)) {
         val m = if (m0.isBridge) m0.nextOverriddenSymbol else m0
         if (m == NoSymbol)
           log(s"$m0 is a bridge method that overrides nothing, something went wrong in a previous phase.")

community-build/community-projects/betterfiles

@@ -602,7 +602,11 @@ abstract class BackendInterface extends BackendInterfaceDefinitions {
     def params: List[Symbol]
     def resultType: Type
     def memberInfo(s: Symbol): Type
-    def membersBasedOnFlags(excludedFlags: Flags, requiredFlags: Flags): List[Symbol]
+
+    /** The members of this type that have all of `required` flags but none of `excluded` flags set.
+     *  The members are sorted by name and signature to guarantee a stable ordering.
+     */
+    def sortedMembersBasedOnFlags(required: Flags, excluded: Flags): List[Symbol]
     def members: List[Symbol]
     def decls: List[Symbol]
     def underlying: Type

community-build/community-projects/effpi

@@ -131,14 +131,6 @@ class CoreBTypes[BTFS <: BTypesFromSymbols[_ <: BackendInterface]](val bTypes: B
   lazy val srFloatRef   : ClassBType = classBTypeFromSymbol(requiredClass[scala.runtime.FloatRef])
   lazy val srDoubleRef  : ClassBType = classBTypeFromSymbol(requiredClass[scala.runtime.DoubleRef])
 
-  // scala.FunctionX and scala.runtim.AbstractFunctionX
-  lazy val FunctionReference         : Vector[ClassBType]   = (0 to MaxFunctionArity).map(i => classBTypeFromSymbol(FunctionClass(i)))(collection.breakOut)
-  lazy val AbstractFunctionReference : Vector[ClassBType]   = (0 to MaxFunctionArity).map(i => classBTypeFromSymbol(AbstractFunctionClass(i)))(collection.breakOut)
-  lazy val AbstractFunctionArityMap  : Map[ClassBType, Int] = AbstractFunctionReference.zipWithIndex.toMap
-
-  lazy val PartialFunctionReference         : ClassBType = classBTypeFromSymbol(PartialFunctionClass)
-  lazy val AbstractPartialFunctionReference : ClassBType = classBTypeFromSymbol(AbstractPartialFunctionClass)
-
   lazy val BoxesRunTime: ClassBType = classBTypeFromSymbol(requiredClass[scala.runtime.BoxesRunTime])
 
   /**
@@ -263,13 +255,6 @@ final class CoreBTypesProxy[BTFS <: BTypesFromSymbols[_ <: BackendInterface]](va
   def srFloatRef   : ClassBType = _coreBTypes.srFloatRef
   def srDoubleRef  : ClassBType = _coreBTypes.srDoubleRef
 
-  def FunctionReference         : Vector[ClassBType]   = _coreBTypes.FunctionReference
-  def AbstractFunctionReference : Vector[ClassBType]   = _coreBTypes.AbstractFunctionReference
-  def AbstractFunctionArityMap  : Map[ClassBType, Int] = _coreBTypes.AbstractFunctionArityMap
-
-  def PartialFunctionReference         : ClassBType = _coreBTypes.PartialFunctionReference
-  def AbstractPartialFunctionReference : ClassBType = _coreBTypes.AbstractPartialFunctionReference
-
   def BoxesRunTime: ClassBType = _coreBTypes.BoxesRunTime
 
   def asmBoxTo  : Map[BType, MethodNameAndType] = _coreBTypes.asmBoxTo

community-build/community-projects/fastparse

@@ -878,8 +878,18 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma
 
     def =:=(other: Type): Boolean = tp =:= other
 
-    def membersBasedOnFlags(excludedFlags: Flags, requiredFlags: Flags): List[Symbol] =
-      tp.membersBasedOnFlags(termFlagSet(requiredFlags), termFlagSet(excludedFlags)).map(_.symbol).toList
+    def sortedMembersBasedOnFlags(required: Flags, excluded: Flags): List[Symbol] = {
+      val requiredFlagSet = termFlagSet(required)
+      val excludedFlagSet = termFlagSet(excluded)
+      // The output of `memberNames` is a Set, sort it to guarantee a stable ordering.
+      val names = tp.memberNames(takeAllFilter).toSeq.sorted
+      val buffer = mutable.ListBuffer[Symbol]()
+      names.foreach { name =>
+        buffer ++= tp.memberBasedOnFlags(name, requiredFlagSet, excludedFlagSet)
+          .alternatives.sortBy(_.signature)(Signature.lexicographicOrdering).map(_.symbol)
+      }
+      buffer.toList
+    }
 
     def resultType: Type = tp.resultType
 

community-build/community-projects/minitest

@@ -394,11 +394,11 @@ class GenBCodePipeline(val entryPoints: List[Symbol], val int: DottyBackendInter
         }
         for ((label, i) <- initialLabels.iterator.zipWithIndex) {
           mv.visitLabel(label)
-          emitLambdaDeserializeIndy(groups(i))
+          emitLambdaDeserializeIndy(groups(i).toIndexedSeq)
           mv.visitInsn(ARETURN)
         }
         mv.visitLabel(terminalLabel)
-        emitLambdaDeserializeIndy(groups(numGroups - 1))
+        emitLambdaDeserializeIndy(groups(numGroups - 1).toIndexedSeq)
         mv.visitInsn(ARETURN)
       }
 

community-build/community-projects/scala-xml

@@ -194,7 +194,7 @@ class JSCodeGen()(implicit ctx: Context) {
       ctx.settings.outputDir.value
 
     val pathParts = sym.fullName.toString.split("[./]")
-    val dir = (outputDirectory /: pathParts.init)(_.subdirectoryNamed(_))
+    val dir = pathParts.init.foldLeft(outputDirectory)(_.subdirectoryNamed(_))
 
     var filename = pathParts.last
     if (sym.is(ModuleClass))

community-build/community-projects/scalacheck

@@ -15,7 +15,7 @@ object Bench extends Driver {
   @sharable private[this] var numRuns = 1
 
   private def ntimes(n: Int)(op: => Reporter): Reporter =
-    (emptyReporter /: (0 until n)) ((_, _) => op)
+    (0 until n).foldLeft(emptyReporter)((_, _) => op)
 
   override def doCompile(compiler: Compiler, fileNames: List[String])(implicit ctx: Context): Reporter =
     ntimes(numRuns) {

community-build/community-projects/scalap

@@ -74,10 +74,10 @@ class Driver {
       val (classPaths, classNames) = fileNames0.flatMap { name =>
         val path = Paths.get(name)
         if (name.endsWith(".jar")) {
-          new dotty.tools.io.Jar(File(name)).iterator.collect {
+          new dotty.tools.io.Jar(File(name)).toList.collect {
             case e if e.getName.endsWith(".tasty") =>
               (name, e.getName.stripSuffix(".tasty").replace("/", "."))
-          }.toList
+          }
         }
         else if (!name.endsWith(".tasty"))
           ("", name) :: Nil

community-build/community-projects/scalatest

@@ -56,7 +56,7 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
     ctx.initialize()(start) // re-initialize the base context with start
     def addImport(ctx: Context, refFn: () => TermRef) =
       ctx.fresh.setImportInfo(ImportInfo.rootImport(refFn)(ctx))
-    (start.setRun(this) /: defn.RootImportFns)(addImport)
+    defn.RootImportFns.foldLeft(start.setRun(this))(addImport)
   }
 
   private[this] var compiling = false

community-build/community-projects/scopt

@@ -64,10 +64,10 @@ object CheckTrees {
         check(arg.tpe <:< formal)
       }
       val MethodType(paramNames, paramTypes) = fn.tpe.widen // checked already at construction
-      (args, paramNames, paramTypes).zipped foreach checkArg
+      args.lazyZip(paramNames).lazyZip(paramTypes) foreach checkArg
     case TypeApply(fn, args) =>
       val pt @ PolyType(_) = fn.tpe.widen // checked already at construction
-      (args, pt.instantiateBounds(args map (_.tpe))).zipped foreach checkTypeArg
+      args.lazyZip(pt.instantiateBounds(args map (_.tpe))) foreach checkTypeArg
     case Literal(const: Constant) =>
     case New(tpt) =>
       check(tpt.isValueType)
@@ -184,7 +184,7 @@ object CheckTrees {
       check(tpt.isValueType)
       val tparams = tpt.tpe.typeParams
       check(sameLength(tparams, args))
-      (args, tparams map (_.info.bounds)).zipped foreach checkTypeArg
+      args.lazyZip(tparams map (_.info.bounds)) foreach checkTypeArg
     case TypeBoundsTree(lo, hi) =>
       check(lo.isValueType); check(hi.isValueType)
       check(lo.tpe <:< hi.tpe)