Skip to content

Commit d63d4ea

Browse files
committed
Rename the rule v0 into NewCollections.
Run the migration rules tests in the CI.
1 parent 864b71d commit d63d4ea

14 files changed

+34
-36
lines changed

.travis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ before_script:
1010
- ./checkCLA.sh
1111
script:
1212
- sbt +test
13+
- cd scalafix && sbt input/compile output/compile tests/test

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,5 @@ report it as described in the
4646
Run the following sbt task on your project:
4747

4848
~~~
49-
> scalafix github:scala/scala-collection-compat/v0
49+
> scalafix github:scala/scala-collection-compat/NewCollections
5050
~~~

scalafix/input/src/main/scala/fix/Collectionstrawman_v0_copyToBuffer.scala

-13
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
/*
2+
rule = "scala:fix.Scalacollectioncompat_NewCollections"
3+
*/
4+
package fix
5+
6+
import scala.collection.mutable
7+
8+
class CopyToBufferSrc(xs: List[Int], b: mutable.Buffer[Int]) {
9+
10+
xs.copyToBuffer(b)
11+
(xs ++ xs).copyToBuffer(b)
12+
13+
}

scalafix/input/src/main/scala/fix/Collectionstrawman_v0_Stream.scala renamed to scalafix/input/src/main/scala/fix/StreamSrc.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*
2-
rule = "scala:fix.Collectionstrawman_v0"
2+
rule = "scala:fix.Scalacollectioncompat_NewCollections"
33
*/
44
package fix
55

6-
object Collectionstrawman_v0_Stream {
6+
object StreamSrc {
77
val s = Stream(1, 2, 3)
88
s.append(List(4, 5, 6))
99
1 #:: 2 #:: 3 #:: Stream.Empty

scalafix/input/src/main/scala/fix/Collectionstrawman_v0_Traversable.scala renamed to scalafix/input/src/main/scala/fix/TraversableSrc.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*
2-
rule = "scala:fix.Collectionstrawman_v0"
2+
rule = "scala:fix.Scalacollectioncompat_NewCollections"
33
*/
44
package fix
55

6-
object Collectionstrawman_v0_Traversable {
6+
object TraversableSrc {
77
def foo(xs: Traversable[(Int, String)], ys: List[Int]): Unit = {
88
xs.to[List]
99
xs.to[Set]

scalafix/input/src/main/scala/fix/Collectionstrawman_v0_TupleNZipped.scala renamed to scalafix/input/src/main/scala/fix/TupleNZippedSrc.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
rule = "scala:fix.Collectionstrawman_v0"
2+
rule = "scala:fix.Scalacollectioncompat_NewCollections"
33
*/
44
package fix
55

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

-10
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package fix
2+
3+
import scala.collection.mutable
4+
5+
class CopyToBufferSrc(xs: List[Int], b: mutable.Buffer[Int]) {
6+
7+
b ++= xs
8+
b ++= xs ++ xs
9+
10+
}

scalafix/output/src/main/scala/fix/Collectionstrawman_v0_Stream.scala renamed to scalafix/output/src/main/scala/fix/StreamSrc.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package fix
22

3-
object Collectionstrawman_v0_Stream {
3+
object StreamSrc {
44
val s = LazyList(1, 2, 3)
55
s.lazyAppendAll(List(4, 5, 6))
66
1 #:: 2 #:: 3 #:: LazyList.Empty

scalafix/output/src/main/scala/fix/Collectionstrawman_v0_Traversable.scala renamed to scalafix/output/src/main/scala/fix/TraversableSrc.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package fix
22

3-
object Collectionstrawman_v0_Traversable {
3+
object TraversableSrc {
44
def foo(xs: Iterable[(Int, String)], ys: List[Int]): Unit = {
55
xs.to(List)
66
xs.to(Set)

scalafix/rules/src/main/scala/fix/Scalacollectioncompat_v0.scala renamed to scalafix/rules/src/main/scala/fix/Scalacollectioncompat_NewCollections.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import scalafix.syntax._
55
import scalafix.util._
66
import scala.meta._
77

8-
case class Scalacollectioncompat_v0(index: SemanticdbIndex)
9-
extends SemanticRule(index, "Collectionstrawman_v0") {
8+
case class Scalacollectioncompat_NewCollections(index: SemanticdbIndex)
9+
extends SemanticRule(index, "Scalacollectioncompat_NewCollections") {
1010

1111
def replaceSymbols(ctx: RuleCtx): Patch = {
1212
ctx.replaceSymbols(

scalafix/tests/src/test/scala/fix/Collectionstrawman_Tests.scala

-3
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,5 @@ class Collectionstrawman_Tests
1010
AbsolutePath(BuildInfo.inputSourceroot),
1111
Seq(AbsolutePath(BuildInfo.outputSourceroot))
1212
) {
13-
override def assertNoDiff(a: String, b: String, c: String) = {
14-
super.assertNoDiff(a, b, c)
15-
}
1613
runAllTests()
1714
}

0 commit comments

Comments
 (0)