diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-02-25 13:50:19 +0100 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-02-25 13:50:19 +0100 |
| commit | 1ea43ffb2286d63e133839c1ea0b09449b0ac168 (patch) | |
| tree | 2d003de0ec0e2687eaef214d65e46922b9e86264 /src/compiler | |
| parent | 7c709e122f7471353749525cff15602783fb348c (diff) | |
| parent | 12dc4a28da8d3631734603c896d2ee1ba21b31d6 (diff) | |
| download | scala-1ea43ffb2286d63e133839c1ea0b09449b0ac168.tar.gz scala-1ea43ffb2286d63e133839c1ea0b09449b0ac168.tar.bz2 scala-1ea43ffb2286d63e133839c1ea0b09449b0ac168.zip | |
Merge pull request #3566 from adriaanm/t6455
SI-6455 no longer rewrite .withFilter to .filter
Diffstat (limited to 'src/compiler')
| -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 8a3ceb3aca..1004777f23 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -4715,7 +4715,7 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper UnstableTreeError(qualTyped) ) val tree1 = name match { - case nme.withFilter => tryWithFilterAndFilter(tree, qualStableOrError) + case nme.withFilter if !settings.future => tryWithFilterAndFilter(tree, qualStableOrError) case _ => typedSelect(tree, qualStableOrError, name) } def sym = tree1.symbol |