summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2014-02-19 21:58:45 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2014-02-24 22:49:51 -0800
commit62560b16765bdfe74212446e8ccb50dbeb06d457 (patch)
tree0e07878e253f70ef78a189b80e1f404950fe0bd2 /src/compiler
parent2ead4d6aa3de402f269252190aaa9075a990e098 (diff)
downloadscala-62560b16765bdfe74212446e8ccb50dbeb06d457.tar.gz
scala-62560b16765bdfe74212446e8ccb50dbeb06d457.tar.bz2
scala-62560b16765bdfe74212446e8ccb50dbeb06d457.zip
SI-6455 under -Xfuture, don't rewrite .withFilter to .filter
This has been deprecated for two major releases now, but `filter`'s still preferred over `withFilter` in the wild.
Diffstat (limited to 'src/compiler')
-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 8721450dc9..b64e3a351e 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -4714,7 +4714,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