cleanups

scala · Feb 18, 2021 · 888ef94 · 888ef94
1 parent 7f16fec
commit 888ef94
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 18 deletions.
diff --git a/project/MimaFilters.scala b/project/MimaFilters.scala
@@ -34,9 +34,9 @@ object MimaFilters extends AutoPlugin {
     ProblemFilters.exclude[DirectMissingMethodProblem]("scala.collection.immutable.RedBlackTree#Tree.redWithRight"),
     ProblemFilters.exclude[DirectMissingMethodProblem]("scala.collection.immutable.RedBlackTree#Tree.redWithLeftRight"),
     ProblemFilters.exclude[DirectMissingMethodProblem]("scala.collection.immutable.RedBlackTree#Tree.blackWithLeftRight"),
-    ProblemFilters.exclude[DirectMissingMethodProblem]("scala.collection.immutable.RedBlackTree.partitionKeys"),
-    ProblemFilters.exclude[DirectMissingMethodProblem]("scala.collection.immutable.RedBlackTree.partitionKeys"),
     ProblemFilters.exclude[DirectMissingMethodProblem]("scala.collection.immutable.RedBlackTree#Tree.redWithLeft"),
+    ProblemFilters.exclude[DirectMissingMethodProblem]("scala.collection.immutable.RedBlackTree.partitionKeys"),
+    ProblemFilters.exclude[DirectMissingMethodProblem]("scala.collection.immutable.RedBlackTree.filterKeys"),
   )
 
   override val buildSettings = Seq(

diff --git a/src/library/scala/collection/immutable/RedBlackTree.scala b/src/library/scala/collection/immutable/RedBlackTree.scala
@@ -989,21 +989,6 @@ private[collection] object RedBlackTree {
     blacken(fk(t))
   }
 
-  def filterKeys[A, B](t: Tree[A, B], f: A => Boolean): Tree[A, B] = if(t eq null) null else {
-    def fk(t: Tree[A, B]): Tree[A, B] = {
-      val k = t.key
-      val l = t.left
-      val r = t.right
-      val l2 = if(l eq null) null else fk(l)
-      val keep = f(k)
-      val r2 = if(r eq null) null else fk(r)
-      if(!keep) join2(l2, r2)
-      else if((l2 eq l) && (r2 eq r)) t
-      else join(l2, k, t.value, r2)
-    }
-    blacken(fk(t))
-  }
-
   private[this] val null2 = (null, null)
 
   def partitionEntries[A, B](t: Tree[A, B], p: (A, B) => Boolean): (Tree[A, B], Tree[A, B]) = if(t eq null) (null, null) else {

diff --git a/test/junit/scala/tools/nsc/parser/ParserTest.scala b/test/junit/scala/tools/nsc/parser/ParserTest.scala
@@ -38,7 +38,7 @@ class ParserTest extends BytecodeTesting{
     import compiler._, global._
     val run = new Run
     run.compileSources(newSourceFile(code) :: Nil)
-    assert(!reporter.hasErrors)
+    assertFalse(reporter.hasErrors)
     val unit = run.units.toList.head
     def codeOf(pos: Position) = new String(pos.source.content.slice(pos.start, pos.end))
     val List(x, y) = unit.body.collect { case vd : ValDef => vd }.takeRight(2)