Skip to content

Commit 0cc633a

Browse files
authored
Merge pull request #104 from MasseGuillaume/missing-to
Add missing .to[CC] base classes
2 parents 5445d64 + 7c68ef2 commit 0cc633a

File tree

3 files changed

+16
-7
lines changed

3 files changed

+16
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ object TraversableSrc {
1111
ys.iterator
1212
}
1313

14-
def m1(xs: Traversable[Int]): List[Int] =
14+
def m1(xs: TraversableOnce[Int]): List[Int] =
1515
xs.to
1616

1717
List[Int]() // unrelated matching brackets

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ object TraversableSrc {
1212
ys.iterator
1313
}
1414

15-
def m1(xs: Iterable[Int]): List[Int] =
15+
def m1(xs: IterableOnce[Int]): List[Int] =
1616
xs.to(scala.collection.immutable.List)
1717

1818
List[Int]() // unrelated matching brackets

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

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,12 @@ trait Stable212Base extends CrossCompatibility { self: SemanticRule =>
3232
val foldRightSymbol = foldSymbol(isLeft = false)
3333

3434
val iterator = normalized("_root_.scala.collection.TraversableLike.toIterator.")
35-
val toTpe = normalized("_root_.scala.collection.TraversableLike.to.")
35+
val toTpe = normalized(
36+
"_root_.scala.collection.TraversableLike.to.",
37+
"_root_.scala.collection.TraversableOnce.to.",
38+
"_root_.scala.collection.GenTraversableOnce.to.",
39+
"_root_.scala.collection.parallel.ParIterableLike.to."
40+
)
3641
val copyToBuffer = normalized("_root_.scala.collection.TraversableOnce.copyToBuffer.")
3742
val arrayBuilderMake = normalized("_root_.scala.collection.mutable.ArrayBuilder.make(Lscala/reflect/ClassTag;)Lscala/collection/mutable/ArrayBuilder;.")
3843
val iterableSameElement = exact("_root_.scala.collection.IterableLike#sameElements(Lscala/collection/GenIterable;)Z.")
@@ -48,8 +53,10 @@ trait Stable212Base extends CrossCompatibility { self: SemanticRule =>
4853
val `Future.onSuccess` = exact("_root_.scala.concurrent.Future#onSuccess(Lscala/PartialFunction;Lscala/concurrent/ExecutionContext;)V.")
4954

5055
val traversable = exact(
56+
"_root_.scala.collection.Traversable#",
57+
"_root_.scala.collection.TraversableOnce#",
5158
"_root_.scala.package.Traversable#",
52-
"_root_.scala.collection.Traversable#"
59+
"_root_.scala.package.TraversableOnce#"
5360
)
5461

5562
// == Rules ==
@@ -74,13 +81,15 @@ trait Stable212Base extends CrossCompatibility { self: SemanticRule =>
7481
def replaceSymbols0(ctx: RuleCtx): Patch = {
7582
val traversableToIterable =
7683
ctx.replaceSymbols(
77-
"scala.Traversable" -> "scala.Iterable",
78-
"scala.collection.Traversable" -> "scala.collection.Iterable"
84+
"scala.Traversable" -> "scala.Iterable",
85+
"scala.collection.Traversable" -> "scala.collection.Iterable",
86+
"scala.TraversableOnce" -> "scala.IterableOnce",
87+
"scala.collection.TraversableOnce" -> "scala.collection.IterableOnce"
7988
)
8089

8190
val linearSeqToList =
8291
ctx.replaceSymbols(
83-
"scala.collection.LinearSeq" -> "scala.collection.immutable.List",
92+
"scala.collection.LinearSeq" -> "scala.collection.immutable.List"
8493
)
8594

8695
import scala.meta.contrib._

0 commit comments

Comments
 (0)