summaryrefslogtreecommitdiff
path: root/test/files/run/t4332.scala
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@gmail.com>2014-09-02 16:52:24 +0200
committerLukas Rytz <lukas.rytz@gmail.com>2014-09-02 16:52:24 +0200
commit91c4192c39d2bdebf37a97e41d374a39ece8af85 (patch)
treee732aa1f0b6b6d65c21e91b40298f722200593f7 /test/files/run/t4332.scala
parent0f683b85488185f87a44a11f25edd2bf0f5a1b73 (diff)
parent1bbfd6b45b178986bfd26831689f8aa8393ae8a6 (diff)
downloadscala-91c4192c39d2bdebf37a97e41d374a39ece8af85.tar.gz
scala-91c4192c39d2bdebf37a97e41d374a39ece8af85.tar.bz2
scala-91c4192c39d2bdebf37a97e41d374a39ece8af85.zip
Merge branch 'merge/2.10-to-2.11-sept-2' into merge/2.11-to-2.12-is-it-really-sept-2-already-where-was-summer
Conflicts: versions.properties
Diffstat (limited to 'test/files/run/t4332.scala')
-rw-r--r--test/files/run/t4332.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/run/t4332.scala b/test/files/run/t4332.scala
index 5a67922911..1c7e7d73de 100644
--- a/test/files/run/t4332.scala
+++ b/test/files/run/t4332.scala
@@ -12,7 +12,7 @@ object Test extends DirectTest {
}
def isExempt(sym: Symbol) = {
- val exempt = Set("view", "repr", "sliceWithKnownDelta", "sliceWithKnownBound", "transform")
+ val exempt = Set("view", "repr", "sliceWithKnownDelta", "sliceWithKnownBound", "transform", "filterImpl")
(exempt contains sym.name.decoded)
}