@unspecialized annotation.

Suppresses specialization on a per-method basis.

I would have preferred to call it @nospecialize, but seeing as the
positive form of the annotation is @specialized, that would have sown
unnecessary grammatical confusion.  @nospecialized sounds a bit too
caveman for my tastes.  "Grog no specialized! Grog generic!"

1 files changed, 6 insertions, 5 deletions

diff --git a/src/library/scala/Function2.scala b/src/library/scala/Function2.scala
index cacb96ef5d..0794a4048a 100644
--- a/src/library/scala/Function2.scala
+++ b/src/library/scala/Function2.scala
@@ -11,7 +11,7 @@ package scala
 
 
 /** A function of 2 parameters.
- *
+ *  
  *  In the following example, the definition of max is a
  *  shorthand for the anonymous class definition anonfun2:
  *
@@ -23,7 +23,7 @@ package scala
  *      def apply(x: Int, y: Int): Int = if (x < y) y else x
  *    }
  *    assert(max(0, 1) == anonfun2(0, 1))
- *  }
+ * }
  *  }}}
  *
  *  Note that `Function1` does not define a total function, as might
@@ -40,16 +40,17 @@ trait Function2[@specialized(scala.Int, scala.Long, scala.Double) -T1, @speciali
   /** Creates a curried version of this function.
    *
    *  @return   a function `f` such that `f(x1)(x2) == apply(x1, x2)`
-   */  def curried: T1 => T2 => R = {
+   */
+  @annotation.unspecialized def curried: T1 => T2 => R = {
     (x1: T1) => (x2: T2) => apply(x1, x2)
   }
-
   /** Creates a tupled version of this function: instead of 2 arguments,
    *  it accepts a single [[scala.Tuple2]] argument.
    *
    *  @return   a function `f` such that `f((x1, x2)) == f(Tuple2(x1, x2)) == apply(x1, x2)`
    */
-  def tupled: Tuple2[T1, T2] => R = {
+
+  @annotation.unspecialized def tupled: Tuple2[T1, T2] => R = {
     case Tuple2(x1, x2) => apply(x1, x2)
   }
   override def toString() = "<function2>"