Skip to content

Commit 235a716

Browse files
committed
Fix init for Tuple1 case
1 parent 9f8ca94 commit 235a716

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

library/src/scala/Tuple.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ object Tuple {
8484

8585
/** Type of the initial part of the tuple without its last element */
8686
type Init[X <: NonEmptyTuple] <: Tuple = X match {
87-
case _ *: EmptyTuple => X
87+
case _ *: EmptyTuple => EmptyTuple
8888
case x *: xs =>
8989
xs match {
9090
case _ *: EmptyTuple =>

library/src/scala/runtime/Tuples.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,8 +375,8 @@ object Tuples {
375375
// Init for Tuple1 to Tuple22
376376
private def specialCaseInit(self: Tuple): Tuple = {
377377
(self: Any) match {
378-
case self: Tuple1[_] =>
379-
self
378+
case _: Tuple1[_] =>
379+
EmptyTuple
380380
case self: Tuple2[_, _] =>
381381
Tuple1(self._1)
382382
case self: Tuple3[_, _, _] =>

tests/run-deep-subtype/Tuple-init.check

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(0)
1+
()
22
(0)
33
(0,0)
44
(0,0,1)
@@ -24,7 +24,7 @@
2424
(0,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21)
2525
(0,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22)
2626
(0,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23)
27-
(1)
27+
()
2828
(1)
2929
(1,2)
3030
(1,2,3)
@@ -49,7 +49,7 @@
4949
(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22)
5050
(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23)
5151
(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24)
52-
(1)
52+
()
5353
(1)
5454
(1,2)
5555
(1,2,3)

0 commit comments

Comments
 (0)