summaryrefslogtreecommitdiff
path: root/src/library/scala/Tuple6.scala
diff options
context:
space:
mode:
authorStefan Zeiger <szeiger@novocode.com>2016-07-05 12:37:04 +0200
committerStefan Zeiger <szeiger@novocode.com>2016-07-07 21:37:18 +0200
commitcd9240ed524e69f01fcd872b9791754102c6530b (patch)
tree8b1a0c01b2181b55403cc7b382d1a09ec1dbea26 /src/library/scala/Tuple6.scala
parent6612ba010b0e70c53550d1e47141c8dc89a55f23 (diff)
downloadscala-cd9240ed524e69f01fcd872b9791754102c6530b.tar.gz
scala-cd9240ed524e69f01fcd872b9791754102c6530b.tar.bz2
scala-cd9240ed524e69f01fcd872b9791754102c6530b.zip
SI-7301 Make tuple classes final
This includes undoing the special case for `-Xfuture` introduced in https://github.com/scala/scala/pull/2299 and updating tests to take the new errors into account.
Diffstat (limited to 'src/library/scala/Tuple6.scala')
-rw-r--r--src/library/scala/Tuple6.scala3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/library/scala/Tuple6.scala b/src/library/scala/Tuple6.scala
index 6bf1c73d4b..cf69b9c10a 100644
--- a/src/library/scala/Tuple6.scala
+++ b/src/library/scala/Tuple6.scala
@@ -20,8 +20,7 @@ package scala
* @param _5 Element 5 of this Tuple6
* @param _6 Element 6 of this Tuple6
*/
-@deprecatedInheritance("Tuples will be made final in a future version.", "2.11.0")
-case class Tuple6[+T1, +T2, +T3, +T4, +T5, +T6](_1: T1, _2: T2, _3: T3, _4: T4, _5: T5, _6: T6)
+final case class Tuple6[+T1, +T2, +T3, +T4, +T5, +T6](_1: T1, _2: T2, _3: T3, _4: T4, _5: T5, _6: T6)
extends Product6[T1, T2, T3, T4, T5, T6]
{
override def toString() = "(" + _1 + "," + _2 + "," + _3 + "," + _4 + "," + _5 + "," + _6 + ")"