Merge pull request #462 from catostrophe/zio-fix-withrun

Fix instances for layered ZIO

Author: Odomontois

build.sbt

@@ -400,5 +400,5 @@ lazy val publishSettings = Seq(
   )
 )
 
-addCommandAlias("fmt", "all scalafmtSbt scalafmt test:scalafmt")
-addCommandAlias("checkfmt", "all scalafmtSbtCheck scalafmtCheck test:scalafmtCheck")
+addCommandAlias("fmt", "all tofu/scalafmtSbt tofu/scalafmtAll")
+addCommandAlias("checkfmt", "all tofu/scalafmtSbtCheck tofu/scalafmtCheckAll")

zio/core/src/main/scala/tofu/zioInstances/ZioInstances.scala

@@ -61,7 +61,7 @@ private[zioInstances] class ZioInstances {
   final def zioTofuWithRunInstance[R, E]: ZioTofuWithRunInstance[R, E] =
     zioTofuWithRunInstanceAny.asInstanceOf[ZioTofuWithRunInstance[R, E]]
 
-  final def zioTofuUnliftHasInstance[R <: Has[_], E, C: Tag]: ZioTofuUnliftHasInstance[R, E, C] =
+  final def zioTofuUnliftHasInstance[R <: Has[_], E, C: Tag]: ZioTofuUnliftHasInstance[R, R with Has[C], E, C] =
     new ZioTofuUnliftHasInstance
 
   /**  a shortcut for simplifying WithLocal instance definition,

zio/core/src/main/scala/tofu/zioInstances/ZioTofuInstance.scala

@@ -140,19 +140,21 @@ class RioTofuUnsafeExecFutureInstance[R] extends UnsafeExecFuture[RIO[R, *]] {
   def unlift: RIO[R, RIO[R, *] ~> Future] = RIO.runtime[R].map(r => funK(r.unsafeRunToFuture(_)))
 }
 
-final class ZioTofuUnliftHasInstance[R <: Has[_], E, C: Tag]
-    extends WithRun[ZIO[R with Has[C], E, *], ZIO[R, E, *], C] {
-  override def functor: Functor[ZIO[R with Has[C], E, *]] = zio.interop.catz.monadErrorInstance
+final class ZioTofuUnliftHasInstance[R <: Has[_], R1 <: Has[_], E, C: Tag](implicit
+    ev1: R1 <:< R with Has[C],
+    ev2: R with Has[C] <:< R1
+) extends WithRun[ZIO[R1, E, *], ZIO[R, E, *], C] {
+  override def functor: Functor[ZIO[R1, E, *]] = zio.interop.catz.monadErrorInstance
 
-  override def runContext[A](fa: ZIO[R with Has[C], E, A])(ctx: C): ZIO[R, E, A] =
+  override def runContext[A](fa: ZIO[R1, E, A])(ctx: C): ZIO[R, E, A] =
     fa.provideSome((_: R) add ctx)
 
-  override def context: ZIO[R with Has[C], E, C] = ZIO.access(_.get[C])
+  override def context: ZIO[R1, E, C] = ZIO.access(_.get[C])
 
-  override def local[A](fa: ZIO[R with Has[C], E, A])(project: C => C): ZIO[R with Has[C], E, A] =
+  override def local[A](fa: ZIO[R1, E, A])(project: C => C): ZIO[R1, E, A] =
     fa.provideSome(r => r add project(r.get[C]))
 
-  override def lift[A](fa: ZIO[R, E, A]): ZIO[R with Has[C], E, A] = fa
+  override def lift[A](fa: ZIO[R, E, A]): ZIO[R1, E, A] = fa.provideSome(ev1)
 }
 
 class ZioTofuBlockingInstance[R <: Blocking, E] extends BlockExec[ZIO[R, E, *]] {

zio/core/src/main/scala/tofu/zioInstances/implicits.scala

@@ -47,6 +47,9 @@ private[zioInstances] trait ZioTofuImplicits2 extends ZioTofuImplicits3 {
 }
 
 private[zioInstances] trait ZioTofuImplicits3 {
-  @inline final implicit def zioTofuUnliftHasImplicit[R <: Has[_], E, C: Tag]: ZioTofuUnliftHasInstance[R, E, C] =
-    zioTofuUnliftHasInstance
+  @inline final implicit def zioTofuUnliftHasImplicit[R <: Has[_], R1 <: Has[_], E, C: Tag](implicit
+      ev1: R1 <:< R with Has[C],
+      ev2: R with Has[C] <:< R1
+  ): ZioTofuUnliftHasInstance[R, R1, E, C] =
+    new ZioTofuUnliftHasInstance
 }

zio/core/src/test/scala/tofu/zioInstances/ZioInstancesSuite.scala

@@ -6,6 +6,8 @@ import tofu.zioInstances.implicits._
 import tofu._
 import zio._
 
+import scala.annotation.nowarn
+
 object ZioInstancesSuite {
 
   def summonZioInstances[E1, E2: * Extract E1, R1, R2: * Contains R1](): Unit = {
@@ -40,6 +42,17 @@ object ZioInstancesSuite {
     ()
   }
 
+  @nowarn("cat=unused-locals")
+  def summonZioInstances[E, Ctx: Tag](): Unit = {
+    type ZContext = Has[Ctx]
+
+    implicitly[WithRun[ZIO[ZEnv with ZContext, E, *], ZIO[ZEnv, E, *], Ctx]]
+    implicitly[WithRun[ZIO[ZContext with ZEnv, E, *], ZIO[ZEnv, E, *], Ctx]]
+    implicitly[WithLocal[ZIO[ZEnv with ZContext, E, *], Ctx]]
+    implicitly[WithLocal[ZIO[ZContext with ZEnv, E, *], Ctx]]
+    ()
+  }
+
   def taskAmbiguity: Any = {
     import cats.effect.Sync
     import tofu.Raise