summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@gmail.com>2016-02-15 16:56:48 +0100
committerLukas Rytz <lukas.rytz@gmail.com>2016-02-16 16:43:34 +0100
commitb7626d998ee415271105450f125c507629b8eae2 (patch)
treefd201d898e7d67dbdabdd116f1f27710718b98d6 /src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
parentce3a8030fa59e5a9082528bf6f1ffc12a9277bc9 (diff)
downloadscala-b7626d998ee415271105450f125c507629b8eae2.tar.gz
scala-b7626d998ee415271105450f125c507629b8eae2.tar.bz2
scala-b7626d998ee415271105450f125c507629b8eae2.zip
Remove -Y settings that are no longer used in 2.12
Added a deprecation warning for `-optimize`. Later we'll also graduate `-Yopt` to `-opt`, probably for 2.12.0-M5.
Diffstat (limited to 'src/compiler/scala/tools/nsc/ast/parser/Parsers.scala')
-rw-r--r--src/compiler/scala/tools/nsc/ast/parser/Parsers.scala5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
index 831a0412cd..d4715471f6 100644
--- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
@@ -2811,11 +2811,6 @@ self =>
if (mods.isTrait) (Modifiers(Flags.TRAIT), List())
else (accessModifierOpt(), paramClauses(name, classContextBounds, ofCaseClass = mods.isCase))
var mods1 = mods
- if (mods.isTrait) {
- if (settings.YvirtClasses && in.token == SUBTYPE) mods1 |= Flags.DEFERRED
- } else if (in.token == SUBTYPE) {
- syntaxError("classes are not allowed to be virtual", skipIt = false)
- }
val template = templateOpt(mods1, name, constrMods withAnnotations constrAnnots, vparamss, tstart)
val result = gen.mkClassDef(mods1, name, tparams, template)
// Context bounds generate implicit parameters (part of the template) with types