Merge pull request #1176 from typelevel/update/scalafmt-core-3.5.8

Update scalafmt-core to 3.5.8

.git-blame-ignore-revs

@@ -0,0 +1,13 @@
+# #982 setup scalafmt
+f7b7e4a1b7324537f0721fa88338be7a1fb3204d
+
+# #1084 Update scalafmt to 3.0.6
+2a9ef8e7f407765e7ca7fe2120e03efa5f022187
+e7a1e171586b3f493b0f2f1fcc96ded103054c79
+635ff5855b26c97334bbe620eef8dff27a9e5e6d
+e93fe9bcf5ff0c314ca676bf9f3b9c8148574786
+
+# steward commits
+91a10ef01d46d67aae9be2577a74c507b6d5d773
+2eef959d80fff836e4a490ceb360ecbefca43c9a
+32fb2b7188c28474b7cc2b6a5743ddeccb1fdda6

.scalafmt.conf

@@ -1,4 +1,4 @@
-version=3.5.2
+version=3.5.8
 runner.dialect = Scala213Source3
 fileOverride {
   "glob:**/scala-3/**" {

core/src/main/scala/spire/algebra/free/FreeAbGroup.scala

@@ -108,13 +108,13 @@ final class FreeAbGroup[A] private (val terms: Map[A, Int]) extends AnyVal { lhs
   override def toString: String =
     if (terms.isEmpty) "e"
     else
-      (terms
+      terms
         .filter(_._2 != 0)
         .collect {
           case (a, n) if n == 1 => a.toString
           case (a, n) if n != 0 => s"($a)^$n"
         }
-        .mkString(" |+| "))
+        .mkString(" |+| ")
 }
 
 object FreeAbGroup { companion =>

core/src/main/scala/spire/math/Algebraic.scala

@@ -1406,8 +1406,8 @@ object Algebraic extends AlgebraicInstances {
           val sub = subExpr.getBound(this)
           val lb = sub.lb / k
           val ub =
-            if (sub.ub % k == 0) (sub.ub / k)
-            else ((sub.ub / k) + 1)
+            if (sub.ub % k == 0) sub.ub / k
+            else (sub.ub / k) + 1
           Bound(sub.lc, sub.tc, sub.measure, lb, ub)
 
         case Pow(subExpr, k) =>

core/src/main/scala/spire/math/FastComplex.scala

@@ -231,7 +231,7 @@ object FastComplex {
   } else if (imag(b) != 0.0f) {
     val im_b = imag(b)
     val re_b = real(b)
-    val len = (Math.pow(abs(a), re_b) / exp((angle(a) * im_b))).toFloat
+    val len = (Math.pow(abs(a), re_b) / exp(angle(a) * im_b)).toFloat
     val phase = (angle(a) * re_b + log(abs(a)) * im_b).toFloat
     polar(len, phase)
 

core/src/main/scala/spire/math/Interval.scala

@@ -430,10 +430,10 @@ sealed abstract class Interval[A] extends Serializable { lhs =>
       val ub1sz = ub1.a === z && ub1.isClosed
       val ub2sz = ub2.a === z && ub2.isClosed
 
-      val ll = if (lb1sz || lb2sz) interval.Closed(z) else (lb1 *~ lb2)
-      val lu = if (lb1sz || ub2sz) interval.Closed(z) else (lb1 *~ ub2)
-      val ul = if (ub1sz || lb2sz) interval.Closed(z) else (ub1 *~ lb2)
-      val uu = if (ub1sz || ub2sz) interval.Closed(z) else (ub1 *~ ub2)
+      val ll = if (lb1sz || lb2sz) interval.Closed(z) else lb1 *~ lb2
+      val lu = if (lb1sz || ub2sz) interval.Closed(z) else lb1 *~ ub2
+      val ul = if (ub1sz || lb2sz) interval.Closed(z) else ub1 *~ lb2
+      val uu = if (ub1sz || ub2sz) interval.Closed(z) else ub1 *~ ub2
       ValueBound.union4(ll, lu, ul, uu)
     }
 

core/src/main/scala/spire/math/Quaternion.scala

@@ -203,7 +203,7 @@ final case class Quaternion[@sp(Float, Double) A](r: A, i: A, j: A, k: A)
     if (isZero) this else this / abs
 
   def pureSignum(implicit f: Field[A], n: NRoot[A], s: Signed[A]): Quaternion[A] =
-    if (isReal) Quaternion.zero[A] else (pure / pureAbs)
+    if (isReal) Quaternion.zero[A] else pure / pureAbs
 
   def unary_-(implicit s: CRing[A]): Quaternion[A] =
     Quaternion(-r, -i, -j, -k)

core/src/main/scala/spire/math/Rational.scala

@@ -193,7 +193,7 @@ sealed abstract class Rational extends ScalaNumber with ScalaNumericConversions
    *   A positive integer.
    */
   def limitTo(max: SafeLong): Rational = if (this.signum < 0) {
-    -((-this).limitTo(max))
+    -(-this).limitTo(max)
   } else {
     require(max.signum > 0, "Limit must be a positive integer.")
 
@@ -386,7 +386,7 @@ object Rational extends RationalInstances {
     val bits = java.lang.Double.doubleToLongBits(x)
     val value =
       if ((bits >> 63) < 0) -(bits & 0x000fffffffffffffL | 0x0010000000000000L)
-      else (bits & 0x000fffffffffffffL | 0x0010000000000000L)
+      else bits & 0x000fffffffffffffL | 0x0010000000000000L
     val exp = ((bits >> 52) & 0x7ff).toInt - 1075 // 1023 + 52
     if (exp > 10) {
       apply(SafeLong(value) << exp, SafeLong.one)

core/src/main/scala/spire/math/SafeLong.scala

@@ -462,7 +462,7 @@ final private[math] case class SafeLongLong(x: Long) extends SafeLong {
   }
 
   def >>(n: Int): SafeLong =
-    if (n >= 64) (if (x >= 0) SafeLong.zero else SafeLong.minusOne)
+    if (n >= 64) if (x >= 0) SafeLong.zero else SafeLong.minusOne
     else if (n >= 0) SafeLongLong(x >> n)
     else if (n == Int.MinValue) throw new ArithmeticException(">> MinValue not supported")
     else this << -n

core/src/main/scala/spire/math/Selection.scala

@@ -135,59 +135,59 @@ trait HighBranchingMedianOf5 {
         if (o.lt(ai2, ai4)) { // Drop i4
           if (o.lt(ai3, ai5)) { // i1 < i2, i3 < i5
             if (o.lt(ai2, ai5)) { // Drop i5
-              if (o.lt(ai2, ai3)) (offset + 2 * stride) else (offset + 1 * stride)
+              if (o.lt(ai2, ai3)) offset + 2 * stride else offset + 1 * stride
             } else { // Drop i2
-              if (o.lt(ai1, ai5)) (offset + 4 * stride) else (offset + 0 * stride)
+              if (o.lt(ai1, ai5)) offset + 4 * stride else offset + 0 * stride
             }
           } else { // i1 < i2, i5 < i3
             if (o.lt(ai2, ai3)) { // Drop i3
-              if (o.lt(ai2, ai5)) (offset + 4 * stride) else (offset + 1 * stride)
+              if (o.lt(ai2, ai5)) offset + 4 * stride else offset + 1 * stride
             } else { // Drop i2
-              if (o.lt(ai1, ai3)) (offset + 2 * stride) else (offset + 0 * stride)
+              if (o.lt(ai1, ai3)) offset + 2 * stride else offset + 0 * stride
             }
           }
         } else { // Drop i2
           if (o.lt(ai1, ai5)) { // i1 < i5, i3 < i4
             if (o.lt(ai5, ai4)) { // Drop i4
-              if (o.lt(ai5, ai3)) (offset + 2 * stride) else (offset + 4 * stride)
+              if (o.lt(ai5, ai3)) offset + 2 * stride else offset + 4 * stride
             } else { // Drop i5
-              if (o.lt(ai1, ai4)) (offset + 3 * stride) else (offset + 0 * stride)
+              if (o.lt(ai1, ai4)) offset + 3 * stride else offset + 0 * stride
             }
           } else { // i5 < i1, i3 < i4
             if (o.lt(ai1, ai4)) { // Drop i4
-              if (o.lt(ai1, ai3)) (offset + 2 * stride) else (offset + 0 * stride)
+              if (o.lt(ai1, ai3)) offset + 2 * stride else offset + 0 * stride
             } else { // Drop i1
-              if (o.lt(ai5, ai4)) (offset + 3 * stride) else (offset + 4 * stride)
+              if (o.lt(ai5, ai4)) offset + 3 * stride else offset + 4 * stride
             }
           }
         }
       } else { // i1 < i2, i4 < i3
         if (o.lt(ai2, ai3)) { // Drop i3
           if (o.lt(ai4, ai5)) { // i1 < i2, i4 < i5
             if (o.lt(ai2, ai5)) { // Drop i5
-              if (o.lt(ai2, ai4)) (offset + 3 * stride) else (offset + 1 * stride)
+              if (o.lt(ai2, ai4)) offset + 3 * stride else offset + 1 * stride
             } else { // Drop i2
-              if (o.lt(ai1, ai5)) (offset + 4 * stride) else (offset + 0 * stride)
+              if (o.lt(ai1, ai5)) offset + 4 * stride else offset + 0 * stride
             }
           } else { // i1 < i2, i5 < i4
             if (o.lt(ai2, ai4)) { // Drop i4
-              if (o.lt(ai2, ai5)) (offset + 4 * stride) else (offset + 1 * stride)
+              if (o.lt(ai2, ai5)) offset + 4 * stride else offset + 1 * stride
             } else { // Drop i2
-              if (o.lt(ai1, ai4)) (offset + 3 * stride) else (offset + 0 * stride)
+              if (o.lt(ai1, ai4)) offset + 3 * stride else offset + 0 * stride
             }
           }
         } else { // Drop i2
           if (o.lt(ai1, ai5)) { // i1 < i5, i4 < i3
             if (o.lt(ai5, ai3)) { // Drop i3
-              if (o.lt(ai5, ai4)) (offset + 3 * stride) else (offset + 4 * stride)
+              if (o.lt(ai5, ai4)) offset + 3 * stride else offset + 4 * stride
             } else { // Drop i5
-              if (o.lt(ai1, ai3)) (offset + 2 * stride) else (offset + 0 * stride)
+              if (o.lt(ai1, ai3)) offset + 2 * stride else offset + 0 * stride
             }
           } else { // i5 < i1, i4 < i3
             if (o.lt(ai1, ai3)) { // Drop i3
-              if (o.lt(ai1, ai4)) (offset + 3 * stride) else (offset + 0 * stride)
+              if (o.lt(ai1, ai4)) offset + 3 * stride else offset + 0 * stride
             } else { // Drop i1
-              if (o.lt(ai5, ai3)) (offset + 2 * stride) else (offset + 4 * stride)
+              if (o.lt(ai5, ai3)) offset + 2 * stride else offset + 4 * stride
             }
           }
         }
@@ -197,59 +197,59 @@ trait HighBranchingMedianOf5 {
         if (o.lt(ai1, ai4)) { // Drop i4
           if (o.lt(ai3, ai5)) { // i2 < i1, i3 < i5
             if (o.lt(ai1, ai5)) { // Drop i5
-              if (o.lt(ai1, ai3)) (offset + 2 * stride) else (offset + 0 * stride)
+              if (o.lt(ai1, ai3)) offset + 2 * stride else offset + 0 * stride
             } else { // Drop i1
-              if (o.lt(ai2, ai5)) (offset + 4 * stride) else (offset + 1 * stride)
+              if (o.lt(ai2, ai5)) offset + 4 * stride else offset + 1 * stride
             }
           } else { // i2 < i1, i5 < i3
             if (o.lt(ai1, ai3)) { // Drop i3
-              if (o.lt(ai1, ai5)) (offset + 4 * stride) else (offset + 0 * stride)
+              if (o.lt(ai1, ai5)) offset + 4 * stride else offset + 0 * stride
             } else { // Drop i1
-              if (o.lt(ai2, ai3)) (offset + 2 * stride) else (offset + 1 * stride)
+              if (o.lt(ai2, ai3)) offset + 2 * stride else offset + 1 * stride
             }
           }
         } else { // Drop i1
           if (o.lt(ai2, ai5)) { // i2 < i5, i3 < i4
             if (o.lt(ai5, ai4)) { // Drop i4
-              if (o.lt(ai5, ai3)) (offset + 2 * stride) else (offset + 4 * stride)
+              if (o.lt(ai5, ai3)) offset + 2 * stride else offset + 4 * stride
             } else { // Drop i5
-              if (o.lt(ai2, ai4)) (offset + 3 * stride) else (offset + 1 * stride)
+              if (o.lt(ai2, ai4)) offset + 3 * stride else offset + 1 * stride
             }
           } else { // i5 < i2, i3 < i4
             if (o.lt(ai2, ai4)) { // Drop i4
-              if (o.lt(ai2, ai3)) (offset + 2 * stride) else (offset + 1 * stride)
+              if (o.lt(ai2, ai3)) offset + 2 * stride else offset + 1 * stride
             } else { // Drop i2
-              if (o.lt(ai5, ai4)) (offset + 3 * stride) else (offset + 4 * stride)
+              if (o.lt(ai5, ai4)) offset + 3 * stride else offset + 4 * stride
             }
           }
         }
       } else { // i2 < i1, i4 < i3
         if (o.lt(ai1, ai3)) { // Drop i3
           if (o.lt(ai4, ai5)) { // i2 < i1, i4 < i5
             if (o.lt(ai1, ai5)) { // Drop i5
-              if (o.lt(ai1, ai4)) (offset + 3 * stride) else (offset + 0 * stride)
+              if (o.lt(ai1, ai4)) offset + 3 * stride else offset + 0 * stride
             } else { // Drop i1
-              if (o.lt(ai2, ai5)) (offset + 4 * stride) else (offset + 1 * stride)
+              if (o.lt(ai2, ai5)) offset + 4 * stride else offset + 1 * stride
             }
           } else { // i2 < i1, i5 < i4
             if (o.lt(ai1, ai4)) { // Drop i4
-              if (o.lt(ai1, ai5)) (offset + 4 * stride) else (offset + 0 * stride)
+              if (o.lt(ai1, ai5)) offset + 4 * stride else offset + 0 * stride
             } else { // Drop i1
-              if (o.lt(ai2, ai4)) (offset + 3 * stride) else (offset + 1 * stride)
+              if (o.lt(ai2, ai4)) offset + 3 * stride else offset + 1 * stride
             }
           }
         } else { // Drop i1
           if (o.lt(ai2, ai5)) { // i2 < i5, i4 < i3
             if (o.lt(ai5, ai3)) { // Drop i3
-              if (o.lt(ai5, ai4)) (offset + 3 * stride) else (offset + 4 * stride)
+              if (o.lt(ai5, ai4)) offset + 3 * stride else offset + 4 * stride
             } else { // Drop i5
-              if (o.lt(ai2, ai3)) (offset + 2 * stride) else (offset + 1 * stride)
+              if (o.lt(ai2, ai3)) offset + 2 * stride else offset + 1 * stride
             }
           } else { // i5 < i2, i4 < i3
             if (o.lt(ai2, ai3)) { // Drop i3
-              if (o.lt(ai2, ai4)) (offset + 3 * stride) else (offset + 1 * stride)
+              if (o.lt(ai2, ai4)) offset + 3 * stride else offset + 1 * stride
             } else { // Drop i2
-              if (o.lt(ai5, ai3)) (offset + 2 * stride) else (offset + 4 * stride)
+              if (o.lt(ai5, ai3)) offset + 2 * stride else offset + 4 * stride
             }
           }
         }

core/src/main/scala/spire/optional/Perm.scala

@@ -48,7 +48,7 @@ class Perm private (private val mapping: Map[Int, Int]) extends (Int => Int) {
    */
   def apply(n0: Int, n1: Int, ns: Int*): Perm = {
     val cycle = n0 +: n1 +: ns
-    require(!(cycle.exists(image)), "Cycle must be disjoint.")
+    require(!cycle.exists(image), "Cycle must be disjoint.")
     this.compose(Perm(n0, n1, ns: _*))
   }
 

core/src/main/scala/spire/random/Ziggurat.scala

@@ -75,7 +75,7 @@ object Ziggurat {
         while ({
           x = -log(g.nextDouble()) * r1
           y = -log(g.nextDouble())
-          (y + y < x * x)
+          y + y < x * x
         })
           return if (hz > 0) r + x else -r - x
       }

core/src/main/scala/spire/random/rng/Utils.scala

@@ -65,7 +65,7 @@ object Utils {
 
   def longFromTime(time: Long = System.nanoTime): Long = {
     seedUniquifier += 1
-    (seedUniquifier + time)
+    seedUniquifier + time
   }
 
   def seedFromInt(length: Int, seed: Int = 5489): Array[Int] = {

core/src/main/scala/spire/std/bigInteger.scala

@@ -53,7 +53,7 @@ trait BigIntegerIsNRoot extends NRoot[BigInteger] {
     } else {
       val c = b.setBit(i)
 
-      if (((c.pow(k)).compareTo(a)) <= 0)
+      if ((c.pow(k).compareTo(a)) <= 0)
         findNroot(c, i - 1)
       else
         findNroot(b, i - 1)

examples/src/main/scala/spire/example/infset.scala

@@ -78,7 +78,7 @@ case class PureSet[A](f: A => Boolean) extends Function1[A, Boolean] { lhs =>
     PureSet(b => f(g(b)))
 
   def unary_~ : PureSet[A] =
-    PureSet(a => !(f(a)))
+    PureSet(a => !f(a))
   def |(rhs: PureSet[A]): PureSet[A] =
     PureSet(a => lhs.f(a) || rhs.f(a))
   def &(rhs: PureSet[A]): PureSet[A] =

extras/src/main/scala/spire/math/extras/interval/IntervalTrie.scala

@@ -99,13 +99,13 @@ object IntervalTrie {
       // sign and magnitude signed integer
       val signAndMagnitude: Int = java.lang.Float.floatToIntBits(value)
       // two's complement signed integer: if the sign bit is set, negate everything except the sign bit
-      val twosComplement: Long = if (signAndMagnitude >= 0) signAndMagnitude else (-signAndMagnitude | (1L << 63))
+      val twosComplement: Long = if (signAndMagnitude >= 0) signAndMagnitude else -signAndMagnitude | (1L << 63)
       twosComplement
     }
 
     def fromLong(twosComplement: Long): Float = {
       // sign and magnitude signed integer: if the sign bit is set, negate everything except the sign bit
-      val signAndMagnitude = if (twosComplement >= 0) twosComplement else (-twosComplement | (1L << 63))
+      val signAndMagnitude = if (twosComplement >= 0) twosComplement else -twosComplement | (1L << 63)
       // double from sign and magnitude signed integer
       java.lang.Float.intBitsToFloat(signAndMagnitude.toInt)
     }
@@ -130,13 +130,13 @@ object IntervalTrie {
       // sign and magnitude signed integer
       val signAndMagnitude = java.lang.Double.doubleToLongBits(value)
       // two's complement signed integer: if the sign bit is set, negate everything except the sign bit
-      val twosComplement = if (signAndMagnitude >= 0) signAndMagnitude else (-signAndMagnitude | (1L << 63))
+      val twosComplement = if (signAndMagnitude >= 0) signAndMagnitude else -signAndMagnitude | (1L << 63)
       twosComplement
     }
 
     def fromLong(twosComplement: Long): Double = {
       // sign and magnitude signed integer: if the sign bit is set, negate everything except the sign bit
-      val signAndMagnitude = if (twosComplement >= 0) twosComplement else (-twosComplement | (1L << 63))
+      val signAndMagnitude = if (twosComplement >= 0) twosComplement else -twosComplement | (1L << 63)
       // double from sign and magnitude signed integer
       java.lang.Double.longBitsToDouble(signAndMagnitude)
     }

laws/src/main/scala/spire/laws/LatticeLaws.scala

@@ -42,15 +42,15 @@ trait LatticeLaws[A] extends Laws {
   def joinSemilattice(implicit A: JoinSemilattice[A]) = new LatticeProperties(
     name = "joinSemilattice",
     parents = Nil,
-    "join.associative" -> forAllSafe((x: A, y: A, z: A) => ((x.join(y)).join(z)) === (x.join(y.join(z)))),
+    "join.associative" -> forAllSafe((x: A, y: A, z: A) => (x.join(y).join(z)) === (x.join(y.join(z)))),
     "join.commutative" -> forAllSafe((x: A, y: A) => (x.join(y)) === (y.join(x))),
     "join.idempotent" -> forAllSafe((x: A) => (x.join(x)) === x)
   )
 
   def meetSemilattice(implicit A: MeetSemilattice[A]) = new LatticeProperties(
     name = "meetSemilattice",
     parents = Nil,
-    "meet.associative" -> forAllSafe((x: A, y: A, z: A) => ((x.meet(y)).meet(z)) === (x.meet(y.meet(z)))),
+    "meet.associative" -> forAllSafe((x: A, y: A, z: A) => (x.meet(y).meet(z)) === (x.meet(y.meet(z)))),
     "meet.commutative" -> forAllSafe((x: A, y: A) => (x.meet(y)) === (y.meet(x))),
     "meet.idempotent" -> forAllSafe((x: A) => (x.meet(x)) === x)
   )

laws/src/main/scala/spire/laws/LogicLaws.scala

@@ -70,15 +70,15 @@ trait LogicLaws[A] extends Laws {
       },
       "x -> (y -> x) = 1" -> forAllSafe { (x: A, y: A) => (x.imp(y.imp(x))) === A.one },
       "(x->(y->z)) -> ((x->y)->(x->z)) = 1" -> forAllSafe { (x: A, y: A, z: A) =>
-        ((x.imp(y.imp(z))).imp((x.imp(y)).imp(x.imp(z)))) === A.one
+        (x.imp(y.imp(z)).imp(x.imp(y).imp(x.imp(z)))) === A.one
       },
       "x∧y -> x = 1" -> forAllSafe { (x: A, y: A) => ((x & y).imp(x)) === A.one },
       "x∧y -> y = 1" -> forAllSafe { (x: A, y: A) => ((x & y).imp(y)) === A.one },
       "x -> y -> (x∧y) = 1" -> forAllSafe { (x: A, y: A) => (x.imp(y.imp(x & y))) === A.one },
       "x -> x∨y" -> forAllSafe { (x: A, y: A) => (x.imp(x | y)) === A.one },
       "y -> x∨y" -> forAllSafe { (x: A, y: A) => (y.imp(x | y)) === A.one },
       "(x -> z) -> ((y -> z) -> ((x | y) -> z)) = 1" -> forAllSafe { (x: A, y: A, z: A) =>
-        ((x.imp(z)).imp((y.imp(z)).imp((x | y).imp(z)))) === A.one
+        (x.imp(z).imp(y.imp(z).imp((x | y).imp(z)))) === A.one
       },
       "(0 -> x) = 1" -> forAllSafe { (x: A) => (A.zero.imp(x)) === A.one }
     )