From cbc8948f5108f28dd3ab796fbfadeaad3666f650 Mon Sep 17 00:00:00 2001 From: Ruslan Shevchenko Date: Sun, 26 May 2024 21:19:38 +0300 Subject: [PATCH] use & instead with as type operator --- shared/src/main/scala/cps/AsyncShift.scala | 4 ++-- shared/src/main/scala/cps/runtime/MapAsyncShift.scala | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/shared/src/main/scala/cps/AsyncShift.scala b/shared/src/main/scala/cps/AsyncShift.scala index 1cab99bfe..8ccbd542d 100644 --- a/shared/src/main/scala/cps/AsyncShift.scala +++ b/shared/src/main/scala/cps/AsyncShift.scala @@ -81,7 +81,7 @@ trait AsyncShiftLowPriority2 extends AsyncShiftLowPriority1 { import cps.runtime.* - transparent inline given shiftedMapOps[K, V, CC[K, V] <: MapOps[K, V, CC, CC[K, V]] with Iterable[(K, V)]]: MapOpsAsyncShift[K, V, CC, Iterable, CC[K, V]] = + transparent inline given shiftedMapOps[K, V, CC[K, V] <: MapOps[K, V, CC, CC[K, V]] & Iterable[(K, V)]]: MapOpsAsyncShift[K, V, CC, Iterable, CC[K, V]] = MapOpsAsyncShift[K, V, CC, Iterable, CC[K, V]]() @@ -111,7 +111,7 @@ object AsyncShift extends AsyncShiftLowPriority2 { - transparent inline given shiftedImmutableMapOps[K,V,CC[K,V] <: MapOps[K,V,CC,CC[K,V]] with immutable.Iterable[(K,V)]]: MapOpsAsyncShift[K,V,CC,immutable.Iterable,CC[K,V]] = + transparent inline given shiftedImmutableMapOps[K,V,CC[K,V] <: MapOps[K,V,CC,CC[K,V]] & immutable.Iterable[(K,V)]]: MapOpsAsyncShift[K,V,CC,immutable.Iterable,CC[K,V]] = MapOpsAsyncShift[K,V,CC,immutable.Iterable,CC[K,V]]() //transparent inline given shiftedList[A]: AsyncShift[scala.collection.immutable.List[A]] = diff --git a/shared/src/main/scala/cps/runtime/MapAsyncShift.scala b/shared/src/main/scala/cps/runtime/MapAsyncShift.scala index bc10a2695..f334f6cfd 100644 --- a/shared/src/main/scala/cps/runtime/MapAsyncShift.scala +++ b/shared/src/main/scala/cps/runtime/MapAsyncShift.scala @@ -3,9 +3,9 @@ package cps.runtime import cps._ import scala.collection._ -class MapOpsAsyncShift[K,V, CC[KX,VX] <: MapOps[KX,VX,CC,CC[KX,VX]] with CI[(KX,VX)], +class MapOpsAsyncShift[K,V, CC[KX,VX] <: MapOps[KX,VX,CC,CC[KX,VX]] & CI[(KX,VX)], CI[X] <: Iterable[X] & IterableOps[X,CI,CI[X]], - CKV <: CC[K,V] with PartialFunction[K,V] ] extends + CKV <: CC[K,V] & PartialFunction[K,V] ] extends IterableOpsAsyncShift[(K,V),CI,CKV] with PartialFunctionAsyncShiftBase[K,V, CKV] with AsyncShift[CKV]: