fix 3.5.0 warnings

rssh · Sep 7, 2024 · f08dac1 · f08dac1
1 parent 55a6875
commit f08dac1
Show file tree

Hide file tree

Showing 15 changed files with 94 additions and 91 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,4 +1,4 @@
-val dottyVersion = "3.3.3"
+val dottyVersion = "3.5.0"
 
 import scala.scalanative.build._
 
@@ -12,7 +12,7 @@ ThisBuild/resolvers ++= Opts.resolver.sonatypeOssSnapshots
 val sharedSettings = Seq(
     organization := "com.github.rssh",
     scalaVersion := dottyVersion,
-    name := "dotty-cps-async-for34"
+    name := "dotty-cps-async"
 )
 
 
@@ -44,7 +44,7 @@ lazy val cps = crossProject(JSPlatform, JVMPlatform, NativePlatform)
         scalacOptions ++= Seq( //"-Yexplicit-nulls",
                             "-unchecked", "-Ydebug-trace", "-Ydebug-names", "-Xprint-types",
                             "-Ydebug", "-uniqid", "-Xcheck-macros", "-Ycheck:macro", "-Yprint-syms",
-                            "-Ysafe-init",
+                            "-Wsafe-init",
                              ),
                              // -explain
                              // -Ydebug-error

diff --git a/js/src/main/scala/cps/stream/AsyncList.scala b/js/src/main/scala/cps/stream/AsyncList.scala
@@ -74,8 +74,7 @@ sealed trait AsyncList[F[_]:CpsConcurrentMonad, +T]:
   def takeAll[CC[_]](n:Int)(using Factory[T,CC[T]@uncheckedVariance]):F[CC[T]@uncheckedVariance] =
      take[CC](-1)
 
-  //@infix
-  def merge[S >: T](other: AsyncList[F,S]): AsyncList[F,S]
+  infix def merge[S >: T](other: AsyncList[F,S]): AsyncList[F,S]
 
   /**
    * alias for merge
@@ -146,7 +145,7 @@ object AsyncList {
           else
                summon[CpsMonad[F]].flatMap(fs)(_.takeTo(buffer,n))      
 
-     def merge[S >: T](other: AsyncList[F,S]): AsyncList[F,S] =
+     infix def merge[S >: T](other: AsyncList[F,S]): AsyncList[F,S] =
           other match
                case Wait(fs1) =>
                     val fs1cast = fs1.asInstanceOf[F[AsyncList[F,S]]]
@@ -268,7 +267,7 @@ object AsyncList {
             }
             next.takeTo(buffer, nRest)
 
-     def merge[S >: T](other: AsyncList[F,S]): AsyncList[F,S] =
+     infix def merge[S >: T](other: AsyncList[F,S]): AsyncList[F,S] =
           Cons(head, ()=>other.merge(tailFun()))
 
      def skip(n:Int): AsyncList[F,T] = 
@@ -315,7 +314,7 @@ object AsyncList {
      def takeTo[B <: Growable[Nothing]](buffer: B, n: Int):F[B] =
           summon[CpsMonad[F]].pure(buffer)
 
-     def merge[S](other: AsyncList[F,S]): AsyncList[F,S] =
+     infix def merge[S](other: AsyncList[F,S]): AsyncList[F,S] =
           other
 
      def skip(n:Int): AsyncList[F,Nothing] = this

diff --git a/jvm/src/main/scala/cps/stream/AsyncList.scala b/jvm/src/main/scala/cps/stream/AsyncList.scala
@@ -74,17 +74,15 @@ sealed trait AsyncList[F[_]:CpsConcurrentMonad, +T]:
   def takeAll[CC[_]](n:Int)(using Factory[T,CC[T]@uncheckedVariance]):F[CC[T]@uncheckedVariance] =
      take[CC](-1)
 
-  //@infix
-  def merge[S >: T](other: AsyncList[F,S]): AsyncList[F,S]
+  infix def merge[S >: T](other: AsyncList[F,S]): AsyncList[F,S]
 
   /**
    * alias for merge
    * @param other
    * @tparam S
    * @return
    */
-  //@infix
-  def ><[S >: T](other: AsyncList[F,S]): AsyncList[F,S] = merge(other)
+  infix def ><[S >: T](other: AsyncList[F,S]): AsyncList[F,S] = merge(other)
 
   def skip(n:Int): AsyncList[F,T]
 
@@ -146,7 +144,7 @@ object AsyncList {
           else
                summon[CpsMonad[F]].flatMap(fs)(_.takeTo(buffer,n))      
 
-     def merge[S >: T](other: AsyncList[F,S]): AsyncList[F,S] =
+     infix def merge[S >: T](other: AsyncList[F,S]): AsyncList[F,S] =
           other match
                case Wait(fs1) =>
                     val fs1cast = fs1.asInstanceOf[F[AsyncList[F,S]]]
@@ -270,7 +268,7 @@ object AsyncList {
             }
             next.takeTo(buffer, nRest)
 
-     def merge[S >: T](other: AsyncList[F,S]): AsyncList[F,S] =
+     infix def merge[S >: T](other: AsyncList[F,S]): AsyncList[F,S] =
           Cons(head, ()=>other.merge(tailFun()))
 
      def skip(n:Int): AsyncList[F,T] = 
@@ -317,7 +315,7 @@ object AsyncList {
      def takeTo[B <: Growable[Nothing]](buffer: B, n: Int):F[B] =
           summon[CpsMonad[F]].pure(buffer)
 
-     def merge[S](other: AsyncList[F,S]): AsyncList[F,S] =
+     infix def merge[S](other: AsyncList[F,S]): AsyncList[F,S] =
           other
 
      def skip(n:Int): AsyncList[F,Nothing] = this

diff --git a/jvm/src/test/scala/cps/ComputationBound.scala b/jvm/src/test/scala/cps/ComputationBound.scala
@@ -111,12 +111,12 @@ object ComputationBound {
              externalAsyncNotifier.notify()
           }
         } )
-        Wait(ref, fromTry[A] _ )
+        Wait(ref, fromTry[A] )
    }
 
    def spawn[A](op: =>ComputationBound[A]):ComputationBound[A] = {
         val ref = new AtomicReference[Option[Try[A]]](None)
-        val waiter = Wait[A,A](ref, fromTry[A] _ )
+        val waiter = Wait[A,A](ref, fromTry[A] )
         deferredQueue.add(Deferred(ref, Some(Thunk( () => op )) ))
         waiter
    }
@@ -442,10 +442,10 @@ case class Wait[R,T](ref: AtomicReference[Option[Try[R]]], op: Try[R] => Computa
 
 
   override def flatMap[S](f: T => ComputationBound[S]): ComputationBound[S] =
-        Wait(ref, x => op(x) flatMap f)
+        Wait(ref, x => op(x) `flatMap` f)
 
   override def flatMapTry[S](f: Try[T] => ComputationBound[S]): ComputationBound[S] =
-          Wait(ref, x => ComputationBound.tryOp(op(x)) flatMapTry f)
+          Wait(ref, x => ComputationBound.tryOp(op(x)) `flatMapTry` f)
 
 
   override def map[S](f: T=>S): ComputationBound[S] =