From f71cafc4aeb920dac61c620bc2268ef09a5edfc3 Mon Sep 17 00:00:00 2001 From: Lukas Rytz Date: Fri, 18 May 2018 23:35:22 +0200 Subject: [PATCH] Minor cleanups --- admin/README.md | 3 +-- .../scala-2.11_2.12/scala/collection/compat/BuildFrom.scala | 2 +- .../scala-2.11_2.12/scala/collection/compat/Factory.scala | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/admin/README.md b/admin/README.md index ec276d8b..92e96e6d 100644 --- a/admin/README.md +++ b/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: diff --git a/src/main/scala-2.11_2.12/scala/collection/compat/BuildFrom.scala b/src/main/scala-2.11_2.12/scala/collection/compat/BuildFrom.scala index b84dbcee..1cc76b1c 100644 --- a/src/main/scala-2.11_2.12/scala/collection/compat/BuildFrom.scala +++ b/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) } diff --git a/src/main/scala-2.11_2.12/scala/collection/compat/Factory.scala b/src/main/scala-2.11_2.12/scala/collection/compat/Factory.scala index 959afcdb..054e3de6 100644 --- a/src/main/scala-2.11_2.12/scala/collection/compat/Factory.scala +++ b/src/main/scala-2.11_2.12/scala/collection/compat/Factory.scala @@ -20,7 +20,7 @@ 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 { @@ -28,7 +28,7 @@ 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] =