Upgrade Dotty to 0.24.0-RC1

In that, avoid infix & varargs expansion in Console.printf:

    [error] 280 |  def printf(text: String, args: Any*): Unit = { out.print(text format (args : _*)) }
    [error]     |                                                                               ^
    [error]     |        `_*` can be used only for last argument of method application.
    [error]     |        It is no longer allowed in operands of infix operations.

Also, avoid ambiguity errors after scala/scala3#8622

Author: anatoliykmetyuk

project/DottySupport.scala

@@ -14,7 +14,7 @@ import sbt.librarymanagement.{
  *  Dotty in .travis.yml.
  */
 object DottySupport {
-  val dottyVersion = "0.23.0-RC1"
+  val dottyVersion = "0.24.0-RC1"
   val compileWithDotty: Boolean =
     Option(System.getProperty("scala.build.compileWithDotty")).map(_.toBoolean).getOrElse(false)
   lazy val commonSettings = Seq(

src/library/scala/Console.scala

@@ -277,5 +277,5 @@ object Console extends AnsiColor {
    *  @throws java.lang.IllegalArgumentException if there was a problem with the format string or arguments
    *  @group console-output
    */
-  def printf(text: String, args: Any*): Unit = { out.print(text format (args : _*)) }
+  def printf(text: String, args: Any*): Unit = { out.print(text.format(args: _*)) }
 }

src/library/scala/collection/Map.scala

@@ -158,7 +158,7 @@ trait MapOps[K, +V, +CC[_, _] <: IterableOps[_, AnyConstr, _], +C]
   /** The implementation class of the set returned by `keySet`.
     */
   protected class KeySet extends AbstractSet[K] with GenKeySet with DefaultSerializable {
-    def diff(that: Set[K]): Set[K] = fromSpecific(view.filterNot(that))
+    def diff(that: Set[K]): Set[K] = fromSpecific(this.view.filterNot(that))
   }
 
   /** A generic trait that is reused by keyset implementations */

src/library/scala/collection/immutable/BitSet.scala

@@ -136,22 +136,22 @@ object BitSet extends SpecificIterableFactory[Int, BitSet] {
     protected[collection] def updateWord(idx: Int, w: Long): BitSet =
       if (idx == 0) new BitSet1(w)
       else if (idx == 1) createSmall(elems, w)
-      else fromBitMaskNoCopy(updateArray(Array(elems), idx, w))
+      else this.fromBitMaskNoCopy(updateArray(Array(elems), idx, w))
 
 
     override def diff(other: collection.Set[Int]): BitSet = other match {
       case bs: collection.BitSet => bs.nwords match {
         case 0 => this
         case _ =>
           val newElems = elems & ~bs.word(0)
-          if (newElems == 0L) empty else new BitSet1(newElems)
+          if (newElems == 0L) this.empty else new BitSet1(newElems)
       }
       case _ => super.diff(other)
     }
 
     override def filterImpl(pred: Int => Boolean, isFlipped: Boolean): BitSet = {
       val _elems = BitSetOps.computeWordForFilter(pred, isFlipped, elems, 0)
-      if (_elems == 0L) empty else new BitSet1(_elems)
+      if (_elems == 0L) this.empty else new BitSet1(_elems)
     }
   }
 
@@ -162,7 +162,7 @@ object BitSet extends SpecificIterableFactory[Int, BitSet] {
     protected[collection] def updateWord(idx: Int, w: Long): BitSet =
       if (idx == 0) new BitSet2(w, elems1)
       else if (idx == 1) createSmall(elems0, w)
-      else fromBitMaskNoCopy(updateArray(Array(elems0, elems1), idx, w))
+      else this.fromBitMaskNoCopy(updateArray(Array(elems0, elems1), idx, w))
 
 
     override def diff(other: collection.Set[Int]): BitSet = other match {
@@ -176,7 +176,7 @@ object BitSet extends SpecificIterableFactory[Int, BitSet] {
 
           if (_elems1 == 0L) {
             if (_elems0 == 0L) {
-              empty
+              this.empty
             } else {
               new BitSet1(_elems0)
             }
@@ -193,7 +193,7 @@ object BitSet extends SpecificIterableFactory[Int, BitSet] {
 
       if (_elems1 == 0L) {
         if (_elems0 == 0L) {
-          empty
+          this.empty
         }
         else new BitSet1(_elems0)
       }
@@ -207,7 +207,7 @@ object BitSet extends SpecificIterableFactory[Int, BitSet] {
 
     protected[collection] def word(idx: Int) = if (idx < nwords) elems(idx) else 0L
 
-    protected[collection] def updateWord(idx: Int, w: Long): BitSet = fromBitMaskNoCopy(updateArray(elems, idx, w))
+    protected[collection] def updateWord(idx: Int, w: Long): BitSet = this.fromBitMaskNoCopy(updateArray(elems, idx, w))
 
     override def diff(that: collection.Set[Int]): BitSet = that match {
       case bs: collection.BitSet =>
@@ -245,7 +245,7 @@ object BitSet extends SpecificIterableFactory[Int, BitSet] {
           }
           if (i < 0) {
             // all indices >= 0 have had result 0, so the bitset is empty
-            empty
+            this.empty
           } else {
             val minimumNonZeroIndex: Int = i + 1
             while (!anyChanges && i >= 0) {
@@ -256,7 +256,7 @@ object BitSet extends SpecificIterableFactory[Int, BitSet] {
             }
             if (anyChanges) {
               if (minimumNonZeroIndex == -1) {
-                empty
+                this.empty
               } else if (minimumNonZeroIndex == 0) {
                 new BitSet1(currentWord)
               } else if (minimumNonZeroIndex == 1) {
@@ -268,7 +268,7 @@ object BitSet extends SpecificIterableFactory[Int, BitSet] {
                   newArray(i) = word(i) & ~bs.word(i)
                   i -= 1
                 }
-                fromBitMaskNoCopy(newArray)
+                this.fromBitMaskNoCopy(newArray)
               }
             } else {
               this
@@ -291,7 +291,7 @@ object BitSet extends SpecificIterableFactory[Int, BitSet] {
               newElems(i) = word(i) & ~bs.word(i)
               i -= 1
             }
-            fromBitMaskNoCopy(newElems)
+            this.fromBitMaskNoCopy(newElems)
           } else {
             this
           }
@@ -315,7 +315,7 @@ object BitSet extends SpecificIterableFactory[Int, BitSet] {
       }
       if (i < 0) {
         // all indices >= 0 have had result 0, so the bitset is empty
-        if (currentWord == 0) empty else fromBitMaskNoCopy(Array(currentWord))
+        if (currentWord == 0) this.empty else this.fromBitMaskNoCopy(Array(currentWord))
       } else {
         val minimumNonZeroIndex: Int = i + 1
         while (!anyChanges && i >= 0) {
@@ -326,7 +326,7 @@ object BitSet extends SpecificIterableFactory[Int, BitSet] {
         }
         if (anyChanges) {
           if (minimumNonZeroIndex == -1) {
-            empty
+            this.empty
           } else if (minimumNonZeroIndex == 0) {
             new BitSet1(currentWord)
           } else if (minimumNonZeroIndex == 1) {
@@ -338,7 +338,7 @@ object BitSet extends SpecificIterableFactory[Int, BitSet] {
               newArray(i) = BitSetOps.computeWordForFilter(pred, isFlipped, word(i), i)
               i -= 1
             }
-            fromBitMaskNoCopy(newArray)
+            this.fromBitMaskNoCopy(newArray)
           }
         } else {
           this

src/library/scala/collection/mutable/PriorityQueue.scala

@@ -67,7 +67,7 @@ sealed class PriorityQueue[A](implicit val ord: Ordering[A])
   private class ResizableArrayAccess[A0] extends ArrayBuffer[A0] {
     override def mapInPlace(f: A0 => A0): this.type = {
       var i = 1 // see "we do not use array(0)" comment below (???)
-      val siz = size
+      val siz = this.size
       while (i < siz) { this(i) = f(this(i)); i += 1 }
       this
     }