Fixes zio#845

jdegoes · May 19, 2019 · 71c2628 · 71c2628
1 parent f53c0cc
commit 71c2628
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/core/js/src/main/scala/scalaz/zio/scheduler/SchedulerLive.scala b/core/js/src/main/scala/scalaz/zio/scheduler/SchedulerLive.scala
@@ -22,8 +22,8 @@ import scalaz.zio.internal.{ Scheduler => IScheduler }
 
 import scala.scalajs.js
 
-trait SchedulerLive extends Scheduler {
-  private[this] val scheduler0 = new IScheduler {
+private[scheduler] object internal {
+  private[scheduler] val GlobalScheduler = new IScheduler {
     import IScheduler.CancelToken
 
     private[this] val ConstFalse = () => false
@@ -65,9 +65,11 @@ trait SchedulerLive extends Scheduler {
      */
     override def shutdown(): Unit = ()
   }
+}
 
+trait SchedulerLive extends Scheduler {
   val scheduler: Scheduler.Service[Any] = new Scheduler.Service[Any] {
-    val scheduler = ZIO.succeed(scheduler0)
+    val scheduler = ZIO.succeed(internal.GlobalScheduler)
   }
 }
 object SchedulerLive extends SchedulerLive
diff --git a/core/jvm/src/main/scala/scalaz/zio/scheduler/SchedulerLive.scala b/core/jvm/src/main/scala/scalaz/zio/scheduler/SchedulerLive.scala
@@ -23,8 +23,8 @@ import scalaz.zio.internal.{ NamedThreadFactory, Scheduler => IScheduler }
 import java.util.concurrent._
 import java.util.concurrent.atomic.AtomicInteger
 
-trait SchedulerLive extends Scheduler {
-  private[this] val scheduler0 = new IScheduler {
+private[scheduler] object internal {
+  private[scheduler] val GlobalScheduler = new IScheduler {
     import IScheduler.CancelToken
 
     val service = Executors.newScheduledThreadPool(1, new NamedThreadFactory("zio-timer", true))
@@ -63,9 +63,11 @@ trait SchedulerLive extends Scheduler {
 
     override def shutdown(): Unit = service.shutdown()
   }
+}
 
+trait SchedulerLive extends Scheduler {
   val scheduler: Scheduler.Service[Any] = new Scheduler.Service[Any] {
-    val scheduler = ZIO.succeed(scheduler0)
+    val scheduler = ZIO.succeed(internal.GlobalScheduler)
   }
 }
 object SchedulerLive extends SchedulerLive
diff --git a/core/shared/src/main/scala/scalaz/zio/clock/Clock.scala b/core/shared/src/main/scala/scalaz/zio/clock/Clock.scala
@@ -19,10 +19,10 @@ package scalaz.zio.clock
 import java.util.concurrent.TimeUnit
 
 import scalaz.zio.duration.Duration
-import scalaz.zio.scheduler.{ Scheduler, SchedulerLive }
+import scalaz.zio.scheduler.SchedulerLive
 import scalaz.zio.{ IO, UIO, ZIO }
 
-trait Clock extends Scheduler with Serializable {
+trait Clock extends Serializable {
   val clock: Clock.Service[Any]
 }