Merge pull request #1905 from gabro/master

s/rewrites/rules and update scalafix version in the README
typelevel · Sep 12, 2017 · 7895688 · 7895688
2 parents 5bb0252 + 4d9d333
commit 7895688
Show file tree

Hide file tree

Showing 13 changed files with 217 additions and 296 deletions.
diff --git a/scalafix/README.md b/scalafix/README.md
@@ -1,11 +1,11 @@
-# Scalafix rewrites for cats
+# Scalafix rules for cats
 
 ## Try this!
 
 Install the scalafix sbt plugin (globally or in a specific project):
 
 ```scala
-addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.5.0-M3")
+addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.5.0-RC2")
 ```
 
 run
@@ -14,7 +14,7 @@ run
 sbt scalafix github:typelevel/cats/v1.0.0
 ```
 
-## Available rewrites
+## Available rules
 
 - [x] All Unapply enabled methods, e.g. sequenceU, traverseU, etc. are removed. Unapply enabled syntax ops are also removed. Please use the partial unification SI-2712 fix instead. The easiest way might be this sbt-plugin.
 

diff --git a/scalafix/build.sbt b/scalafix/build.sbt
@@ -2,7 +2,7 @@
 val V = _root_.scalafix.Versions
 scalaVersion in ThisBuild := V.scala212
 
-lazy val rewrites = project.settings(
+lazy val rules = project.settings(
   libraryDependencies += "ch.epfl.scala" %% "scalafix-core" % V.version
 )
 
@@ -35,5 +35,5 @@ lazy val tests = project
         classDirectory.in(input, Compile).value
     )
   )
-  .dependsOn(input, rewrites)
+  .dependsOn(input, rules)
   .enablePlugins(BuildInfoPlugin)
diff --git a/scalafix/input/src/main/scala/fix/v1_0_0/RemoveCartesianBuilder.scala b/scalafix/input/src/main/scala/fix/v1_0_0/RemoveCartesianBuilder.scala
@@ -1,5 +1,5 @@
 /*
-rewrite = "scala:fix.v1_0_0.RemoveCartesianBuilder"
+rule = "scala:fix.v1_0_0.RemoveCartesianBuilder"
  */
 package fix
 package to1_0_0

diff --git a/scalafix/input/src/main/scala/fix/v1_0_0/RemoveCartesianBuilder2.scala b/scalafix/input/src/main/scala/fix/v1_0_0/RemoveCartesianBuilder2.scala
@@ -1,5 +1,5 @@
 /*
-rewrite = "scala:fix.v1_0_0.RemoveCartesianBuilder"
+rule = "scala:fix.v1_0_0.RemoveCartesianBuilder"
  */
 package fix
 package to1_0_0

diff --git a/scalafix/input/src/main/scala/fix/v1_0_0/RemoveSplit.scala b/scalafix/input/src/main/scala/fix/v1_0_0/RemoveSplit.scala
@@ -1,5 +1,5 @@
 /*
-rewrite = "scala:fix.v1_0_0.RemoveSplit"
+rule = "scala:fix.v1_0_0.RemoveSplit"
  */
 package fix
 package to1_0_0

diff --git a/scalafix/input/src/main/scala/fix/v1_0_0/RemoveUnapply.scala b/scalafix/input/src/main/scala/fix/v1_0_0/RemoveUnapply.scala
@@ -1,5 +1,5 @@
-/* 
-rewrite = "scala:fix.v1_0_0.RemoveUnapply"
+/*
+rule = "scala:fix.v1_0_0.RemoveUnapply"
  */
 package fix
 package to1_0_0

diff --git a/scalafix/input/src/main/scala/fix/v1_0_0/RenameFreeSuspend.scala b/scalafix/input/src/main/scala/fix/v1_0_0/RenameFreeSuspend.scala
@@ -1,5 +1,5 @@
-/* 
-rewrite = "scala:fix.v1_0_0.RenameFreeSuspend"
+/*
+rule = "scala:fix.v1_0_0.RenameFreeSuspend"
  */
 package fix
 package to1_0_0

diff --git a/scalafix/input/src/main/scala/fix/v1_0_0/RenameInjectProdAndCoproduct.scala b/scalafix/input/src/main/scala/fix/v1_0_0/RenameInjectProdAndCoproduct.scala
@@ -1,5 +1,5 @@
-/* 
-rewrite = "scala:fix.v1_0_0.RenameInjectProdAndCoproduct"
+/*
+rule = "scala:fix.v1_0_0.RenameInjectProdAndCoproduct"
  */
 package fix
 package to1_0_0

diff --git a/scalafix/input/src/main/scala/fix/v1_0_0/RenameReducibleMethods.scala b/scalafix/input/src/main/scala/fix/v1_0_0/RenameReducibleMethods.scala
@@ -1,5 +1,5 @@
-/* 
-rewrite = "scala:fix.v1_0_0.RenameReducibleMethods"
+/*
+rule = "scala:fix.v1_0_0.RenameReducibleMethods"
  */
 package fix
 package to1_0_0

diff --git a/scalafix/input/src/main/scala/fix/v1_0_0/RenameTupleApplySyntax.scala b/scalafix/input/src/main/scala/fix/v1_0_0/RenameTupleApplySyntax.scala
@@ -1,5 +1,5 @@
 /*
-rewrite = "scala:fix.v1_0_0.RenameTupleApplySyntax"
+rule = "scala:fix.v1_0_0.RenameTupleApplySyntax"
  */
 package fix
 package to1_0_0

diff --git a/scalafix/input/src/main/scala/fix/v1_0_0/SimplifyEitherTLift.scala b/scalafix/input/src/main/scala/fix/v1_0_0/SimplifyEitherTLift.scala
@@ -1,5 +1,5 @@
 /*
-rewrite = "scala:fix.v1_0_0.SimplifyEitherTLift"
+rule = "scala:fix.v1_0_0.SimplifyEitherTLift"
  */
 package fix
 package to1_0_0

diff --git a/scalafix/rewrites/src/main/scala/fix/Cats_v1_0_0.scala b/scalafix/rewrites/src/main/scala/fix/Cats_v1_0_0.scala