Adapt the extension to the (yet) new syntax

Author: Antoine Brunner

library/src-bootstrapped/scala/IArray.scala

@@ -228,160 +228,163 @@ object IArray {
 
   /** All the methods on Array[T] that don't mutate in-place can be used with IArray[T].
    */
-  given arrayOps: [T](arr: IArray[T]) {
-    def ++[U >: T: ClassTag](that: IArray[U]): IArray[U] =
+  given arrayOps: Object {
+    def [T, U >: T: ClassTag](arr: IArray[T]) ++(that: IArray[U]): IArray[U] =
       (arr.asInstanceOf[Array[T]] ++ that.asInstanceOf[Array[U]]).asInstanceOf
 
-    def contains(elem: T): Boolean =
+    def [T](arr: IArray[T])contains(elem: T): Boolean =
       arr.asInstanceOf[Array[T]].contains(elem)
 
-    def count(p: T => Boolean): Int =
+    def [T](arr: IArray[T]) count(p: T => Boolean): Int =
       arr.asInstanceOf[Array[T]].count(p)
 
-    def drop(n: Int): IArray[T] =
+    def [T](arr: IArray[T]) drop(n: Int): IArray[T] =
       arr.asInstanceOf[Array[T]].drop(n).asInstanceOf
 
-    def dropRight(n: Int): IArray[T] =
+    def [T](arr: IArray[T]) dropRight(n: Int): IArray[T] =
       arr.asInstanceOf[Array[T]].dropRight(n).asInstanceOf
 
-    def dropWhile(p: T => Boolean): IArray[T] =
+    def [T](arr: IArray[T]) dropWhile(p: T => Boolean): IArray[T] =
       arr.asInstanceOf[Array[T]].dropWhile(p).asInstanceOf
 
-    def exists(p: T => Boolean): IArray[T] =
+    def [T](arr: IArray[T]) exists(p: T => Boolean): IArray[T] =
       arr.asInstanceOf[Array[T]].exists(p).asInstanceOf
 
-    def filter(p: T => Boolean): IArray[T] =
+    def [T](arr: IArray[T]) filter(p: T => Boolean): IArray[T] =
       arr.asInstanceOf[Array[T]].filter(p).asInstanceOf
 
-    def filterNot(p: T => Boolean): IArray[T] =
+    def [T](arr: IArray[T]) filterNot(p: T => Boolean): IArray[T] =
       arr.asInstanceOf[Array[T]].filterNot(p).asInstanceOf
 
-    def find(p: T => Boolean): Option[T] =
+    def [T](arr: IArray[T]) find(p: T => Boolean): Option[T] =
       arr.asInstanceOf[Array[T]].find(p).asInstanceOf
 
-    def flatMap[U: ClassTag](f: T => IterableOnce[U]): IArray[U] =
+    def [T, U: ClassTag](arr: IArray[T]) flatMap(f: T => IterableOnce[U]): IArray[U] =
       arr.asInstanceOf[Array[T]].flatMap(f).asInstanceOf
 
-    def flatten[U: ClassTag](given T => Iterable[U]): IArray[U] =
+    def [T, U: ClassTag](arr: IArray[T]) flatten(given T => Iterable[U]): IArray[U] =
       arr.asInstanceOf[Array[T]].flatten.asInstanceOf
 
-    def fold[U >: T: ClassTag](z: U)(op: (U, U) => U): U =
+    def [T, U >: T: ClassTag](arr: IArray[T]) fold(z: U)(op: (U, U) => U): U =
       arr.asInstanceOf[Array[T]].fold(z)(op).asInstanceOf
 
-    def foldLeft[U >: T: ClassTag](z: U)(op: (U, T) => U): U =
+    def [T, U >: T: ClassTag](arr: IArray[T]) foldLeft(z: U)(op: (U, T) => U): U =
       arr.asInstanceOf[Array[T]].foldLeft(z)(op).asInstanceOf
 
-    def foldRight[U >: T: ClassTag](z: U)(op: (T, U) => U): U =
+    def [T, U >: T: ClassTag](arr: IArray[T]) foldRight(z: U)(op: (T, U) => U): U =
       arr.asInstanceOf[Array[T]].foldRight(z)(op).asInstanceOf
 
-    def forall(p: T => Boolean): Boolean =
+    def [T](arr: IArray[T]) forall(p: T => Boolean): Boolean =
       arr.asInstanceOf[Array[T]].forall(p)
 
-    def foreach[U](f: T => U): Unit =
+    def [T, U](arr: IArray[T]) foreach(f: T => U): Unit =
       arr.asInstanceOf[Array[T]].foreach(f)
 
-    def head: T =
+    def [T](arr: IArray[T]) head: T =
       arr.asInstanceOf[Array[T]].head
 
-    def headOption: Option[T] =
+    def [T](arr: IArray[T]) headOption: Option[T] =
       arr.asInstanceOf[Array[T]].headOption
 
-    def indexOf(elem: T, from: Int = 0): Int =
+    def [T](arr: IArray[T]) indexOf(elem: T, from: Int = 0): Int =
       arr.asInstanceOf[Array[T]].indexOf(elem, from)
 
-    def indexWhere(p: T => Boolean, from: Int = 0): Int =
+    def [T](arr: IArray[T]) indexWhere(p: T => Boolean, from: Int = 0): Int =
       arr.asInstanceOf[Array[T]].indexWhere(p, from)
 
-    def indices: Range =
+    def [T](arr: IArray[T]) indices: Range =
       arr.asInstanceOf[Array[T]].indices.asInstanceOf
 
-    def init: IArray[T] =
+    def [T](arr: IArray[T]) init: IArray[T] =
       arr.asInstanceOf[Array[T]].init.asInstanceOf
 
-    def isEmpty: Boolean =
+    def [T](arr: IArray[T]) isEmpty: Boolean =
       arr.asInstanceOf[Array[T]].isEmpty
 
-    def iterator: Iterator[T] =
+    def [T](arr: IArray[T]) iterator: Iterator[T] =
       arr.asInstanceOf[Array[T]].iterator
 
-    def last: T =
+    def [T](arr: IArray[T]) last: T =
       arr.asInstanceOf[Array[T]].last
 
-    def lastOption: Option[T] =
+    def [T](arr: IArray[T]) lastOption: Option[T] =
       arr.asInstanceOf[Array[T]].lastOption
 
-    def lastIndexOf(elem: T, from: Int = 0): Int =
+    def [T](arr: IArray[T]) lastIndexOf(elem: T, from: Int = 0): Int =
       arr.asInstanceOf[Array[T]].lastIndexOf(elem, from)
 
-    def lastIndexWhere(p: T => Boolean, from: Int = 0): Int =
+    def [T](arr: IArray[T]) lastIndexWhere(p: T => Boolean, from: Int = 0): Int =
       arr.asInstanceOf[Array[T]].lastIndexWhere(p, from)
 
-    def map[U: ClassTag](f: T => U): IArray[U] =
+    def [T, U: ClassTag](arr: IArray[T]) map(f: T => U): IArray[U] =
       arr.asInstanceOf[Array[T]].map(f).asInstanceOf
 
-    def nonEmpty: Boolean =
+    def [T](arr: IArray[T]) nonEmpty: Boolean =
       arr.asInstanceOf[Array[T]].nonEmpty
 
-    def partition(p: T => Boolean): (IArray[T], IArray[T]) = arr.asInstanceOf[Array[T]].partition(p) match {
-      case (x, y) => (x.asInstanceOf[IArray[T]], y.asInstanceOf[IArray[T]])
-    }
+    def [T](arr: IArray[T]) partition(p: T => Boolean): (IArray[T], IArray[T]) =
+      arr.asInstanceOf[Array[T]].partition(p) match {
+        case (x, y) => (x.asInstanceOf[IArray[T]], y.asInstanceOf[IArray[T]])
+      }
 
-    def reverse: IArray[T] =
+    def [T](arr: IArray[T]) reverse: IArray[T] =
       arr.asInstanceOf[Array[T]].reverse.asInstanceOf
 
-    def scan[U >: T: ClassTag](z: U)(op: (U, U) => U): Array[U] =
+    def [T, U >: T: ClassTag](arr: IArray[T]) scan(z: U)(op: (U, U) => U): Array[U] =
       arr.asInstanceOf[Array[T]].scan(z)(op).asInstanceOf
 
-    def scanLeft[U: ClassTag](z: U)(op: (U, T) => U): Array[U] =
+    def [T, U: ClassTag](arr: IArray[T]) scanLeft(z: U)(op: (U, T) => U): Array[U] =
       arr.asInstanceOf[Array[T]].scanLeft(z)(op).asInstanceOf
 
-    def scanRight[U: ClassTag](z: U)(op: (T, U) => U): Array[U] =
+    def [T, U: ClassTag](arr: IArray[T]) scanRight(z: U)(op: (T, U) => U): Array[U] =
       arr.asInstanceOf[Array[T]].scanRight(z)(op).asInstanceOf
 
-    def size: Int =
+    def [T](arr: IArray[T]) size: Int =
       arr.asInstanceOf[Array[T]].size
 
-    def slice(from: Int, until: Int): Array[T] =
+    def [T](arr: IArray[T]) slice(from: Int, until: Int): Array[T] =
       arr.asInstanceOf[Array[T]].slice(from, until).asInstanceOf
 
-    def sortBy[U: ClassTag](f: T => U)(given math.Ordering[U]): IArray[T] =
+    def [T, U: ClassTag](arr: IArray[T]) sortBy(f: T => U)(given math.Ordering[U]): IArray[T] =
       arr.asInstanceOf[Array[T]].sortBy(f).asInstanceOf
 
-    def sortWith(f: (T, T) => Boolean): IArray[T] =
+    def [T](arr: IArray[T]) sortWith(f: (T, T) => Boolean): IArray[T] =
       arr.asInstanceOf[Array[T]].sortWith(f).asInstanceOf
 
-    def sorted(given math.Ordering[T]): IArray[T] =
+    def [T](arr: IArray[T]) sorted(given math.Ordering[T]): IArray[T] =
       arr.asInstanceOf[Array[T]].sorted.asInstanceOf
 
-    def span(p: T => Boolean): (IArray[T], IArray[T]) = arr.asInstanceOf[Array[T]].span(p) match {
-      case (x, y) => (x.asInstanceOf[IArray[T]], y.asInstanceOf[IArray[T]])
-    }
+    def [T](arr: IArray[T]) span(p: T => Boolean): (IArray[T], IArray[T]) =
+      arr.asInstanceOf[Array[T]].span(p) match {
+        case (x, y) => (x.asInstanceOf[IArray[T]], y.asInstanceOf[IArray[T]])
+      }
 
-    def splitAt(n: Int): (IArray[T], IArray[T]) = arr.asInstanceOf[Array[T]].splitAt(n) match {
-      case (x, y) => (x.asInstanceOf[IArray[T]], y.asInstanceOf[IArray[T]])
-    }
+    def [T](arr: IArray[T]) splitAt(n: Int): (IArray[T], IArray[T]) =
+      arr.asInstanceOf[Array[T]].splitAt(n) match {
+        case (x, y) => (x.asInstanceOf[IArray[T]], y.asInstanceOf[IArray[T]])
+      }
 
-    def startsWith[U >: T: ClassTag](that: IArray[U], offset: Int = 0): Boolean =
+    def [T, U >: T: ClassTag](arr: IArray[T]) startsWith(that: IArray[U], offset: Int = 0): Boolean =
       arr.asInstanceOf[Array[T]].startsWith(that.asInstanceOf[Array[U]])
 
-    def tail: IArray[T] =
+    def [T](arr: IArray[T]) tail: IArray[T] =
       arr.asInstanceOf[Array[T]].tail.asInstanceOf
 
-    def take(n: Int): IArray[T] =
+    def [T](arr: IArray[T]) take(n: Int): IArray[T] =
       arr.asInstanceOf[Array[T]].take(n).asInstanceOf
 
-    def takeRight(n: Int): IArray[T] =
+    def [T](arr: IArray[T]) takeRight(n: Int): IArray[T] =
       arr.asInstanceOf[Array[T]].takeRight(n).asInstanceOf
 
-    def takeWhile(p: T => Boolean): IArray[T] =
+    def [T](arr: IArray[T]) takeWhile(p: T => Boolean): IArray[T] =
       arr.asInstanceOf[Array[T]].takeWhile(p).asInstanceOf
 
-    def unzip[U: ClassTag, V: ClassTag](given T => (U, V)): (IArray[U], IArray[V]) =
-      arr.asInstanceOf[Array[T]].unzip(asPair, ct1, ct2) match {
+    def [T, U: ClassTag, V: ClassTag](arr: IArray[T]) unzip(given T => (U, V)): (IArray[U], IArray[V]) =
+      arr.asInstanceOf[Array[T]].unzip match {
         case (x, y) => (x.asInstanceOf[IArray[U]], y.asInstanceOf[IArray[V]])
       }
 
-    def zip[U: ClassTag](that: IterableOnce[U]): IArray[(T, U)] =
+    def [T, U: ClassTag](arr: IArray[T]) zip(that: IterableOnce[U]): IArray[(T, U)] =
       arr.asInstanceOf[Array[T]].zip(that).asInstanceOf
   }
 }