Merge pull request #96 from scala-steward/update/scala-library-2.13.14

Update scala-library to 2.13.14
lightbend-labs · Jun 4, 2024 · e4e44e6 · e4e44e6
2 parents 553cbd9 + 2c782c5
commit e4e44e6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/build.sbt b/build.sbt
@@ -4,7 +4,7 @@ lazy val root = project.in(file("."))
   .settings(inThisBuild(Seq(
     organization := "com.lightbend.benchdb",
     //version := "0.1-SNAPSHOT",
-    scalaVersion := "2.12.19",
+    scalaVersion := "2.13.14",
     scalacOptions ++= Seq("-deprecation", "-unchecked"),
   )))
   .settings(
@@ -42,6 +42,7 @@ lazy val plugin = project.in(file("plugin"))
   .settings(
     name := "sbt-benchdb",
     sbtPlugin := true,
+    scalaVersion := "2.12.19",
     buildInfoKeys := Seq[BuildInfoKey](organization, core / name, version, core / scalaVersion),
     buildInfoPackage := "com.lightbend.benchdb.sbtplugin",
     publishMavenStyle := false,

diff --git a/core/src/main/scala/com/lightbend/benchdb/RunResult.scala b/core/src/main/scala/com/lightbend/benchdb/RunResult.scala
@@ -227,7 +227,7 @@ object RunResult extends Logging {
 
   class ParamOrdering(paramTypes: Seq[(Boolean, Boolean)], nullsFirst: Boolean = false) extends Ordering[Seq[String]]{
     def compare(x: Seq[String], y: Seq[String]): Int = {
-      val it = (x, y, paramTypes).zipped.toIterator
+      val it = x.lazyZip(y).lazyZip(paramTypes).iterator
       while(it.hasNext) {
         val (x, y, (asLong, asDouble)) = it.next()
         if(x != null || y != null) {
@@ -237,7 +237,7 @@ object RunResult extends Logging {
             val diff = Ordering.Long.compare(x.toLong, y.toLong)
             if(diff != 0) return diff
           } else if(asDouble) {
-            val diff = Ordering.Double.compare(x.toDouble, y.toDouble)
+            val diff = Ordering.Double.TotalOrdering.compare(x.toDouble, y.toDouble)
             if(diff != 0) return diff
           } else {
             val diff = Ordering.String.compare(x, y)

diff --git a/core/src/main/scala/com/lightbend/benchdb/TableFormatter.scala b/core/src/main/scala/com/lightbend/benchdb/TableFormatter.scala
@@ -10,7 +10,7 @@ class TableFormatter(val go: GlobalOptions) {
   import TableFormatter._
   import go.format._
 
-  protected[this] def formatLine(line: IndexedSeq[Any], formats: IndexedSeq[Format]): IndexedSeq[Cell] = (line, formats).zipped.map { (v, c) =>
+  protected[this] def formatLine(line: IndexedSeq[Any], formats: IndexedSeq[Format]): IndexedSeq[Cell] = line.lazyZip(formats).map { (v, c) =>
     def fmtSimple(v: Any): String = v match {
       case null => ""
       case Some(v) => fmtSimple(v)
@@ -83,7 +83,7 @@ class TableFormatter(val go: GlobalOptions) {
         }
       }
     }
-    widths
+    widths.toIndexedSeq
   }
 
   private def formatSeparator(widths: IndexedSeq[Int], lIdx: Int, cIdx: Int, rIdx: Int): String = {