Hylolib: Drop usages of with in givens

Author: odersky

tests/pos/hylolib/AnyCollection.scala

@@ -42,12 +42,12 @@ object AnyCollection {
 
 }
 
-given [T: Value] => AnyCollection[T] is Collection with {
+given [T: Value] => AnyCollection[T] is Collection:
 
   type Element = T
   type Position = AnyValue
 
-  extension (self: AnyCollection[T]) {
+  extension (self: AnyCollection[T])
 
     def startPosition =
       self._start()
@@ -61,6 +61,3 @@ given [T: Value] => AnyCollection[T] is Collection with {
     def at(p: Position) =
       self._at(p)
 
-  }
-
-}

tests/pos/hylolib/BitArray.scala

@@ -318,9 +318,9 @@ object BitArray {
 
 }
 
-given BitArray.Position is Value with {
+given BitArray.Position is Value:
 
-  extension (self: BitArray.Position) {
+  extension (self: BitArray.Position)
 
     def copy(): BitArray.Position =
       self.copy()
@@ -331,16 +331,12 @@ given BitArray.Position is Value with {
     def hashInto(hasher: Hasher): Hasher =
       self.hashInto(hasher)
 
-  }
-
-}
-
-given BitArray is Collection with {
+given BitArray is Collection:
 
   type Element = Boolean
   type Position = BitArray.Position
 
-  extension (self: BitArray) {
+  extension (self: BitArray)
 
     override def count: Int =
       self.count
@@ -357,16 +353,10 @@ given BitArray is Collection with {
     def at(p: BitArray.Position): Boolean =
       self.at(p)
 
-  }
-
-}
-
-given bitArrayIsStringConvertible: StringConvertible[BitArray] with {
-
+given BitArray is StringConvertible:
   extension (self: BitArray)
     override def description: String =
       var contents = mutable.StringBuilder()
       self.forEach((e) => { contents += (if e then '1' else '0'); true })
       contents.mkString
 
-}

tests/pos/hylolib/HyArray.scala

@@ -57,15 +57,13 @@ final class HyArray[Element: Value as elementIsCValue](
     result
 
   // NOTE: Can't refine `C.Element` without renaming the generic parameter of `HyArray`.
-  // /** Adds the contents of `source` at the end of the array. */
-  // def appendContents[C](using
-  //     s: Collection[C]
-  // )(
-  //     source: C { type Element = Element },
-  //     assumeUniqueness: Boolean = false
-  // ): HyArray[Element] =
-  //   val result = if (assumeUniqueness) { this } else { copy(count + source.count) }
-  //   source.reduce(result, (r, e) => r.append(e, assumeUniqueness = true))
+  /** Adds the contents of `source` at the end of the array. */
+  def appendContents[C: Collection { type Element = HyArray.this.Element }](
+      source: C, assumeUniqueness: Boolean = false
+  ): HyArray[Element] =
+    val result = if (assumeUniqueness) { this } else { copy(count + source.count) }
+    source.reduce(result): (r, e) =>
+      r.append(e, assumeUniqueness = true)
 
   /** Removes and returns the last element, or returns `None` if the array is empty. */
   def popLast(assumeUniqueness: Boolean = false): (HyArray[Element], Option[Element]) =
@@ -161,9 +159,9 @@ object HyArray {
 
 }
 
-given [T: Value] => HyArray[T] is Value with {
+given [T: Value] => HyArray[T] is Value:
 
-  extension (self: HyArray[T]) {
+  extension (self: HyArray[T])
 
     def copy(): HyArray[T] =
       self.copy()
@@ -174,16 +172,12 @@ given [T: Value] => HyArray[T] is Value with {
     def hashInto(hasher: Hasher): Hasher =
       self.reduce(hasher)((h, e) => e.hashInto(h))
 
-  }
-
-}
-
-given [T: Value] => HyArray[T] is Collection with {
+given [T: Value] => HyArray[T] is Collection:
 
   type Element = T
   type Position = Int
 
-  extension (self: HyArray[T]) {
+  extension (self: HyArray[T])
 
     // NOTE: Having to explicitly override means that primary declaration can't automatically
     // specialize trait requirements.
@@ -199,22 +193,11 @@ given [T: Value] => HyArray[T] is Collection with {
 
     def at(p: Int) = self.at(p)
 
-  }
-
-}
-
-// NOTE: This should work.
-// given hyArrayIsStringConvertible[T](using
-//     tIsValue: Value[T],
-//     tIsStringConvertible: StringConvertible[T]
-// ): StringConvertible[HyArray[T]] with {
-//
-//   given Collection[HyArray[T]] = hyArrayIsCollection[T]
-//
-//   extension (self: HyArray[T])
-//     override def description: String =
-//       var contents = mutable.StringBuilder()
-//       self.forEach((e) => { contents ++= e.description; true })
-//       s"[${contents.mkString(", ")}]"
-//
-// }
+given [T: {Value, StringConvertible}] => HyArray[T] is StringConvertible:
+  extension (self: HyArray[T])
+    override def description: String =
+      val contents = mutable.StringBuilder()
+      self.forEach: e =>
+        contents ++= e.description
+        true
+      s"[${contents.mkString(", ")}]"

tests/pos/hylolib/Integers.scala

@@ -1,8 +1,8 @@
 package hylo
 
-given Boolean is Value with {
+given Boolean is Value:
 
-  extension (self: Boolean) {
+  extension (self: Boolean)
 
     def copy(): Boolean =
       // Note: Scala's `Boolean` has value semantics already.
@@ -14,13 +14,9 @@ given Boolean is Value with {
     def hashInto(hasher: Hasher): Hasher =
       hasher.combine(if self then 1 else 0)
 
-  }
+given Int is Value:
 
-}
-
-given Int is Value with {
-
-  extension (self: Int) {
+  extension (self: Int)
 
     def copy(): Int =
       // Note: Scala's `Int` has value semantics already.
@@ -32,13 +28,9 @@ given Int is Value with {
     def hashInto(hasher: Hasher): Hasher =
       hasher.combine(self)
 
-  }
-
-}
+given Int is Comparable:
 
-given Int is Comparable with {
-
-  extension (self: Int) {
+  extension (self: Int)
 
     def copy(): Int =
       self
@@ -51,8 +43,4 @@ given Int is Comparable with {
 
     def lt(other: Int): Boolean = self < other
 
-  }
-
-}
-
-given intIsStringConvertible: StringConvertible[Int] with {}
+given Int is StringConvertible {}

tests/pos/hylolib/Slice.scala

@@ -1,35 +1,35 @@
 package hylo
 
 /** A view into a collection. */
-final class Slice[Base: Collection as b](
-    val base: Base,
-    val bounds: Range[b.Position]
+final class Slice[Base: Collection](
+  tracked val base: Base,
+  tracked val bounds: Range[Base.Position]
 ) {
 
   /** Returns `true` iff `this` is empty. */
   def isEmpty: Boolean =
     bounds.lowerBound.eq(bounds.upperBound)
 
-  def startPosition: b.Position =
+  def startPosition: Base.Position =
     bounds.lowerBound
 
-  def endPosition: b.Position =
+  def endPosition: Base.Position =
     bounds.upperBound
 
-  def positionAfter(p: b.Position): b.Position =
+  def positionAfter(p: Base.Position): Base.Position =
     base.positionAfter(p)
 
-  def at(p: b.Position): b.Element =
+  def at(p: Base.Position): Base.Element =
     base.at(p)
 
 }
 
-given [T: Collection as c] => Slice[T] is Collection with {
+given [T: Collection as c] => Slice[T] is Collection:
 
   type Element = c.Element
   type Position = c.Position
 
-  extension (self: Slice[T]) {
+  extension (self: Slice[T])
 
     def startPosition = self.bounds.lowerBound.asInstanceOf[Position] // NOTE: Ugly hack
 
@@ -38,7 +38,3 @@ given [T: Collection as c] => Slice[T] is Collection with {
     def positionAfter(p: Position) = self.base.positionAfter(p)
 
     def at(p: Position) = self.base.at(p)
-
-  }
-
-}

tests/pos/hylolib/StringConvertible.scala

@@ -1,14 +1,9 @@
 package hylo
 
 /** A type whose instances can be described by a character string. */
-trait StringConvertible[Self] {
+trait StringConvertible:
+  type Self
 
-  extension (self: Self) {
-
-    /** Returns a textual description of `self`. */
-    def description: String =
-      self.toString
-
-  }
-
-}
+  /** Returns a textual description of `self`. */
+  extension (self: Self)
+    def description: String = self.toString