Skip to content

Commit d0d1637

Browse files
keep scalafix/ folder, Unstable => Roughtly
1 parent f12b134 commit d0d1637

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+27
-76
lines changed

build.sbt

+6-6
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ lazy val compatJVM = compat.jvm
4949
lazy val compatJS = compat.js
5050

5151
lazy val scalafixRules = project
52-
.in(file("scalafix-rules"))
52+
.in(file("scalafix/rules"))
5353
.settings(scalaModuleSettings)
5454
.settings(scalaModuleSettingsJVM)
5555
.settings(
@@ -61,31 +61,31 @@ lazy val scalafixRules = project
6161
// == Scalafix Test Setup ==
6262

6363
lazy val scalafixInput = project
64-
.in(file("scalafix-input"))
64+
.in(file("scalafix/input"))
6565
.settings(dontPublish)
6666
.settings(
6767
scalaVersion := scalafixScala212,
6868
scalafixSourceroot := sourceDirectory.in(Compile).value
6969
)
7070

7171
lazy val scalafixOutput212 = project
72-
.in(file("scalafix-output212"))
72+
.in(file("scalafix/output212"))
7373
.settings(scalaVersion := scalafixScala212)
7474
.settings(dontPublish)
7575
.dependsOn(compatJVM)
7676

7777
lazy val scalafixOutput213 = project
78-
.in(file("scalafix-output213"))
78+
.in(file("scalafix/output213"))
7979
.settings(scala213Settings)
8080
.settings(dontPublish)
8181

8282
lazy val scalafixOutput213Failure = project
83-
.in(file("scalafix-output213-failure"))
83+
.in(file("scalafix/output213-failure"))
8484
.settings(scala213Settings)
8585
.settings(dontPublish)
8686

8787
lazy val scalafixTests = project
88-
.in(file("scalafix-tests"))
88+
.in(file("scalafix/tests"))
8989
.settings(dontPublish)
9090
.settings(
9191
scalaVersion := scalafixScala212,

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

-8
This file was deleted.

scalafix-output212/src/main/scala/fix/UnstableMapValuesSrc.scala

-8
This file was deleted.

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

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

scalafix-input/src/main/scala/fix/UnstableStreamToLazyListSrc.scala renamed to scalafix/input/src/main/scala/fix/RoughlyStreamToLazyListSrc.scala

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

6-
class UnstableStreamToLazyListSrc() {
6+
class RoughlyStreamToLazyListSrc() {
77
val s = Stream(1, 2, 3)
88
s.append(List(4, 5, 6))
99
1 #:: 2 #:: 3 #:: Stream.Empty
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
2+
3+
4+
package fix
5+
6+
class RoughlyMapValuesSrc(map: Map[Int, Int]) {
7+
map.mapValues(_ + 1).toMap
8+
}

scalafix/output213/src/main/scala/fix/BreakoutSrc.scala

-24
This file was deleted.

scalafix-output213/src/main/scala/fix/UnstableStreamToLazyListSrc.scala renamed to scalafix/output213/src/main/scala/fix/RoughlyStreamToLazyListSrc.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
package fix
55

6-
class UnstableStreamToLazyListSrc() {
6+
class RoughlyStreamToLazyListSrc() {
77
val s = LazyList(1, 2, 3)
88
s.lazyAppendedAll(List(4, 5, 6))
99
1 #:: 2 #:: 3 #:: LazyList.Empty

scalafix-rules/src/main/scala/fix/UnstableMapValues.scala renamed to scalafix/rules/src/main/scala/fix/RoughlyMapValues.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import scala.meta._
99
*
1010
* This rules is marked unstable since Map.mapValues was lazy
1111
*/
12-
case class UnstableMapValues(index: SemanticdbIndex) extends SemanticRule(index, "UnstableMapValues") {
12+
case class RoughlyMapValues(index: SemanticdbIndex) extends SemanticRule(index, "RoughlyMapValues") {
1313
val mapMapValues =
1414
SymbolMatcher.exact(
1515
Symbol("_root_.scala.collection.immutable.MapLike#mapValues(Lscala/Function1;)Lscala/collection/immutable/Map;.")

scalafix-rules/src/main/scala/fix/UnstableStreamToLazyListSrc.scala renamed to scalafix/rules/src/main/scala/fix/RoughlyStreamToLazyListSrc.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import scala.meta._
99
* This rules is marked unstable since Stream is not strictly equivalent to LazyList.
1010
* LazyList has a lazy head but not Stream
1111
*/
12-
case class UnstableStreamToLazyList(index: SemanticdbIndex) extends SemanticRule(index, "UnstableStreamToLazyList") {
12+
case class RoughlyStreamToLazyList(index: SemanticdbIndex) extends SemanticRule(index, "RoughlyStreamToLazyList") {
1313

1414
val streamAppend = SymbolMatcher.normalized(
1515
Symbol("_root_.scala.collection.immutable.Stream.append.")

0 commit comments

Comments
 (0)