Skip to content

Commit 4d94ab7

Browse files
MasseGuillaumeMasseGuillaume
committed
Move LazyList and Map.mapValue rules to separate rules (fix scala#56)
1 parent 3dd389f commit 4d94ab7

26 files changed

+155
-94
lines changed

‎README.md

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

5656
~~~
57-
> scalafix github:scala/scala-collection-compat/NewCollections
57+
> scalafix github:scala/scala-collection-compat/Stable
5858
~~~

‎scalafix/input/src/main/scala/fix/BreakoutSrc.scala

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

@@ -22,4 +22,4 @@ object BreakoutSrc {
2222
(1 +: xs)(breakOut): Set[Int]
2323
(xs :+ 1)(breakOut): Set[Int]
2424
(xs ++: xs)(breakOut): Set[Int]
25-
}
25+
}

‎scalafix/input/src/main/scala/fix/CanBuildFromNegSrc.scala

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

‎scalafix/input/src/main/scala/fix/CanBuildFromSrc.scala

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

‎scalafix/input/src/main/scala/fix/CopyToBufferSrc.scala

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

‎scalafix/input/src/main/scala/fix/FoldSrc.scala

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

‎scalafix/input/src/main/scala/fix/IterableSrc.scala

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

‎scalafix/input/src/main/scala/fix/LinearSeqSrc.scala

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

‎scalafix/input/src/main/scala/fix/MutSetMapSrc.scala

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

‎scalafix/input/src/main/scala/fix/RetainSrc.scala

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

‎scalafix/input/src/main/scala/fix/SetMapSrc.scala

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

@@ -8,5 +8,4 @@ class SetMapSrc(set: Set[Int], map: Map[Int, Int]) {
88
map + (2 -> 3, 3 -> 4)
99
(set + (2, 3)).toString
1010
set + (2, 3) - 4
11-
map.mapValues(_ + 1)
12-
}
11+
}

‎scalafix/input/src/main/scala/fix/TestsSrc.scala

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

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

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

‎scalafix/input/src/main/scala/fix/TupleNZippedSrc.scala

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

@@ -14,7 +14,7 @@ object Collectionstrawman_v0_Tuple2Zipped {
1414
ys).zipped
1515
/* a */(/* b */ xs /* c */, /* d */ ys /* e */)/* f */./* g */zipped/* h */
1616
(coll(1), coll(2)).zipped
17-
(List(1, 2, 3), Stream.from(1)).zipped
17+
(List(1, 2, 3), Array(1)).zipped
1818
}
1919
def coll(x: Int): List[Int] = ???
2020
}
@@ -30,7 +30,7 @@ object Collectionstrawman_v0_Tuple3Zipped {
3030
zs).zipped
3131
/* a */(/* b */ xs /* c */, /* d */ ys /* e */, /* f */ zs /* g */)/* h */./* i */zipped/* j */
3232
(coll(1), coll(2), coll(3)).zipped
33-
(List(1, 2, 3), Set(1, 2, 3), Stream.from(1)).zipped
33+
(List(1, 2, 3), Set(1, 2, 3), Array(1)).zipped
3434
}
3535
def coll(x: Int): List[Int] = ???
3636
}

‎scalafix/input/src/main/scala/fix/UnstableMapValuesSrc.scala

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/*
2+
rule = "scala:fix.UnstableMapValues"
3+
*/
4+
package fix
5+
6+
class UnstableMapValuesSrc(map: Map[Int, Int]) {
7+
map.mapValues(_ + 1)
8+
}

‎scalafix/input/src/main/scala/fix/StreamSrc.scala renamed to ‎scalafix/input/src/main/scala/fix/UnstableStreamToLazyListSrc.scala

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

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

‎scalafix/output/src/main/scala/fix/CopyToBufferSrc.scala

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
2+
3+
14
package fix
25

36
import scala.collection.mutable

‎scalafix/output/src/main/scala/fix/RetainSrc.scala

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
2+
3+
14
package fix
25

36
import scala.collection.mutable.{Map, Set}

‎scalafix/output/src/main/scala/fix/SetMapSrc.scala

-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,4 @@ class SetMapSrc(set: Set[Int], map: Map[Int, Int]) {
88
map + (2 -> 3) + (3 -> 4)
99
(set + 2 + 3).toString
1010
set + 2 + 3 - 4
11-
map.mapValues(_ + 1).toMap
1211
}

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

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
2+
3+
14
package fix
25

36
object TraversableSrc {

‎scalafix/output/src/main/scala/fix/TupleNZippedSrc.scala

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
2+
3+
14
package fix
25

36
import scala.language.postfixOps
@@ -11,7 +14,7 @@ object Collectionstrawman_v0_Tuple2Zipped {
1114
ys)
1215
/* a *//* b */ xs /* c */.lazyZip(/* d */ ys /* e */)/* f *//* g *//* h */
1316
coll(1).lazyZip(coll(2))
14-
List(1, 2, 3).lazyZip(LazyList.from(1))
17+
List(1, 2, 3).lazyZip(Array(1))
1518
}
1619
def coll(x: Int): List[Int] = ???
1720
}
@@ -27,7 +30,7 @@ object Collectionstrawman_v0_Tuple3Zipped {
2730
zs)
2831
/* a *//* b */ xs /* c */.lazyZip(/* d */ ys /* e */).lazyZip(/* f */ zs /* g */)/* h *//* i *//* j */
2932
coll(1).lazyZip(coll(2)).lazyZip(coll(3))
30-
List(1, 2, 3).lazyZip(Set(1, 2, 3)).lazyZip(LazyList.from(1))
33+
List(1, 2, 3).lazyZip(Set(1, 2, 3)).lazyZip(Array(1))
3134
}
3235
def coll(x: Int): List[Int] = ???
3336
}

‎scalafix/output/src/main/scala/fix/UnstableMapValuesSrc.scala

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
2+
3+
4+
package fix
5+
6+
class UnstableMapValuesSrc(map: Map[Int, Int]) {
7+
map.mapValues(_ + 1).toMap
8+
}

‎scalafix/output/src/main/scala/fix/StreamSrc.scala renamed to ‎scalafix/output/src/main/scala/fix/UnstableStreamToLazyListSrc.scala

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
2+
3+
14
package fix
25

3-
object StreamSrc {
6+
class UnstableStreamToLazyListSrc() {
47
val s = LazyList(1, 2, 3)
58
s.lazyAppendedAll(List(4, 5, 6))
69
1 #:: 2 #:: 3 #:: LazyList.Empty

0 commit comments

Comments
 (0)