Merge pull request #5252 from adriaanm/t8339

SI-8339 remove deprecated rewrite of withFilter -> filter

3 files changed, 2 insertions, 41 deletions

diff --git a/test/files/neg/t6455.flags b/test/files/neg/t6455.flags
deleted file mode 100644
index 112fc720a0..0000000000
--- a/test/files/neg/t6455.flags
+++ /dev/null
@@ -1 +0,0 @@
--Xfuture
\ No newline at end of file
diff --git a/test/files/neg/t6455.scala b/test/files/neg/t6455.scala
index ebbb37f1cd..22e4c30fdd 100644
--- a/test/files/neg/t6455.scala
+++ b/test/files/neg/t6455.scala
@@ -1,6 +1,6 @@
 object O { def filter(p: Int => Boolean): O.type = this }
 
 class Test {
-  // should not compile because we no longer rewrite withFilter => filter under -Xfuture
+  // should not compile because we no longer rewrite withFilter => filter
   O.withFilter(f => true)
-}
\ No newline at end of file
+}
diff --git a/test/files/pos/t7239.scala b/test/files/pos/t7239.scala
deleted file mode 100644
index 16e9d00f17..0000000000
--- a/test/files/pos/t7239.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-object Test {
-  def BrokenMethod(): HasFilter[(Int, String)] = ???
-
-  trait HasFilter[B] {
-    def filter(p: B => Boolean) = ???
-  }
-
-  trait HasWithFilter {
-    def withFilter = ???
-  }
-
-  object addWithFilter {
-    trait NoImplicit
-    implicit def enrich(v: Any)
-                       (implicit F0: NoImplicit): HasWithFilter = ???
-  }
-
-  BrokenMethod().withFilter(_ => true) // okay
-  BrokenMethod().filter(_ => true)     // okay
-
-  locally {
-    import addWithFilter._
-    BrokenMethod().withFilter((_: (Int, String)) => true) // okay
-  }
-
-  locally {
-    import addWithFilter._
-    // adaptToMemberWithArgs sets the type of the tree `x`
-    // to ErrorType (while in silent mode, so the error is not
-    // reported. Later, when the fallback from `withFilter`
-    // to `filter` is attempted, the closure is taken to have
-    // have the type `<error> => Boolean`, which conforms to
-    // `(B => Boolean)`. Only later during pickling does the
-    // defensive check for erroneous types in the tree pick up
-    // the problem.
-    BrokenMethod().withFilter(x => true) // erroneous or inaccessible type.
-  }
-}