Skip to content

Commit e40576b

Browse files
committed
simplify Tuple Ordering instances
1 parent c8b67c2 commit e40576b

File tree

1 file changed

+8
-24
lines changed

1 file changed

+8
-24
lines changed

library/src/scala/math/Ordering.scala

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -484,9 +484,7 @@ object Ordering extends LowPriorityOrderingImplicits {
484484
def compare(x: (T1, T2), y: (T1, T2)): Int = {
485485
val compare1 = ord1.compare(x._1, y._1)
486486
if (compare1 != 0) return compare1
487-
val compare2 = ord2.compare(x._2, y._2)
488-
if (compare2 != 0) return compare2
489-
0
487+
ord2.compare(x._2, y._2)
490488
}
491489
}
492490

@@ -497,9 +495,7 @@ object Ordering extends LowPriorityOrderingImplicits {
497495
if (compare1 != 0) return compare1
498496
val compare2 = ord2.compare(x._2, y._2)
499497
if (compare2 != 0) return compare2
500-
val compare3 = ord3.compare(x._3, y._3)
501-
if (compare3 != 0) return compare3
502-
0
498+
ord3.compare(x._3, y._3)
503499
}
504500
}
505501

@@ -512,9 +508,7 @@ object Ordering extends LowPriorityOrderingImplicits {
512508
if (compare2 != 0) return compare2
513509
val compare3 = ord3.compare(x._3, y._3)
514510
if (compare3 != 0) return compare3
515-
val compare4 = ord4.compare(x._4, y._4)
516-
if (compare4 != 0) return compare4
517-
0
511+
ord4.compare(x._4, y._4)
518512
}
519513
}
520514

@@ -529,9 +523,7 @@ object Ordering extends LowPriorityOrderingImplicits {
529523
if (compare3 != 0) return compare3
530524
val compare4 = ord4.compare(x._4, y._4)
531525
if (compare4 != 0) return compare4
532-
val compare5 = ord5.compare(x._5, y._5)
533-
if (compare5 != 0) return compare5
534-
0
526+
ord5.compare(x._5, y._5)
535527
}
536528
}
537529

@@ -548,9 +540,7 @@ object Ordering extends LowPriorityOrderingImplicits {
548540
if (compare4 != 0) return compare4
549541
val compare5 = ord5.compare(x._5, y._5)
550542
if (compare5 != 0) return compare5
551-
val compare6 = ord6.compare(x._6, y._6)
552-
if (compare6 != 0) return compare6
553-
0
543+
ord6.compare(x._6, y._6)
554544
}
555545
}
556546

@@ -569,9 +559,7 @@ object Ordering extends LowPriorityOrderingImplicits {
569559
if (compare5 != 0) return compare5
570560
val compare6 = ord6.compare(x._6, y._6)
571561
if (compare6 != 0) return compare6
572-
val compare7 = ord7.compare(x._7, y._7)
573-
if (compare7 != 0) return compare7
574-
0
562+
ord7.compare(x._7, y._7)
575563
}
576564
}
577565

@@ -592,9 +580,7 @@ object Ordering extends LowPriorityOrderingImplicits {
592580
if (compare6 != 0) return compare6
593581
val compare7 = ord7.compare(x._7, y._7)
594582
if (compare7 != 0) return compare7
595-
val compare8 = ord8.compare(x._8, y._8)
596-
if (compare8 != 0) return compare8
597-
0
583+
ord8.compare(x._8, y._8)
598584
}
599585
}
600586

@@ -617,9 +603,7 @@ object Ordering extends LowPriorityOrderingImplicits {
617603
if (compare7 != 0) return compare7
618604
val compare8 = ord8.compare(x._8, y._8)
619605
if (compare8 != 0) return compare8
620-
val compare9 = ord9.compare(x._9, y._9)
621-
if (compare9 != 0) return compare9
622-
0
606+
ord9.compare(x._9, y._9)
623607
}
624608
}
625609

0 commit comments

Comments
 (0)