Skip to content

Commit

Permalink
Merge pull request #1300 from typelevel/update/scalafmt-core-3.7.17
Browse files Browse the repository at this point in the history
Update scalafmt-core to 3.7.17
  • Loading branch information
armanbilge authored Dec 30, 2023
2 parents 1554865 + a677582 commit 7127af2
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,6 @@ e93fe9bcf5ff0c314ca676bf9f3b9c8148574786

# Scala Steward: Reformat with scalafmt 3.6.1
7d658da8af97999192e3b0eff3fd25be86f34251

# Scala Steward: Reformat with scalafmt 3.7.17
7829f68c27c622dee3a8d1329d82a139f183d0c1
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=3.7.4
version=3.7.17
runner.dialect = Scala213Source3
fileOverride {
"glob:**/scala-3/**" {
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/spire/math/Merging.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 7127af2

Please sign in to comment.