Use scala.Math instead of scala.compat.Math

3 files changed, 5 insertions, 6 deletions

diff --git a/src/library/scala/collection/BitSet.scala b/src/library/scala/collection/BitSet.scala
index 41863fe29b..a4473f8aa8 100644
--- a/src/library/scala/collection/BitSet.scala
+++ b/src/library/scala/collection/BitSet.scala
@@ -25,7 +25,6 @@ package scala.collection
 abstract class BitSet extends Set[Int] {
 
   import compat.Platform.arraycopy
-  import compat.Math.min
 
   /** number of bits in this bitset */
   def size: Int
@@ -81,7 +80,7 @@ abstract class BitSet extends Set[Int] {
   override def equals(other: Any): Boolean = other match {
     case that: BitSet =>
       (size == that.size) && {
-        var len = memsize(min(this.capacity, that.capacity))
+        var len = memsize(Math.min(this.capacity, that.capacity))
         var i = 0
         while (i < len && arr(i) == that.arr(i)) i = i + 1
         i == len
@@ -109,7 +108,7 @@ abstract class BitSet extends Set[Int] {
     case that: BitSet =>
       val thisLen = memsize(this.capacity)
       val thatLen = memsize(that.capacity)
-      val minLen = min(thisLen, thatLen)
+      val minLen = Math.min(thisLen, thatLen)
       var i = 0
       while (i < minLen && that.arr(i) == (that.arr(i) | arr(i))) i = i + 1
       while (i < thisLen && arr(i) == 0) i = i + 1
diff --git a/src/library/scala/collection/immutable/Tree.scala b/src/library/scala/collection/immutable/Tree.scala
index 83184965d7..d4b63b4e4f 100644
--- a/src/library/scala/collection/immutable/Tree.scala
+++ b/src/library/scala/collection/immutable/Tree.scala
@@ -236,7 +236,7 @@ private case class INode[A <% Ordered[A],B](t1: GBTree[A,B],
     balance_p(GBNode(key, value, smaller, t1),smaller);
   protected def balance_p(t:GBTree[A,B],subtree:GBTree[A,B]):InsertTree[A,B] = {
     val (subHeight, subSize) = subtree.count
-    val totalHeight = 2 * compat.Math.max(height, subHeight)
+    val totalHeight = 2 * Math.max(height, subHeight)
     val totalSize = size + subSize + 1
     val BalanceHeight = totalSize * totalSize
     if (totalHeight > BalanceHeight) ITree(t.balance(totalSize))
@@ -308,7 +308,7 @@ private case class GBNode[A <% Ordered[A],B](key: A,
     if (mySize == 1)
       (1, mySize)
     else
-      (2 * compat.Math.max(sHeight, bHeight), mySize)
+      (2 * Math.max(sHeight, bHeight), mySize)
   }
 
   def isDefinedAt(sKey: A): Boolean =
diff --git a/src/library/scala/util/automata/SubsetConstruction.scala b/src/library/scala/util/automata/SubsetConstruction.scala
index 46d4c916f5..aff2319bef 100644
--- a/src/library/scala/util/automata/SubsetConstruction.scala
+++ b/src/library/scala/util/automata/SubsetConstruction.scala
@@ -60,7 +60,7 @@ class SubsetConstruction[T <: AnyRef](val nfa: NondetWordAutom[T]) {
 
   def selectTag(Q: BitSet, finals: Array[Int]) = {
     val it = Q.elements
-    var mintag = compat.Math.MAX_INT
+    var mintag = Math.MAX_INT
     while (it.hasNext) {
       val tag = finals(it.next)
       if ((0 < tag) && (tag < mintag))