diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index afe5ecde2..20af19ef3 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -17,3 +17,6 @@ e93fe9bcf5ff0c314ca676bf9f3b9c8148574786 # Scala Steward: Reformat with scalafmt 3.6.1 7d658da8af97999192e3b0eff3fd25be86f34251 + +# Scala Steward: Reformat with scalafmt 3.7.15 +7fef5a5ddbb27cd7ab8ca5562ee96adea28eeca0 diff --git a/.scalafmt.conf b/.scalafmt.conf index 75797850d..ba5e22ffa 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version=3.7.4 +version=3.7.15 runner.dialect = Scala213Source3 fileOverride { "glob:**/scala-3/**" { diff --git a/core/src/main/scala/spire/math/Merging.scala b/core/src/main/scala/spire/math/Merging.scala index f2b7b79dc..f9bae2d7a 100644 --- a/core/src/main/scala/spire/math/Merging.scala +++ b/core/src/main/scala/spire/math/Merging.scala @@ -54,7 +54,7 @@ abstract class BinaryMerge { * @param bi * an index into the second sequence * @return - * -1 if a(ai) < b(bi), 0 if a(ai) == b(bi), 1 if a(ai) > b(bi) + * -1 if a(ai) < b(bi), 0 if a(ai) == b(bi), 1 if a(ai) > b(bi) */ def compare(ai: Int, bi: Int): Int