Merge pull request #32 from lrytz/cleanups

Minor cleanups

Author: julienrf

admin/README.md

@@ -14,7 +14,6 @@ To configure tag driven releases from Travis CI.
      Ensure that `RELEASE_COMBO` is `true` for build matrix combinations
      that should be released to sonatype (when building a tag).
 
-
 It is important to add comments in `.travis.yml` to identify the name
 of each environment variable encoded in a `secure` section.
 
@@ -41,7 +40,7 @@ env:
     - secure: "XXXXXX"
 
 script:
-  - if [[ "$TRAVIS_JDK_VERSION" == "openjdk6" && "$TRAVIS_SCALA_VERSION" =~ "2\.11.*" || "$TRAVIS_JDK_VERSION" == "openjdk6" && "$TRAVIS_SCALA_VERSION" =~ "2\.12.*" ]]; then export RELEASE_COMBO=true; fi
+  - if [[ "$TRAVIS_JDK_VERSION" == "openjdk6" && "$TRAVIS_SCALA_VERSION" =~ 2\.11\..* || "$TRAVIS_JDK_VERSION" == "oraclejdk8" && "$TRAVIS_SCALA_VERSION" =~ 2\.1[23]\..* ]]; then export RELEASE_COMBO=true; fi
   - admin/build.sh
 
 notifications:

src/main/scala-2.11_2.12/scala/collection/compat/BuildFrom.scala

@@ -18,7 +18,7 @@ trait BuildFrom[-From, -A, +C] extends Any {
     * Building collections with `fromSpecificIterable` is preferred because it can be lazy for lazy collections. */
   def newBuilder(from: From): mutable.Builder[A, C]
 
-  @deprecated("Use newBuilder() instead of apply()", "2.13.0")
+  @deprecated("Use newBuilder instead of apply()", "2.13.0")
   @`inline` def apply(from: From): mutable.Builder[A, C] = newBuilder(from)
 
 }

src/main/scala-2.11_2.12/scala/collection/compat/Factory.scala

@@ -20,15 +20,15 @@ trait Factory[-A, +C] extends Any {
 
   /** Get a Builder for the collection. For non-strict collection types this will use an intermediate buffer.
     * Building collections with `fromSpecific` is preferred because it can be lazy for lazy collections. */
-  def newBuilder(): mutable.Builder[A, C]
+  def newBuilder: mutable.Builder[A, C]
 }
 
 object Factory {
 
   implicit def fromCanBuildFrom[A, C](implicit cbf: CanBuildFrom[Nothing, A, C]): Factory[A, C] =
     new Factory[A, C] {
       def fromSpecific(it: TraversableOnce[A]): C = (cbf() ++= it).result()
-      def newBuilder(): mutable.Builder[A, C] = cbf()
+      def newBuilder: mutable.Builder[A, C] = cbf()
     }
 
   implicit def fromCanBuildFromConversion[X, A, C](x: X)(implicit toCanBuildFrom: X => CanBuildFrom[Nothing, A, C]): Factory[A, C] =