Skip to content

Commit 38f8dce

Browse files
Move Traversable test to it's own file
1 parent 5e55a11 commit 38f8dce

File tree

6 files changed

+37
-27
lines changed

6 files changed

+37
-27
lines changed

build.sbt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,6 @@ lazy val `scalafix-tests` = project
230230
"output212Sourceroot" -> output212.value,
231231
"output212PlusSourceroot" -> output212Plus.value,
232232
"output213Sourceroot" -> output213.value,
233-
"output212PlusSourceroot" -> output212Plus.value,
234233
"output213FailureSourceroot" -> sourceDirectory.in(`scalafix-output213-failure`, Compile).value,
235234
"inputClassdirectory" -> classDirectory.in(`scalafix-input`, Compile).value
236235
),
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/*
2+
rule = "scala:fix.CrossCompat"
3+
*/
4+
package fix
5+
6+
object ReplaceToSrc {
7+
List(1).to[Set]
8+
Set(1).to[List]
9+
10+
def m1(xs: Set[Int]): List[Int] =
11+
xs.to
12+
13+
List[Int]() // unrelated matching brackets
14+
}

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

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,7 @@ rule = "scala:fix.CrossCompat"
33
*/
44
package fix
55

6-
object TraversableSrc {
7-
def foo(xs: Traversable[(Int, String)], ys: List[Int]): Unit = {
8-
xs.to[List]
9-
xs.to[Set]
10-
xs.toIterator
11-
ys.iterator
12-
}
13-
14-
def m1(xs: TraversableOnce[Int]): List[Int] =
15-
xs.to
16-
17-
List[Int]() // unrelated matching brackets
6+
trait TraversableSrc {
7+
val t: Traversable[Int]
8+
val to: TraversableOnce[Int]
189
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
2+
3+
4+
package fix
5+
6+
import scala.collection.compat._
7+
object ReplaceToSrc {
8+
List(1).to(Set)
9+
Set(1).to(List)
10+
11+
def m1(xs: Set[Int]): List[Int] =
12+
xs.to(scala.collection.immutable.List)
13+
14+
List[Int]() // unrelated matching brackets
15+
}

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

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,7 @@
44
package fix
55

66
import scala.collection.compat._
7-
object TraversableSrc {
8-
def foo(xs: Iterable[(Int, String)], ys: List[Int]): Unit = {
9-
xs.to(List)
10-
xs.to(Set)
11-
xs.iterator
12-
ys.iterator
13-
}
14-
15-
def m1(xs: IterableOnce[Int]): List[Int] =
16-
xs.to(scala.collection.immutable.List)
17-
18-
List[Int]() // unrelated matching brackets
7+
trait TraversableSrc {
8+
val t: Iterable[Int]
9+
val to: IterableOnce[Int]
1910
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ trait Stable212Base extends CrossCompatibility { self: SemanticRule =>
9999
sameElements + compatImport
100100
}
101101

102-
def replaceSymbols0(ctx: RuleCtx): Patch = {
102+
def replaceTraversable(ctx: RuleCtx): Patch = {
103103
val traversableToIterable =
104104
ctx.replaceSymbols(
105105
"scala.Traversable" -> "scala.Iterable",
@@ -566,7 +566,7 @@ trait Stable212Base extends CrossCompatibility { self: SemanticRule =>
566566
}
567567

568568
override def fix(ctx: RuleCtx): Patch = {
569-
replaceSymbols0(ctx) +
569+
replaceTraversable(ctx) +
570570
replaceCanBuildFrom(ctx) +
571571
replaceToList(ctx) +
572572
replaceCopyToBuffer(ctx) +

0 commit comments

Comments
 (0)