Update to Scalafmt 2.6.0

.scalafmt.conf

@@ -1,4 +1,4 @@
-version=2.5.3
+version=2.6.0
 align.openParenCallSite = true
 align.openParenDefnSite = true
 maxColumn = 120
@@ -8,3 +8,5 @@ danglingParentheses = true
 rewrite.rules = [AvoidInfix, SortImports, RedundantParens, SortModifiers]
 docstrings = JavaDoc
 newlines.afterCurlyLambda = preserve
+docstrings.style = Asterisk
+docstrings.oneline = unfold

alleycats-core/src/main/scala/alleycats/ConsK.scala

@@ -15,9 +15,9 @@ object ConsK {
       def cons[A](hd: A, tl: F[A]): F[A] = s.combineK(p.pure(hd), tl)
     }
 
-  /****************************************************************************/
+  /* ======================================================================== */
   /* THE FOLLOWING CODE IS MANAGED BY SIMULACRUM; PLEASE DO NOT EDIT!!!!      */
-  /****************************************************************************/
+  /* ======================================================================== */
 
   /**
    * Summon an instance of [[ConsK]] for `F`.
@@ -54,8 +54,8 @@ object ConsK {
       }
   }
 
-  /****************************************************************************/
+  /* ======================================================================== */
   /* END OF SIMULACRUM-MANAGED CODE                                           */
-  /****************************************************************************/
+  /* ======================================================================== */
 
 }

alleycats-core/src/main/scala/alleycats/Empty.scala

@@ -23,9 +23,9 @@ object Empty extends EmptyInstances0 {
 
   def fromEmptyK[F[_], T](implicit ekf: EmptyK[F]): Empty[F[T]] = ekf.synthesize[T]
 
-  /****************************************************************************/
+  /* ======================================================================== */
   /* THE FOLLOWING CODE IS MANAGED BY SIMULACRUM; PLEASE DO NOT EDIT!!!!      */
-  /****************************************************************************/
+  /* ======================================================================== */
 
   /**
    * Summon an instance of [[Empty]] for `A`.
@@ -64,9 +64,9 @@ object Empty extends EmptyInstances0 {
       }
   }
 
-  /****************************************************************************/
+  /* ======================================================================== */
   /* END OF SIMULACRUM-MANAGED CODE                                           */
-  /****************************************************************************/
+  /* ======================================================================== */
 
 }
 

alleycats-core/src/main/scala/alleycats/EmptyK.scala

@@ -15,9 +15,9 @@ import scala.annotation.implicitNotFound
 
 object EmptyK {
 
-  /****************************************************************************/
+  /* ======================================================================== */
   /* THE FOLLOWING CODE IS MANAGED BY SIMULACRUM; PLEASE DO NOT EDIT!!!!      */
-  /****************************************************************************/
+  /* ======================================================================== */
 
   /**
    * Summon an instance of [[EmptyK]] for `F`.
@@ -54,8 +54,8 @@ object EmptyK {
       }
   }
 
-  /****************************************************************************/
+  /* ======================================================================== */
   /* END OF SIMULACRUM-MANAGED CODE                                           */
-  /****************************************************************************/
+  /* ======================================================================== */
 
 }

alleycats-core/src/main/scala/alleycats/Extract.scala

@@ -25,9 +25,9 @@ object Extract {
       def coflatMap[A, B](fa: F[A])(f: F[A] => B): F[B] = cf.coflatMap(fa)(f)
     }
 
-  /****************************************************************************/
+  /* ======================================================================== */
   /* THE FOLLOWING CODE IS MANAGED BY SIMULACRUM; PLEASE DO NOT EDIT!!!!      */
-  /****************************************************************************/
+  /* ======================================================================== */
 
   /**
    * Summon an instance of [[Extract]] for `F`.
@@ -65,8 +65,8 @@ object Extract {
       }
   }
 
-  /****************************************************************************/
+  /* ======================================================================== */
   /* END OF SIMULACRUM-MANAGED CODE                                           */
-  /****************************************************************************/
+  /* ======================================================================== */
 
 }

alleycats-core/src/main/scala/alleycats/One.scala

@@ -20,9 +20,9 @@ object One {
   def apply[A](a: => A): One[A] =
     new One[A] { lazy val one: A = a }
 
-  /****************************************************************************/
+  /* ======================================================================== */
   /* THE FOLLOWING CODE IS MANAGED BY SIMULACRUM; PLEASE DO NOT EDIT!!!!      */
-  /****************************************************************************/
+  /* ======================================================================== */
 
   /**
    * Summon an instance of [[One]] for `A`.
@@ -61,8 +61,8 @@ object One {
       }
   }
 
-  /****************************************************************************/
+  /* ======================================================================== */
   /* END OF SIMULACRUM-MANAGED CODE                                           */
-  /****************************************************************************/
+  /* ======================================================================== */
 
 }

alleycats-core/src/main/scala/alleycats/Pure.scala

@@ -25,9 +25,9 @@ object Pure {
       def tailRecM[A, B](a: A)(f: (A) => F[Either[A, B]]): F[B] = fm.tailRecM(a)(f)
     }
 
-  /****************************************************************************/
+  /* ======================================================================== */
   /* THE FOLLOWING CODE IS MANAGED BY SIMULACRUM; PLEASE DO NOT EDIT!!!!      */
-  /****************************************************************************/
+  /* ======================================================================== */
 
   /**
    * Summon an instance of [[Pure]] for `F`.
@@ -64,8 +64,8 @@ object Pure {
       }
   }
 
-  /****************************************************************************/
+  /* ======================================================================== */
   /* END OF SIMULACRUM-MANAGED CODE                                           */
-  /****************************************************************************/
+  /* ======================================================================== */
 
 }

alleycats-core/src/main/scala/alleycats/Zero.scala

@@ -21,9 +21,9 @@ object Zero {
   def apply[A](a: => A): Zero[A] =
     new Zero[A] { lazy val zero: A = a }
 
-  /****************************************************************************/
+  /* ======================================================================== */
   /* THE FOLLOWING CODE IS MANAGED BY SIMULACRUM; PLEASE DO NOT EDIT!!!!      */
-  /****************************************************************************/
+  /* ======================================================================== */
 
   /**
    * Summon an instance of [[Zero]] for `A`.
@@ -62,8 +62,8 @@ object Zero {
       }
   }
 
-  /****************************************************************************/
+  /* ======================================================================== */
   /* END OF SIMULACRUM-MANAGED CODE                                           */
-  /****************************************************************************/
+  /* ======================================================================== */
 
 }

build.sbt

@@ -12,7 +12,7 @@ lazy val scoverageSettings = Seq(
 )
 
 organization in ThisBuild := "org.typelevel"
-scalafixDependencies in ThisBuild += "org.typelevel" %% "simulacrum-scalafix" % "0.3.0"
+scalafixDependencies in ThisBuild += "org.typelevel" %% "simulacrum-scalafix" % "0.4.0"
 
 val isTravisBuild = settingKey[Boolean]("Flag indicating whether the current build is running under Travis")
 val crossScalaVersionsFromTravis = settingKey[Seq[String]]("Scala versions set in .travis.yml as scala_version_XXX")
@@ -80,7 +80,7 @@ lazy val catsSettings = Seq(
 lazy val simulacrumSettings = Seq(
   addCompilerPlugin(scalafixSemanticdb),
   scalacOptions ++= Seq(s"-P:semanticdb:targetroot:${baseDirectory.value}/target/.semanticdb", "-Yrangepos"),
-  libraryDependencies += "org.typelevel" %% "simulacrum-scalafix-annotations" % "0.3.0",
+  libraryDependencies += "org.typelevel" %% "simulacrum-scalafix-annotations" % "0.4.0",
   pomPostProcess := { (node: xml.Node) =>
     new RuleTransformer(new RewriteRule {
       override def transform(node: xml.Node): Seq[xml.Node] =

core/src/main/scala-2.12/cats/compat/FoldableCompat.scala

@@ -5,7 +5,6 @@ private[cats] object FoldableCompat {
 
   def toIterable[F[_], A](fa: F[A])(F: Foldable[F]): Iterable[A] =
     F.foldRight[A, Stream[A]](fa, Eval.now(Stream.empty)) { (a, eb) =>
-        eb.map(Stream.cons(a, _))
-      }
-      .value
+      eb.map(Stream.cons(a, _))
+    }.value
 }

core/src/main/scala-2.13+/cats/compat/FoldableCompat.scala

@@ -5,7 +5,6 @@ private[cats] object FoldableCompat {
 
   def toIterable[F[_], A](fa: F[A])(F: Foldable[F]): Iterable[A] =
     F.foldRight[A, LazyList[A]](fa, Eval.now(LazyList.empty)) { (a, eb) =>
-        eb.map(LazyList.cons(a, _))
-      }
-      .value
+      eb.map(LazyList.cons(a, _))
+    }.value
 }

core/src/main/scala-2.13+/cats/data/NonEmptyLazyList.scala

@@ -418,44 +418,43 @@ class NonEmptyLazyListOps[A](private val value: NonEmptyLazyList[A])
 
   /**
    * Creates new `NonEmptyMap`, similarly to List#toMap from scala standard library.
-   *{{{
+   * {{{
    * scala> import cats.data.{NonEmptyLazyList, NonEmptyMap}
    * scala> import cats.implicits._
    * scala> val nel = NonEmptyLazyList.fromLazyListPrepend((0, "a"), LazyList((1, "b"),(0, "c"), (2, "d")))
    * scala> val expectedResult = NonEmptyMap.of(0 -> "c", 1 -> "b", 2 -> "d")
    * scala> val result = nel.toNem
    * scala> result === expectedResult
    * res0: Boolean = true
-   *}}}
-   *
+   * }}}
    */
   final def toNem[T, U](implicit ev: A <:< (T, U), order: Order[T]): NonEmptyMap[T, U] =
     NonEmptyMap.fromMapUnsafe(SortedMap(toLazyList.map(ev): _*)(order.toOrdering))
 
   /**
    * Creates new `NonEmptySet`, similarly to List#toSet from scala standard library.
-   *{{{
+   * {{{
    * scala> import cats.data._
    * scala> import cats.instances.int._
    * scala> val nel = NonEmptyLazyList.fromLazyListPrepend(1, LazyList(2,2,3,4))
    * scala> nel.toNes
    * res0: cats.data.NonEmptySet[Int] = TreeSet(1, 2, 3, 4)
-   *}}}
+   * }}}
    */
   final def toNes[B >: A](implicit order: Order[B]): NonEmptySet[B] =
     NonEmptySet.of(head, tail: _*)
 
   /**
    * Creates new `NonEmptyVector`, similarly to List#toVector from scala standard library.
-   *{{{
+   * {{{
    * scala> import cats.data._
    * scala> import cats.instances.int._
    * scala> val nel = NonEmptyLazyList.fromLazyListPrepend(1, LazyList(2,3,4))
    * scala> val expectedResult = NonEmptyVector.fromVectorUnsafe(Vector(1,2,3,4))
    * scala> val result = nel.toNev
    * scala> result === expectedResult
    * res0: Boolean = true
-   *}}}
+   * }}}
    */
   final def toNev[B >: A]: NonEmptyVector[B] =
     NonEmptyVector.fromVectorUnsafe(toLazyList.toVector)

core/src/main/scala-2.13+/cats/instances/arraySeq.scala

@@ -192,16 +192,14 @@ private[cats] object ArraySeqInstances {
         fa: ArraySeq[A]
       )(f: (A) => G[Option[B]])(implicit G: Applicative[G]): G[ArraySeq[B]] =
         fa.foldRight(Eval.now(G.pure(ArraySeq.untagged.empty[B]))) {
-            case (x, xse) =>
-              G.map2Eval(f(x), xse)((i, o) => i.fold(o)(_ +: o))
-          }
-          .value
+          case (x, xse) =>
+            G.map2Eval(f(x), xse)((i, o) => i.fold(o)(_ +: o))
+        }.value
 
       override def filterA[G[_], A](fa: ArraySeq[A])(f: (A) => G[Boolean])(implicit G: Applicative[G]): G[ArraySeq[A]] =
         fa.foldRight(Eval.now(G.pure(ArraySeq.untagged.empty[A]))) {
-            case (x, xse) =>
-              G.map2Eval(f(x), xse)((b, vec) => if (b) x +: vec else vec)
-          }
-          .value
+          case (x, xse) =>
+            G.map2Eval(f(x), xse)((b, vec) => if (b) x +: vec else vec)
+        }.value
     }
 }

core/src/main/scala/cats/Align.scala

@@ -130,9 +130,9 @@ object Align extends ScalaVersionSpecificAlignInstances {
         )
     }
 
-  /****************************************************************************/
+  /* ======================================================================== */
   /* THE FOLLOWING CODE IS MANAGED BY SIMULACRUM; PLEASE DO NOT EDIT!!!!      */
-  /****************************************************************************/
+  /* ======================================================================== */
 
   /**
    * Summon an instance of [[Align]] for `F`.
@@ -176,8 +176,8 @@ object Align extends ScalaVersionSpecificAlignInstances {
       }
   }
 
-  /****************************************************************************/
+  /* ======================================================================== */
   /* END OF SIMULACRUM-MANAGED CODE                                           */
-  /****************************************************************************/
+  /* ======================================================================== */
 
 }

core/src/main/scala/cats/Alternative.scala

@@ -92,9 +92,9 @@ import scala.annotation.implicitNotFound
 
 object Alternative {
 
-  /****************************************************************************/
+  /* ======================================================================== */
   /* THE FOLLOWING CODE IS MANAGED BY SIMULACRUM; PLEASE DO NOT EDIT!!!!      */
-  /****************************************************************************/
+  /* ======================================================================== */
 
   /**
    * Summon an instance of [[Alternative]] for `F`.
@@ -139,8 +139,8 @@ object Alternative {
       }
   }
 
-  /****************************************************************************/
+  /* ======================================================================== */
   /* END OF SIMULACRUM-MANAGED CODE                                           */
-  /****************************************************************************/
+  /* ======================================================================== */
 
 }

core/src/main/scala/cats/Applicative.scala

@@ -230,9 +230,9 @@ object Applicative {
       def map[A, B](fa: F[A])(f: A => B): F[B] = F.map(fa)(f)
     }
 
-  /****************************************************************************/
+  /* ======================================================================== */
   /* THE FOLLOWING CODE IS MANAGED BY SIMULACRUM; PLEASE DO NOT EDIT!!!!      */
-  /****************************************************************************/
+  /* ======================================================================== */
 
   /**
    * Summon an instance of [[Applicative]] for `F`.
@@ -271,9 +271,9 @@ object Applicative {
       }
   }
 
-  /****************************************************************************/
+  /* ======================================================================== */
   /* END OF SIMULACRUM-MANAGED CODE                                           */
-  /****************************************************************************/
+  /* ======================================================================== */
 
 }
 

core/src/main/scala/cats/ApplicativeError.scala

@@ -185,7 +185,7 @@ trait ApplicativeError[F[_], E] extends Applicative[F] {
    * scala> val prog2: F[Int] = (Err("two")).raiseError[F, Int]
    *
    * scala> prog1.onError(action).value.run("").value
-
+   *
    * res0: (String, Either[Err,Int]) = (one,Left(Err(one)))
    *
    * scala> prog2.onError(action).value.run("").value