diff options
| author | Stefan Zeiger <szeiger@novocode.com> | 2016-07-05 12:37:04 +0200 |
|---|---|---|
| committer | Stefan Zeiger <szeiger@novocode.com> | 2016-07-07 21:37:18 +0200 |
| commit | cd9240ed524e69f01fcd872b9791754102c6530b (patch) | |
| tree | 8b1a0c01b2181b55403cc7b382d1a09ec1dbea26 /src/library/scala/Tuple2.scala | |
| parent | 6612ba010b0e70c53550d1e47141c8dc89a55f23 (diff) | |
| download | scala-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/Tuple2.scala')
| -rw-r--r-- | src/library/scala/Tuple2.scala | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/library/scala/Tuple2.scala b/src/library/scala/Tuple2.scala index 9ea1469c5c..5faa4e9821 100644 --- a/src/library/scala/Tuple2.scala +++ b/src/library/scala/Tuple2.scala @@ -16,8 +16,7 @@ package scala * @param _1 Element 1 of this Tuple2 * @param _2 Element 2 of this Tuple2 */ -@deprecatedInheritance("Tuples will be made final in a future version.", "2.11.0") -case class Tuple2[@specialized(Int, Long, Double, Char, Boolean/*, AnyRef*/) +T1, @specialized(Int, Long, Double, Char, Boolean/*, AnyRef*/) +T2](_1: T1, _2: T2) +final case class Tuple2[@specialized(Int, Long, Double, Char, Boolean/*, AnyRef*/) +T1, @specialized(Int, Long, Double, Char, Boolean/*, AnyRef*/) +T2](_1: T1, _2: T2) extends Product2[T1, T2] { override def toString() = "(" + _1 + "," + _2 + ")" |