summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/typechecker/Typers.scala
diff options
context:
space:
mode:
authorSom Snytt <som.snytt@gmail.com>2014-03-01 09:26:50 -0800
committerSom Snytt <som.snytt@gmail.com>2014-03-02 16:22:27 -0800
commit534cadc762a5dc3a5d211ad3733df91c7b1bd931 (patch)
tree4c7d5d57b316806a76b5f6964a8c16f3e694ca35 /src/compiler/scala/tools/nsc/typechecker/Typers.scala
parenta40af3e42fdfff62901dbc807ed3d899272d2b37 (diff)
downloadscala-534cadc762a5dc3a5d211ad3733df91c7b1bd931.tar.gz
scala-534cadc762a5dc3a5d211ad3733df91c7b1bd931.tar.bz2
scala-534cadc762a5dc3a5d211ad3733df91c7b1bd931.zip
SI-5905 Restore -language:_
Underscore means all. -x:c,b,a,_ results in value c,b,a,a,b,c,d,... Currently, -Xprint does not present phases as a closed set of choices; there is ad hoc checking in Global. That would be a nice unification. (You don't know the list of choices until after global is constructed.)
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 1004777f23..14aa25eeb8 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -738,7 +738,7 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper
val featureName = (nestedOwners map (_.name + ".")).mkString + featureTrait.name
def action(): Boolean = {
def hasImport = inferImplicit(EmptyTree: Tree, featureTrait.tpe, reportAmbiguous = true, isView = false, context).isSuccess
- def hasOption = settings.language.value exists (s => s == featureName || s == "_")
+ def hasOption = settings.language contains featureName
val OK = hasImport || hasOption
if (!OK) {
val Some(AnnotationInfo(_, List(Literal(Constant(featureDesc: String)), Literal(Constant(required: Boolean))), _)) =