diff options
| author | Adriaan Moors <adriaan@lightbend.com> | 2016-11-30 16:28:02 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-30 16:28:02 -0800 |
| commit | 038c15e405b9498863a2236707686a7933748c60 (patch) | |
| tree | c5caba00c846b65f06b1232e7ad19666aa83ebb6 /src/compiler/scala/tools/nsc/typechecker/Typers.scala | |
| parent | 0339663cbbd4d22b0758257f2ce078b5a007f316 (diff) | |
| parent | 1870f1af7e81bbe46ea653d6c5ee5bfe476d277b (diff) | |
| download | scala-038c15e405b9498863a2236707686a7933748c60.tar.gz scala-038c15e405b9498863a2236707686a7933748c60.tar.bz2 scala-038c15e405b9498863a2236707686a7933748c60.zip | |
Merge pull request #5376 from milessabin/topic/clean-experimental
Clean up of code guarded by bare -Xexperimental
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Typers.scala')
| -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 78533bdfc5..de72d9feed 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -2561,7 +2561,7 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper // TODO: add fallback __match sentinel to predef val matchStrategy: Tree = - if (!(settings.Xexperimental && context.isNameInScope(vpmName._match))) null // fast path, avoiding the next line if there's no __match to be seen + if (!(settings.Yvirtpatmat && context.isNameInScope(vpmName._match))) null // fast path, avoiding the next line if there's no __match to be seen else newTyper(context.makeImplicit(reportAmbiguousErrors = false)).silent(_.typed(Ident(vpmName._match)), reportAmbiguousErrors = false) orElse (_ => null) if (matchStrategy ne null) // virtualize |