Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update scalafmt-core to 3.3.1 #1046

Merged
merged 2 commits into from
Jan 2, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=3.2.2
version=3.3.1
runner.dialect = scala212
fileOverride {
"glob:**/scala-2.13*/**" {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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] = {
Expand Down