Skip to content

Commit 425dd73

Browse files
authored
Merge pull request #21 from SethTisue/fatal-warnings
newer 2.13 snapshot, 2.12.6, fix language warnings
2 parents d5f0818 + 6d53003 commit 425dd73

File tree

7 files changed

+14
-13
lines changed

7 files changed

+14
-13
lines changed

.travis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
language: scala
77
scala:
88
- 2.11.12
9-
- 2.12.5
10-
- 2.13.0-pre-b11db01
9+
- 2.12.6
10+
- 2.13.0-pre-abf21b9
1111
jdk:
1212
- oraclejdk8
1313
env:
@@ -16,12 +16,12 @@ env:
1616
- SCALAJS_VERSION=1.0.0-M3
1717
matrix:
1818
exclude:
19-
- scala: 2.13.0-pre-b11db01
19+
- scala: 2.13.0-pre-abf21b9
2020
env: SCALAJS_VERSION=0.6.22
21-
- scala: 2.13.0-pre-b11db01
21+
- scala: 2.13.0-pre-abf21b9
2222
env: SCALAJS_VERSION=1.0.0-M3
2323
include:
24-
- scala: 2.12.5
24+
- scala: 2.12.6
2525
env: TEST_SCALAFIX=true
2626
before_script:
2727
- ./checkCLA.sh

build.sbt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ inThisBuild(Def.settings(
44
organization := "org.scala-lang",
55
version := "0.1-SNAPSHOT",
66
resolvers += "scala-pr" at "https://scala-ci.typesafe.com/artifactory/scala-integration/",
7-
crossScalaVersions := Seq("2.12.5", "2.13.0-pre-b11db01", "2.11.12"),
8-
scalaVersion := crossScalaVersions.value.head
7+
crossScalaVersions := Seq("2.12.6", "2.13.0-pre-abf21b9", "2.11.12"),
8+
scalaVersion := crossScalaVersions.value.head,
9+
scalacOptions ++= Seq("-feature", "-language:higherKinds", "-language:implicitConversions")
910
))
1011

1112
lazy val `scala-collection-compat` = crossProject(JSPlatform, JVMPlatform)

scalafix/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ lazy val input = project
2323
lazy val output = project
2424
.settings(
2525
resolvers += "scala-pr" at "https://scala-ci.typesafe.com/artifactory/scala-integration/",
26-
scalaVersion := "2.13.0-M4-pre-20d3c21"
26+
scalaVersion := "2.13.0-pre-abf21b9"
2727
)
2828

2929
lazy val tests = project

scalafix/output/src/main/scala/fix/StreamSrc.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package fix
22

33
object StreamSrc {
44
val s = LazyList(1, 2, 3)
5-
s.lazyAppendAll(List(4, 5, 6))
5+
s.lazyAppendedAll(List(4, 5, 6))
66
1 #:: 2 #:: 3 #:: LazyList.Empty
77
val isEmpty: LazyList[_] => Boolean = {
88
case LazyList.Empty => true

scalafix/rules/src/main/scala/fix/Scalacollectioncompat_NewCollections.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ case class Scalacollectioncompat_NewCollections(index: SemanticdbIndex)
103103
def replaceStreamAppend(ctx: RuleCtx): Patch =
104104
ctx.tree.collect {
105105
case streamAppend(t: Name) =>
106-
ctx.replaceTree(t, "lazyAppendAll")
106+
ctx.replaceTree(t, "lazyAppendedAll")
107107
}.asPatch
108108

109109
override def fix(ctx: RuleCtx): Patch = {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ package object compat {
4545
}
4646

4747
implicit class StreamExtensionMethods[A](private val stream: Stream[A]) extends AnyVal {
48-
def lazyAppendAll(as: => TraversableOnce[A]): Stream[A] = stream.append(as)
48+
def lazyAppendedAll(as: => TraversableOnce[A]): Stream[A] = stream.append(as)
4949
}
5050

5151
implicit class SortedExtensionMethods[K, T <: Sorted[K, T]](private val fact: Sorted[K, T]) {

src/test/scala/test/scala/collection/StreamTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import scala.collection.compat._
77
class StreamTest {
88

99
@Test
10-
def lazyAppendAll(): Unit = {
10+
def lazyAppendedAll(): Unit = {
1111
val s = 1 #:: 2 #:: 3 #:: Stream.Empty
12-
s.lazyAppendAll(List(4, 5, 6))
12+
s.lazyAppendedAll(List(4, 5, 6))
1313
}
1414

1515
}

0 commit comments

Comments
 (0)