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/compiler | |
| 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/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Checkable.scala | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Checkable.scala b/src/compiler/scala/tools/nsc/typechecker/Checkable.scala index 2b6a4c763a..215ee1c42b 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Checkable.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Checkable.scala @@ -241,9 +241,7 @@ trait Checkable { private def isSealedOrFinal(sym: Symbol) = sym.isSealed || sym.isFinal private def isEffectivelyFinal(sym: Symbol): Boolean = ( // initialization important - sym.initialize.isEffectivelyFinalOrNotOverridden || ( - settings.future && isTupleSymbol(sym) // SI-7294 step into the future and treat TupleN as final. - ) + sym.initialize.isEffectivelyFinalOrNotOverridden ) def isNeverSubClass(sym1: Symbol, sym2: Symbol) = areIrreconcilableAsParents(sym1, sym2) |