summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/typechecker/Typers.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2012-07-30 18:01:36 +0200
committerMartin Odersky <odersky@gmail.com>2012-07-30 18:01:36 +0200
commit6d088252baebb2eb74706bb51d602610a120df66 (patch)
tree810191ab21b917a248b3a6f14201cefdd9ca2732 /src/compiler/scala/tools/nsc/typechecker/Typers.scala
parentd1b7b24b0bfb808875339366a13ed00672767c16 (diff)
downloadscala-6d088252baebb2eb74706bb51d602610a120df66.tar.gz
scala-6d088252baebb2eb74706bb51d602610a120df66.tar.bz2
scala-6d088252baebb2eb74706bb51d602610a120df66.zip
SI-5764 Honor -language:_
We now enable all language feature if -language:_ is given on the command line. Review by @paulp
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Typers.scala')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Typers.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index b1c3249e35..d5c76d2b9e 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -769,7 +769,7 @@ trait Typers extends Modes with Adaptations with Tags {
val featureName = (nestedOwners map (_.name + ".")).mkString + featureTrait.name
def action(): Boolean = {
def hasImport = inferImplicit(EmptyTree: Tree, featureTrait.tpe, true, false, context) != SearchFailure
- def hasOption = settings.language.value contains featureName
+ def hasOption = settings.language.value exists (s => s == featureName || s == "_")
val OK = hasImport || hasOption
if (!OK) {
val Some(AnnotationInfo(_, List(Literal(Constant(featureDesc: String)), Literal(Constant(required: Boolean))), _)) =