diff options
| author | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-08-03 21:17:58 -0700 |
|---|---|---|
| committer | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-08-03 21:17:58 -0700 |
| commit | ec4a9fb5251bed30f4d99091d66190c1bd9daa03 (patch) | |
| tree | 372ec15107ccfd7890044f8f78a1faef552538e0 | |
| parent | b23a0df06d4479e4e29aa2ce629f4704f29ab5a0 (diff) | |
| parent | 6d088252baebb2eb74706bb51d602610a120df66 (diff) | |
| download | scala-ec4a9fb5251bed30f4d99091d66190c1bd9daa03.tar.gz scala-ec4a9fb5251bed30f4d99091d66190c1bd9daa03.tar.bz2 scala-ec4a9fb5251bed30f4d99091d66190c1bd9daa03.zip | |
Merge pull request #1022 from odersky/ticket/5764
SI-5764 Honor -language:_
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 2 |
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 b06ea639b0..0895f5a421 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))), _)) = |