Try other Tuple map method

Author: EugeneFlesselle

library/src/scala/Tuple.scala

@@ -56,7 +56,7 @@ sealed trait Tuple extends Product {
    *  If the tuple is of the form `a1 *: ... *: Tuple` (that is, the tail is not known
    *  to be the cons type.
    */
-  inline def map[F[_]](f: [t] => t => F[t]): Map[this.type, F] =
+  inline def map[F[_ <: Union[this.type]]](f: (t: Union[this.type]) => F[t.type]): Map[this.type, F] =
     runtime.Tuples.map(this, f).asInstanceOf[Map[this.type, F]]
 
   /** Given a tuple `(a1, ..., am)`, returns the tuple `(a1, ..., an)` consisting

library/src/scala/runtime/Tuples.scala

@@ -598,9 +598,11 @@ object Tuples {
     )
   }
 
-  def map[F[_]](self: Tuple, f: [t] => t => F[t]): Tuple = self match {
+  def map[T <: Tuple, F[_ <: Tuple.Union[T]]](self: T, f: (t: Tuple.Union[T]) => F[t.type]): Tuple = self match {
     case EmptyTuple => self
-    case _ => fromIArray(self.productIterator.map(f(_).asInstanceOf[Object]).toArray.asInstanceOf[IArray[Object]]) // TODO use toIArray
+    case _ =>
+      val iterator = self.productIterator.asInstanceOf[Iterator[Tuple.Union[T]]]
+      fromIArray(iterator.map(f(_)).toArray.asInstanceOf[IArray[Object]]) // TODO use toIArray
   }
 
   def take(self: Tuple, n: Int): Tuple = {

tests/pos/i14351.scala

@@ -1 +1 @@
-val p: (Option[Int], Option[String]) = (1,"foo").map([T] => (x: T) => Option.apply[T](x))
+val p: (Option[Int], Option[String]) = (1,"foo").map(Option(_))

tests/pos/i8300.scala

@@ -6,10 +6,5 @@ type Bar[X] = X match {
 }
 
 object Test:
-  (Set(1, 2, 3), List("a", "b")).map(
-    [A] =>
-      (a: A) =>
-        a match {
-          case it: Iterable[x] => it.map(Tuple1(_)).asInstanceOf[Bar[A]]
-      }
-  )
+  (Set(1, 2, 3), List("a", "b")).map: 
+    a => a.map(Tuple1(_)).asInstanceOf[Bar[a.type]]

tests/run/tuple-map.scala

@@ -4,14 +4,35 @@ object Test extends App {
   val tuple: Tuple = ("1", "2", "3", "4", "5")
   val tupleXXL: Tuple = ("11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35")
 
-  type Id[X] = X
-  val f: [t] => t => Id[t] = [t] => (x: t) => {
+  type F[X] = String
+  val f: (t: Any) => F[t.type] = x => {
     val str = x.asInstanceOf[String]
-    str.updated(0, (str(0) + 1).toChar).asInstanceOf[t]
+    str.updated(0, (str(0) + 1).toChar)
   }
 
   // Test all possible combinations of making
   println(emptyTuple.map(f))
   println(tuple.map(f))
   println(tupleXXL.map(f))
+
+  // NOTE F is needed in ascription of f above for inference of .map
+  def alternative: Unit =
+    val f: (t: Any) => String = x => {
+      val str = x.asInstanceOf[String]
+      str.updated(0, (str(0) + 1).toChar)
+    }
+    println(emptyTuple.map[F](f))
+    println(tuple.map[F](f))
+    println(tupleXXL.map[F](f))
+
+  // Given the body of f, the following is more likely to occur in practice:
+  def withoutWidening: Unit =
+    val emptyTuple = Tuple()
+    val tuple = ("1", "2", "3", "4", "5")
+    val tupleXXL = ("11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35")
+    val f: (s: String) => F[s.type] = str => str.updated(0, (str(0) + 1).toChar)
+    println(emptyTuple.map(f))
+    println(tuple.map(f))
+    println(tupleXXL.map(f))
+
 }

tests/run/tuple-ops.scala

@@ -13,13 +13,11 @@ val r5: Unit = a.zip(d)
 // Map
 case class Foo[X](x: X)
 
-val r6: (Int, Int, Int) = a.map[[t] =>> Int]([t] => (x: t) => x match {
-  case x: Int => x * x
-  case _ => ???
-})
+val r6: (Int, Int, Int) = a.map[[t] =>> Int](x => x * x)
 
 val r7: ((1, Foo[1]), (2, Foo[2]), (3, Foo[3])) =
-  a.map[[t] =>> (t, Foo[t])]( [t] => (x: t) => (x, Foo(x)) )
+  a.map[[t] =>> (t, Foo[t])](x => (x, Foo(x)))
+  // NOTE might not need give type param if had `precise` modifier for x
 
 // More Zip
 val t1: Int *: Long *: Tuple = (1, 2l, 100, 200)