Fix deprecated with type operator from Scala 3.4.0

src/main/scala/eu/sim642/adventofcode2021/Day12.scala

@@ -15,7 +15,7 @@ object Day12 {
   sealed trait Part {
     type Node <: PathNode
 
-    def caveTraversal(caveMap: CaveMap): GraphTraversal[Node] with UnitNeighbors[Node]
+    def caveTraversal(caveMap: CaveMap): GraphTraversal[Node] & UnitNeighbors[Node]
 
     def countPaths(caveMap: CaveMap): Int = {
       val pathNodes = BFS.traverse(caveTraversal(caveMap)).nodes
@@ -27,7 +27,7 @@ object Day12 {
 
     override case class Node(path: List[Cave]) extends PathNode
 
-    override def caveTraversal(caveMap: CaveMap): GraphTraversal[Node] with UnitNeighbors[Node] = new GraphTraversal[Node] with UnitNeighbors[Node] {
+    override def caveTraversal(caveMap: CaveMap): GraphTraversal[Node] & UnitNeighbors[Node] = new GraphTraversal[Node] with UnitNeighbors[Node] {
       override val startNode: Node = Node(List("start"))
 
       override def unitNeighbors(node: Node): IterableOnce[Node] = {
@@ -43,7 +43,7 @@ object Day12 {
 
     override case class Node(path: List[Cave])(val canDuplicateSmall: Boolean) extends PathNode
 
-    override def caveTraversal(caveMap: CaveMap): GraphTraversal[Node] with UnitNeighbors[Node] = new GraphTraversal[Node] with UnitNeighbors[Node] {
+    override def caveTraversal(caveMap: CaveMap): GraphTraversal[Node] & UnitNeighbors[Node] = new GraphTraversal[Node] with UnitNeighbors[Node] {
       override val startNode: Node = Node(List("start"))(true)
 
       override def unitNeighbors(node: Node): IterableOnce[Node] = {

src/main/scala/eu/sim642/adventofcode2023/Day10.scala

@@ -17,7 +17,7 @@ object Day10 {
     'S' -> Pos.axisOffsets.toSet,
   )
 
-  def loopTraversal(grid: Grid[Char]): GraphTraversal[Pos] with UnitNeighbors[Pos] = {
+  def loopTraversal(grid: Grid[Char]): GraphTraversal[Pos] & UnitNeighbors[Pos] = {
     new GraphTraversal[Pos] with UnitNeighbors[Pos] {
       override val startNode: Pos = grid.posOf('S')
 

src/main/scala/eu/sim642/adventofcode2023/Day21.scala

@@ -10,7 +10,7 @@ import scala.math.Integral.Implicits.*
 
 object Day21 {
 
-  def gardenSearch(startPos: Pos, grid: Pos => Boolean, maxDist: Int): GraphSearch[Pos] with UnitNeighbors[Pos] = {
+  def gardenSearch(startPos: Pos, grid: Pos => Boolean, maxDist: Int): GraphSearch[Pos] & UnitNeighbors[Pos] = {
     new GraphSearch[Pos] with UnitNeighbors[Pos] {
       override val startNode: Pos = startPos
 

src/main/scala/eu/sim642/adventofcodelib/cycle/BrentCycleFinder.scala

@@ -4,7 +4,7 @@ object BrentCycleFinder
   extends FunctionCycleFinder
     with FunctionCycleByFinder {
 
-  override def find[A](x0: A, f: A => A): Cycle[A] with Indexing[A] = {
+  override def find[A](x0: A, f: A => A): Cycle[A] & Indexing[A] = {
     // https://en.wikipedia.org/wiki/Cycle_detection#Brent's_algorithm
     var power = 1
     var λ = 1

src/main/scala/eu/sim642/adventofcodelib/cycle/FloydCycleFinder.scala

@@ -4,7 +4,7 @@ object FloydCycleFinder
   extends FunctionCycleFinder
     with FunctionCycleByFinder {
 
-  override def find[A](x0: A, f: A => A): Cycle[A] with Indexing[A] = {
+  override def find[A](x0: A, f: A => A): Cycle[A] & Indexing[A] = {
     // https://en.wikipedia.org/wiki/Cycle_detection#Floyd's_Tortoise_and_Hare
     var tortoise = f(x0)
     var hare = f(f(x0))

src/main/scala/eu/sim642/adventofcodelib/cycle/NaiveCycleFinder.scala

@@ -26,7 +26,7 @@ object NaiveCycleFinder
       })
   }
 
-  override def find[A](x0: A, f: A => A): Cycle[A] with Indexing[A] = {
+  override def find[A](x0: A, f: A => A): Cycle[A] & Indexing[A] = {
     val cycle = find(Iterator.iterate(x0)(f)).get
     FunctionCycle(
       stemLength = cycle.stemLength,

src/main/scala/eu/sim642/adventofcodelib/cycle/NaiverCycleFinder.scala

@@ -6,7 +6,7 @@ object NaiverCycleFinder
   extends IterableOnceCycleFinder
     with FunctionCycleFinder {
 
-  override def find[A](coll: IterableOnce[A]): Option[Cycle[A] with Indexing[A]] = {
+  override def find[A](coll: IterableOnce[A]): Option[Cycle[A] & Indexing[A]] = {
     val prevs = mutable.Map[A, Int]()
     val values = Vector.newBuilder[A]
 
@@ -21,7 +21,7 @@ object NaiverCycleFinder
       })
   }
 
-  override def find[A](x0: A, f: A => A): Cycle[A] with Indexing[A] = {
+  override def find[A](x0: A, f: A => A): Cycle[A] & Indexing[A] = {
     find(Iterator.iterate(x0)(f)).get
   }
 }

src/main/scala/eu/sim642/adventofcodelib/graph/AStar.scala

@@ -4,7 +4,7 @@ import scala.collection.mutable
 
 object AStar {
   // moved from 2018 Day 22
-  def search[A](graphSearch: GraphSearch[A] with Heuristic[A]): Distances[A] with Target[A] = {
+  def search[A](graphSearch: GraphSearch[A] & Heuristic[A]): Distances[A] & Target[A] = {
     val visitedDistance: mutable.Map[A, Int] = mutable.Map.empty
     val toVisit: mutable.PriorityQueue[(Int, Int, A)] = mutable.PriorityQueue.empty(Ordering.by(-_._1))
 

src/main/scala/eu/sim642/adventofcodelib/graph/BFS.scala

@@ -7,7 +7,7 @@ object BFS {
   // TODO: reduce duplication without impacting performance
 
   // copied from Dijkstra
-  def traverse[A](graphTraversal: GraphTraversal[A] with UnitNeighbors[A]): Distances[A] = {
+  def traverse[A](graphTraversal: GraphTraversal[A] & UnitNeighbors[A]): Distances[A] = {
     val visitedDistance: mutable.Map[A, Int] = mutable.Map.empty
     val toVisit: mutable.Queue[(Int, A)] = mutable.Queue.empty
 
@@ -39,7 +39,7 @@ object BFS {
   }
 
   // copied from Dijkstra
-  def search[A](graphSearch: GraphSearch[A] with UnitNeighbors[A]): Distances[A] with Target[A] = {
+  def search[A](graphSearch: GraphSearch[A] & UnitNeighbors[A]): Distances[A] & Target[A] = {
     val visitedDistance: mutable.Map[A, Int] = mutable.Map.empty
     val toVisit: mutable.Queue[(Int, A)] = mutable.Queue.empty
 
@@ -82,7 +82,7 @@ object BFS {
   }
 
   // copied from search
-  def searchPaths[A](graphSearch: GraphSearch[A] with UnitNeighbors[A]): Distances[A] with Paths[A] with Target[A] = {
+  def searchPaths[A](graphSearch: GraphSearch[A] & UnitNeighbors[A]): Distances[A] & Paths[A] & Target[A] = {
     val visitedDistance: mutable.Map[A, Int] = mutable.Map.empty
     val prevNode: mutable.Map[A, A] = mutable.Map.empty
     val toVisit: mutable.Queue[(Int, Option[A], A)] = mutable.Queue.empty

src/main/scala/eu/sim642/adventofcodelib/graph/DFS.scala

@@ -6,7 +6,7 @@ object DFS {
   // TODO: reduce duplication without impacting performance
 
   // copied from BFS
-  def traverse[A](graphTraversal: GraphTraversal[A] with UnitNeighbors[A]): Distances[A] with Order[A] = {
+  def traverse[A](graphTraversal: GraphTraversal[A] & UnitNeighbors[A]): Distances[A] & Order[A] = {
     val visitedDistance: mutable.Map[A, Int] = mutable.Map.empty
     val visitedOrder: mutable.Buffer[A] = mutable.Buffer.empty
     val toVisit: mutable.Stack[(Int, A)] = mutable.Stack.empty

src/main/scala/eu/sim642/adventofcodelib/graph/Dijkstra.scala

@@ -38,7 +38,7 @@ object Dijkstra {
   }
 
   // copied from AStar
-  def search[A](graphSearch: GraphSearch[A]): Distances[A] with Target[A] = {
+  def search[A](graphSearch: GraphSearch[A]): Distances[A] & Target[A] = {
     val visitedDistance: mutable.Map[A, Int] = mutable.Map.empty
     val toVisit: mutable.PriorityQueue[(Int, A)] = mutable.PriorityQueue.empty(Ordering.by(-_._1))
 

src/main/scala/eu/sim642/adventofcodelib/graph/SimultaneousBFS.scala

@@ -10,7 +10,7 @@ object SimultaneousBFS {
   // TODO: reduce duplication without impacting performance
 
   // moved from 2018 Day 20
-  def traverse[A](graphTraversal: GraphTraversal[A] with UnitNeighbors[A]): Distances[A] = {
+  def traverse[A](graphTraversal: GraphTraversal[A] & UnitNeighbors[A]): Distances[A] = {
 
     @tailrec
     def helper(visited: Map[A, Int], toVisit: Map[A, Int]): Distances[A] = {
@@ -34,10 +34,10 @@ object SimultaneousBFS {
   }
 
   // moved from 2018 Day 20
-  def search[A](graphSearch: GraphSearch[A] with UnitNeighbors[A]): Distances[A] with Target[A] = {
+  def search[A](graphSearch: GraphSearch[A] & UnitNeighbors[A]): Distances[A] & Target[A] = {
 
     @tailrec
-    def helper(visited: Map[A, Int], toVisit: Map[A, Int]): Distances[A] with Target[A] = {
+    def helper(visited: Map[A, Int], toVisit: Map[A, Int]): Distances[A] & Target[A] = {
       // TODO: use one dist: Int argument instead of all same toVisit values
       val newVisited = visited ++ toVisit
       toVisit.find(graphSearch.isTargetNode.tupled) match {

src/test/scala/eu/sim642/adventofcode2019/Day22Test.scala

@@ -85,6 +85,6 @@ object Day22Test {
   }
 
   class LinearSolutionTest extends Part1SolutionTest with Part2SolutionTest {
-    override val solution: Part1Solution with Part2Solution = LinearSolution
+    override val solution: Part1Solution & Part2Solution = LinearSolution
   }
 }