Update scalafmt-core to 3.3.1 (#1046)

* Update scalafmt-core to 3.3.1 * Reformat with scalafmt 3.3.1
twitter · Jan 2, 2022 · 3f29405 · 3f29405
1 parent 2954248
commit 3f29405
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 20 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version=3.2.2
+version=3.3.1
 runner.dialect = scala212
 fileOverride {
   "glob:**/scala-2.13*/**" {

diff --git a/algebird-core/src/main/scala/com/twitter/algebird/DecayingCMS.scala b/algebird-core/src/main/scala/com/twitter/algebird/DecayingCMS.scala
@@ -290,15 +290,15 @@ final class DecayingCMS[K](
       any match {
         case that: DecayingCMS[_]#CMS =>
           this.logScale == that.logScale &&
-            this.timeInHL == that.timeInHL &&
-            this.cells.length == that.cells.length && {
-              var i = 0
-              while (i < depth) {
-                if (this.cells(i) != that.cells(i)) return false
-                i += 1
-              }
-              true
+          this.timeInHL == that.timeInHL &&
+          this.cells.length == that.cells.length && {
+            var i = 0
+            while (i < depth) {
+              if (this.cells(i) != that.cells(i)) return false
+              i += 1
             }
+            true
+          }
         case _ =>
           false
       }

diff --git a/algebird-core/src/main/scala/com/twitter/algebird/InvariantAlgebras.scala b/algebird-core/src/main/scala/com/twitter/algebird/InvariantAlgebras.scala
@@ -16,9 +16,9 @@ class InvariantSemigroup[T, U](val forward: T => U, val reverse: U => T)(implici
     that match {
       case r: InvariantSemigroup[_, _] =>
         (hashCode == r.hashCode) &&
-          (forward == r.forward) &&
-          (reverse == r.reverse) &&
-          (semigroup == r.semigroup)
+        (forward == r.forward) &&
+        (reverse == r.reverse) &&
+        (semigroup == r.semigroup)
       case _ => false
     }
 }

diff --git a/algebird-core/src/main/scala/com/twitter/algebird/MomentsGroup.scala b/algebird-core/src/main/scala/com/twitter/algebird/MomentsGroup.scala
@@ -82,10 +82,10 @@ sealed class Moments(val m0D: Double, val m1: Double, val m2: Double, val m3: Do
     that match {
       case thatM: Moments =>
         (m0D == thatM.m0D) &&
-          (m1 == thatM.m1) &&
-          (m2 == thatM.m2) &&
-          (m3 == thatM.m3) &&
-          (m4 == thatM.m4)
+        (m1 == thatM.m1) &&
+        (m2 == thatM.m2) &&
+        (m3 == thatM.m3) &&
+        (m4 == thatM.m4)
       case _ => false
     }
 

diff --git a/algebird-generic/src/main/scala/com/twitter/algebird/generic/Instances.scala b/algebird-generic/src/main/scala/com/twitter/algebird/generic/Instances.scala
@@ -123,8 +123,8 @@ class HConsSemigroup[A, B <: HList](protected val a: Semigroup[A], protected val
     that match {
       case hcs: HConsSemigroup[_, _] =>
         (hashCode == hcs.hashCode) &&
-          (a == hcs.a) &&
-          (b == hcs.b)
+        (a == hcs.a) &&
+        (b == hcs.b)
       case _ => false
     }
 }

diff --git a/algebird-test/src/test/scala/com/twitter/algebird/SetDiffTest.scala b/algebird-test/src/test/scala/com/twitter/algebird/SetDiffTest.scala
@@ -91,7 +91,7 @@ class SetDiffTest extends AnyWordSpec with Matchers with Checkers {
         a.strictApply(set) match {
           case None =>
             (a.remove.diff(set).nonEmpty || (a.add & set).nonEmpty) &&
-              (a.invert(a(set)) != set) // invert only succeeds when strictApply does
+            (a.invert(a(set)) != set) // invert only succeeds when strictApply does
           /*
            * And if it DOES succeed it inverts!
            * Note that this law is not true:

diff --git a/algebird-util/src/main/scala/com/twitter/algebird/util/PromiseLinkMonoid.scala b/algebird-util/src/main/scala/com/twitter/algebird/util/PromiseLinkMonoid.scala
@@ -23,7 +23,7 @@ import com.twitter.util.Promise
  * general version of the TunnelMonoid. See the documentation for TunnelMonoid for general motivation. NOTE:
  * the Promise will be fulfilled with the value just before the PromiseLink is calculated.
  */
-class PromiseLinkMonoid[V](monoid: Monoid[V]) extends Monoid[PromiseLink[V]] { //TODo(jcoveney) rename PromiseLink
+class PromiseLinkMonoid[V](monoid: Monoid[V]) extends Monoid[PromiseLink[V]] { // TODo(jcoveney) rename PromiseLink
   def zero: PromiseLink[V] = PromiseLink(new Promise, monoid.zero)
 
   def plus(older: PromiseLink[V], newer: PromiseLink[V]): PromiseLink[V] = {