Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.1…

…2.x-20160225 Conflicts: scripts/jobs/integrate/bootstrap src/build/maven/scala-actors-pom.xml test/files/pos/t3420.flags Conflicts were trivial to resolve.
dyuval · Feb 25, 2016 · 964630e · 964630e
2 parents d375334 + e0fc92a
commit 964630e
Show file tree

Hide file tree

Showing 48 changed files with 120 additions and 96 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -10,11 +10,11 @@ We are super happy about this, and are eager to make your experience contributin
 
 This is why we're collecting these notes on how to contribute, and we hope you'll share your experience to improve the process for the next contributor! (Feel free to send a PR for this note, send your thoughts to scala-internals, or tweet about it to @adriaanm.)
 
-By the way, the team at Typesafe is: @adriaanm, @lrytz, @retronym, and @SethTisue.
+By the way, the team at Lightbend (formerly Typesafe) is: @adriaanm, @lrytz, @retronym, @SethTisue, and @szeiger.
 
 ## What kind of PR are you submitting?
 
-Regardless of the nature of your Pull Request, we have to ask you to digitally sign the [Scala CLA](http://www.typesafe.com/contribute/cla/scala), to protect the OSS nature of the code base.
+Regardless of the nature of your Pull Request, we have to ask you to digitally sign the [Scala CLA](http://www.lightbend.com/contribute/cla/scala), to protect the OSS nature of the code base.
 
 You don't need to submit separate PRs for 2.11.x, 2.12.x, and 2.13.x. Any changes accepted on one of these branches will, in time, be merged into the later branches.
 

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ This is the official repository for the [Scala Programming Language](http://www.
 
 # How to contribute
 
-To contribute to the Scala Standard Library, Scala Compiler and Scala Language Specification, please send us a [pull request](https://help.github.com/articles/using-pull-requests/#fork--pull) from your fork of this repository! We do have to ask you to sign the [Scala CLA](http://www.typesafe.com/contribute/cla/scala) before we can merge any of your work into our code base, to protect its open source nature.
+To contribute to the Scala Standard Library, Scala Compiler and Scala Language Specification, please send us a [pull request](https://help.github.com/articles/using-pull-requests/#fork--pull) from your fork of this repository! We do have to ask you to sign the [Scala CLA](http://www.lightbend.com/contribute/cla/scala) before we can merge any of your work into our code base, to protect its open source nature.
 
 For more information on building and developing the core of Scala, read on!
 
@@ -133,8 +133,8 @@ Here, `<milestone>` is the milestone targeted by the PR (e.g., 2.11.6), and `<sh
 ### Eclipse
 See `src/eclipse/README.md`.
 
-### IntelliJ 14
-See `src/intellij/README.md`.
+### IntelliJ 15
+See [src/intellij/README.md](src/intellij/README.md).
 
 ## Building with sbt (EXPERIMENTAL)
 

diff --git a/build.sbt b/build.sbt
@@ -181,8 +181,8 @@ lazy val commonSettings = clearSourceAndResourceDirectories ++ publishSettings +
             <name>EPFL LAMP</name>
           </developer>
           <developer>
-            <id>Typesafe</id>
-            <name>Typesafe, Inc.</name>
+            <id>Lightbend</id>
+            <name>Lightbend, Inc.</name>
           </developer>
         </developers>
     apiURL.value match {

diff --git a/doc/LICENSE.md b/doc/LICENSE.md
@@ -4,7 +4,7 @@ Scala is licensed under the [BSD 3-Clause License](http://opensource.org/license
 
 Copyright (c) 2002-2016 EPFL
 
-Copyright (c) 2011-2016 Typesafe, Inc.
+Copyright (c) 2011-2016 Lightbend, Inc. (formerly Typesafe, Inc.)
 
 All rights reserved.
 

diff --git a/doc/License.rtf b/doc/License.rtf
@@ -11,7 +11,7 @@
 \fs40 \
 
 \fs26 Copyright (c) 2002-2016 EPFL\
-Copyright (c) 2011-2016 Typesafe, Inc.\
+Copyright (c) 2011-2016 Lightbend, Inc. (formerly Typesafe, Inc.)\
 All rights reserved.\
 \
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\

diff --git a/project/VersionUtil.scala b/project/VersionUtil.scala
@@ -115,7 +115,9 @@ object VersionUtil {
     val in = new FileInputStream(file("versions.properties"))
     try props.load(in)
     finally in.close()
-    props.asScala.toMap
+    props.asScala.toMap.map {
+      case (k, v) => (k, sys.props.getOrElse(k, v)) // allow system properties to override versions.properties
+    }
   }
 
   /** Get a subproject version number from `versionProps` */

diff --git a/scripts/jobs/integrate/bootstrap b/scripts/jobs/integrate/bootstrap
diff --git a/src/build/genprod.scala b/src/build/genprod.scala
@@ -15,7 +15,6 @@ import scala.language.postfixOps
  *      where the argument is the desired output directory
  *
  *  @author  Burak Emir, Stephane Micheloud, Geoffrey Washburn, Paul Phillips
- *  @version 1.1
  */
 object genprod extends App {
   val MAX_ARITY = 22
@@ -353,7 +352,7 @@ object ProductTwo extends Product(2)
 
 class Product(val i: Int) extends Group("Product") with Arity {
   val productElementComment = """
-  /** Returns the n-th projection of this product if 0 < n <= productArity,
+  /** Returns the n-th projection of this product if 0 <= n < productArity,
    *  otherwise throws an `IndexOutOfBoundsException`.
    *
    *  @param n number of the projection to be returned

diff --git a/src/build/maven/scala-compiler-doc-pom.xml b/src/build/maven/scala-compiler-doc-pom.xml
@@ -51,8 +51,8 @@
       <name>EPFL LAMP</name>
     </developer>
     <developer>
-      <id>Typesafe</id>
-      <name>Typesafe, Inc.</name>
+      <id>Lightbend</id>
+      <name>Lightbend, Inc.</name>
     </developer>
   </developers>
 </project>
diff --git a/src/build/maven/scala-compiler-interactive-pom.xml b/src/build/maven/scala-compiler-interactive-pom.xml
@@ -41,8 +41,8 @@
       <name>EPFL LAMP</name>
     </developer>
     <developer>
-      <id>Typesafe</id>
-      <name>Typesafe, Inc.</name>
+      <id>Lightbend</id>
+      <name>Lightbend, Inc.</name>
     </developer>
   </developers>
 </project>
diff --git a/src/build/maven/scala-compiler-pom.xml b/src/build/maven/scala-compiler-pom.xml
@@ -63,8 +63,8 @@
       <name>EPFL LAMP</name>
     </developer>
     <developer>
-      <id>Typesafe</id>
-      <name>Typesafe, Inc.</name>
+      <id>Lightbend</id>
+      <name>Lightbend, Inc.</name>
     </developer>
   </developers>
 </project>
diff --git a/src/build/maven/scala-dist-pom.xml b/src/build/maven/scala-dist-pom.xml
@@ -62,8 +62,8 @@
       <name>EPFL LAMP</name>
     </developer>
     <developer>
-      <id>Typesafe</id>
-      <name>Typesafe, Inc.</name>
+      <id>Lightbend</id>
+      <name>Lightbend, Inc.</name>
     </developer>
   </developers>
 </project>
diff --git a/src/build/maven/scala-library-all-pom.xml b/src/build/maven/scala-library-all-pom.xml
@@ -61,8 +61,8 @@
       <name>EPFL LAMP</name>
     </developer>
     <developer>
-      <id>Typesafe</id>
-      <name>Typesafe, Inc.</name>
+      <id>Lightbend</id>
+      <name>Lightbend, Inc.</name>
     </developer>
   </developers>
 </project>
diff --git a/src/build/maven/scala-library-pom.xml b/src/build/maven/scala-library-pom.xml
@@ -39,8 +39,8 @@
       <name>EPFL LAMP</name>
     </developer>
     <developer>
-      <id>Typesafe</id>
-      <name>Typesafe, Inc.</name>
+      <id>Lightbend</id>
+      <name>Lightbend, Inc.</name>
     </developer>
   </developers>
 </project>
diff --git a/src/build/maven/scala-reflect-pom.xml b/src/build/maven/scala-reflect-pom.xml
@@ -44,8 +44,8 @@
       <name>EPFL LAMP</name>
     </developer>
     <developer>
-      <id>Typesafe</id>
-      <name>Typesafe, Inc.</name>
+      <id>Lightbend</id>
+      <name>Lightbend, Inc.</name>
     </developer>
   </developers>
 </project>
diff --git a/src/build/maven/scalap-pom.xml b/src/build/maven/scalap-pom.xml
@@ -41,8 +41,8 @@
       <name>EPFL LAMP</name>
     </developer>
     <developer>
-      <id>Typesafe</id>
-      <name>Typesafe, Inc.</name>
+      <id>Lightbend</id>
+      <name>Lightbend, Inc.</name>
     </developer>
   </developers>
 </project>
diff --git a/src/compiler/scala/tools/nsc/GenericRunnerCommand.scala b/src/compiler/scala/tools/nsc/GenericRunnerCommand.scala
@@ -87,7 +87,11 @@ A file argument will be run as a scala script unless it contains only
 self-contained compilation units (classes and objects) and exactly one
 runnable main method.  In that case the file will be compiled and the
 main method invoked.  This provides a bridge between scripts and standard
-scala source.%n"""
+scala source.
+
+When running a script or using -e, an already running compilation daemon
+(fsc) is used, or a new one started on demand.  The -nc option can be
+used to prevent this.%n"""
 }
 
 object GenericRunnerCommand {

diff --git a/src/library/scala/Product1.scala b/src/library/scala/Product1.scala
@@ -24,7 +24,7 @@ trait Product1[@specialized(Int, Long, Double) +T1] extends Any with Product {
   override def productArity = 1
 
 
-  /** Returns the n-th projection of this product if 0 < n <= productArity,
+  /** Returns the n-th projection of this product if 0 <= n < productArity,
    *  otherwise throws an `IndexOutOfBoundsException`.
    *
    *  @param n number of the projection to be returned

diff --git a/src/library/scala/Product10.scala b/src/library/scala/Product10.scala
@@ -24,7 +24,7 @@ trait Product10[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10] extends Any w
   override def productArity = 10
 
 
-  /** Returns the n-th projection of this product if 0 < n <= productArity,
+  /** Returns the n-th projection of this product if 0 <= n < productArity,
    *  otherwise throws an `IndexOutOfBoundsException`.
    *
    *  @param n number of the projection to be returned

diff --git a/src/library/scala/Product11.scala b/src/library/scala/Product11.scala
@@ -24,7 +24,7 @@ trait Product11[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11] extends
   override def productArity = 11
 
 
-  /** Returns the n-th projection of this product if 0 < n <= productArity,
+  /** Returns the n-th projection of this product if 0 <= n < productArity,
    *  otherwise throws an `IndexOutOfBoundsException`.
    *
    *  @param n number of the projection to be returned

diff --git a/src/library/scala/Product12.scala b/src/library/scala/Product12.scala
@@ -24,7 +24,7 @@ trait Product12[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12] e
   override def productArity = 12
 
 
-  /** Returns the n-th projection of this product if 0 < n <= productArity,
+  /** Returns the n-th projection of this product if 0 <= n < productArity,
    *  otherwise throws an `IndexOutOfBoundsException`.
    *
    *  @param n number of the projection to be returned

diff --git a/src/library/scala/Product13.scala b/src/library/scala/Product13.scala
@@ -24,7 +24,7 @@ trait Product13[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +
   override def productArity = 13
 
 
-  /** Returns the n-th projection of this product if 0 < n <= productArity,
+  /** Returns the n-th projection of this product if 0 <= n < productArity,
    *  otherwise throws an `IndexOutOfBoundsException`.
    *
    *  @param n number of the projection to be returned

diff --git a/src/library/scala/Product14.scala b/src/library/scala/Product14.scala
@@ -24,7 +24,7 @@ trait Product14[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +
   override def productArity = 14
 
 
-  /** Returns the n-th projection of this product if 0 < n <= productArity,
+  /** Returns the n-th projection of this product if 0 <= n < productArity,
    *  otherwise throws an `IndexOutOfBoundsException`.
    *
    *  @param n number of the projection to be returned

diff --git a/src/library/scala/Product15.scala b/src/library/scala/Product15.scala
@@ -24,7 +24,7 @@ trait Product15[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +
   override def productArity = 15
 
 
-  /** Returns the n-th projection of this product if 0 < n <= productArity,
+  /** Returns the n-th projection of this product if 0 <= n < productArity,
    *  otherwise throws an `IndexOutOfBoundsException`.
    *
    *  @param n number of the projection to be returned

diff --git a/src/library/scala/Product16.scala b/src/library/scala/Product16.scala
@@ -24,7 +24,7 @@ trait Product16[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +
   override def productArity = 16
 
 
-  /** Returns the n-th projection of this product if 0 < n <= productArity,
+  /** Returns the n-th projection of this product if 0 <= n < productArity,
    *  otherwise throws an `IndexOutOfBoundsException`.
    *
    *  @param n number of the projection to be returned

diff --git a/src/library/scala/Product17.scala b/src/library/scala/Product17.scala
@@ -24,7 +24,7 @@ trait Product17[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +
   override def productArity = 17
 
 
-  /** Returns the n-th projection of this product if 0 < n <= productArity,
+  /** Returns the n-th projection of this product if 0 <= n < productArity,
    *  otherwise throws an `IndexOutOfBoundsException`.
    *
    *  @param n number of the projection to be returned

diff --git a/src/library/scala/Product18.scala b/src/library/scala/Product18.scala
@@ -24,7 +24,7 @@ trait Product18[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +
   override def productArity = 18
 
 
-  /** Returns the n-th projection of this product if 0 < n <= productArity,
+  /** Returns the n-th projection of this product if 0 <= n < productArity,
    *  otherwise throws an `IndexOutOfBoundsException`.
    *
    *  @param n number of the projection to be returned

diff --git a/src/library/scala/Product19.scala b/src/library/scala/Product19.scala
@@ -24,7 +24,7 @@ trait Product19[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +
   override def productArity = 19
 
 
-  /** Returns the n-th projection of this product if 0 < n <= productArity,
+  /** Returns the n-th projection of this product if 0 <= n < productArity,
    *  otherwise throws an `IndexOutOfBoundsException`.
    *
    *  @param n number of the projection to be returned

diff --git a/src/library/scala/Product2.scala b/src/library/scala/Product2.scala
@@ -24,7 +24,7 @@ trait Product2[@specialized(Int, Long, Double) +T1, @specialized(Int, Long, Doub
   override def productArity = 2
 
 
-  /** Returns the n-th projection of this product if 0 < n <= productArity,
+  /** Returns the n-th projection of this product if 0 <= n < productArity,
    *  otherwise throws an `IndexOutOfBoundsException`.
    *
    *  @param n number of the projection to be returned

diff --git a/src/library/scala/Product20.scala b/src/library/scala/Product20.scala
@@ -24,7 +24,7 @@ trait Product20[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +
   override def productArity = 20
 
 
-  /** Returns the n-th projection of this product if 0 < n <= productArity,
+  /** Returns the n-th projection of this product if 0 <= n < productArity,
    *  otherwise throws an `IndexOutOfBoundsException`.
    *
    *  @param n number of the projection to be returned

diff --git a/src/library/scala/Product21.scala b/src/library/scala/Product21.scala
@@ -24,7 +24,7 @@ trait Product21[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +
   override def productArity = 21
 
 
-  /** Returns the n-th projection of this product if 0 < n <= productArity,
+  /** Returns the n-th projection of this product if 0 <= n < productArity,
    *  otherwise throws an `IndexOutOfBoundsException`.
    *
    *  @param n number of the projection to be returned

diff --git a/src/library/scala/Product22.scala b/src/library/scala/Product22.scala
@@ -24,7 +24,7 @@ trait Product22[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +
   override def productArity = 22
 
 
-  /** Returns the n-th projection of this product if 0 < n <= productArity,
+  /** Returns the n-th projection of this product if 0 <= n < productArity,
    *  otherwise throws an `IndexOutOfBoundsException`.
    *
    *  @param n number of the projection to be returned

diff --git a/src/library/scala/Product3.scala b/src/library/scala/Product3.scala
@@ -24,7 +24,7 @@ trait Product3[+T1, +T2, +T3] extends Any with Product {
   override def productArity = 3
 
 
-  /** Returns the n-th projection of this product if 0 < n <= productArity,
+  /** Returns the n-th projection of this product if 0 <= n < productArity,
    *  otherwise throws an `IndexOutOfBoundsException`.
    *
    *  @param n number of the projection to be returned

diff --git a/src/library/scala/Product4.scala b/src/library/scala/Product4.scala
@@ -24,7 +24,7 @@ trait Product4[+T1, +T2, +T3, +T4] extends Any with Product {
   override def productArity = 4
 
 
-  /** Returns the n-th projection of this product if 0 < n <= productArity,
+  /** Returns the n-th projection of this product if 0 <= n < productArity,
    *  otherwise throws an `IndexOutOfBoundsException`.
    *
    *  @param n number of the projection to be returned

diff --git a/src/library/scala/Product5.scala b/src/library/scala/Product5.scala
@@ -24,7 +24,7 @@ trait Product5[+T1, +T2, +T3, +T4, +T5] extends Any with Product {
   override def productArity = 5
 
 
-  /** Returns the n-th projection of this product if 0 < n <= productArity,
+  /** Returns the n-th projection of this product if 0 <= n < productArity,
    *  otherwise throws an `IndexOutOfBoundsException`.
    *
    *  @param n number of the projection to be returned

diff --git a/src/library/scala/Product6.scala b/src/library/scala/Product6.scala
@@ -24,7 +24,7 @@ trait Product6[+T1, +T2, +T3, +T4, +T5, +T6] extends Any with Product {
   override def productArity = 6
 
 
-  /** Returns the n-th projection of this product if 0 < n <= productArity,
+  /** Returns the n-th projection of this product if 0 <= n < productArity,
    *  otherwise throws an `IndexOutOfBoundsException`.
    *
    *  @param n number of the projection to be returned

diff --git a/src/library/scala/Product7.scala b/src/library/scala/Product7.scala
@@ -24,7 +24,7 @@ trait Product7[+T1, +T2, +T3, +T4, +T5, +T6, +T7] extends Any with Product {
   override def productArity = 7
 
 
-  /** Returns the n-th projection of this product if 0 < n <= productArity,
+  /** Returns the n-th projection of this product if 0 <= n < productArity,
    *  otherwise throws an `IndexOutOfBoundsException`.
    *
    *  @param n number of the projection to be returned

diff --git a/src/library/scala/Product8.scala b/src/library/scala/Product8.scala
@@ -24,7 +24,7 @@ trait Product8[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8] extends Any with Product
   override def productArity = 8
 
 
-  /** Returns the n-th projection of this product if 0 < n <= productArity,
+  /** Returns the n-th projection of this product if 0 <= n < productArity,
    *  otherwise throws an `IndexOutOfBoundsException`.
    *
    *  @param n number of the projection to be returned

diff --git a/src/library/scala/Product9.scala b/src/library/scala/Product9.scala
@@ -24,7 +24,7 @@ trait Product9[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9] extends Any with Pro
   override def productArity = 9
 
 
-  /** Returns the n-th projection of this product if 0 < n <= productArity,
+  /** Returns the n-th projection of this product if 0 <= n < productArity,
    *  otherwise throws an `IndexOutOfBoundsException`.
    *
    *  @param n number of the projection to be returned