diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2016-07-20 16:41:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-20 16:41:40 +0200 |
| commit | 5ddb0bbe36e7caa44c9442b059d103f7f4e75331 (patch) | |
| tree | 8fe2193790978f66af5e95055e3bf6ac97af307b /src/compiler | |
| parent | 2f75e051a181d4f8618746953ec07226b556fdb3 (diff) | |
| parent | cd9240ed524e69f01fcd872b9791754102c6530b (diff) | |
| download | scala-5ddb0bbe36e7caa44c9442b059d103f7f4e75331.tar.gz scala-5ddb0bbe36e7caa44c9442b059d103f7f4e75331.tar.bz2 scala-5ddb0bbe36e7caa44c9442b059d103f7f4e75331.zip | |
Merge pull request #5257 from szeiger/wip/final-tuples
SI-7301 Make tuple classes final
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) |