zio · adamgfraser · Aug 3, 2020 · Aug 3, 2020 · Aug 3, 2020
diff --git a/benchmarks/src/main/scala/zio/internal/BenchUtils.scala b/benchmarks/src/main/scala/zio/internal/BenchUtils.scala
@@ -1,7 +1,5 @@
 package zio.internal
 
-import zio.internal.impls._
-
 object BenchUtils {
   def queueByType[A](
     tpe: BenchQueueType,

diff --git a/...ala/zio/internal/impls/JCToolsQueue.scala → ...ain/scala/zio/internal/JCToolsQueue.scala b/...ala/zio/internal/impls/JCToolsQueue.scala → ...ain/scala/zio/internal/JCToolsQueue.scala
@@ -1,6 +1,4 @@
-package zio.internal.impls
-
-import zio.internal.MutableConcurrentQueue
+package zio.internal
 
 /**
  * JCToolsQueue is defined only under `benchmarks` so `coreJVM` doesn't

diff --git a/...zio/internal/impls/JucBlockingQueue.scala → ...scala/zio/internal/JucBlockingQueue.scala b/...zio/internal/impls/JucBlockingQueue.scala → ...scala/zio/internal/JucBlockingQueue.scala
@@ -1,9 +1,7 @@
-package zio.internal.impls
+package zio.internal
 
 import java.util.concurrent.LinkedBlockingQueue
 
-import zio.internal.MutableConcurrentQueue
-
 class JucBlockingQueue[A] extends MutableConcurrentQueue[A] {
   override val capacity: Int = Int.MaxValue
 

diff --git a/...o/internal/impls/NotThreadSafeQueue.scala → ...ala/zio/internal/NotThreadSafeQueue.scala b/...o/internal/impls/NotThreadSafeQueue.scala → ...ala/zio/internal/NotThreadSafeQueue.scala
@@ -1,6 +1,4 @@
-package zio.internal.impls
-
-import zio.internal.MutableConcurrentQueue
+package zio.internal
 
 class NotThreadSafeQueue[A](override val capacity: Int) extends MutableConcurrentQueue[A] {
   private val buf: Array[AnyRef] = Array.ofDim[AnyRef](capacity)

diff --git a/...l/impls/OneElementConcQueueNoMetric.scala → ...nternal/OneElementConcQueueNoMetric.scala b/...l/impls/OneElementConcQueueNoMetric.scala → ...nternal/OneElementConcQueueNoMetric.scala
@@ -1,9 +1,7 @@
-package zio.internal.impls
+package zio.internal
 
 import java.util.concurrent.atomic.AtomicReference
 
-import zio.internal.MutableConcurrentQueue
-
 class OneElementConcQueueNoMetric[A] extends MutableConcurrentQueue[A] {
   private[this] final val ref = new AtomicReference[AnyRef]()
 

diff --git a/benchmarks/src/main/scala/zio/internal/OneElementQueueSeqBenchmark.scala b/benchmarks/src/main/scala/zio/internal/OneElementQueueSeqBenchmark.scala
@@ -4,8 +4,6 @@ import java.util.concurrent.TimeUnit
 
 import org.openjdk.jmh.annotations._
 
-import zio.internal.impls._
-
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
 @BenchmarkMode(Array(Mode.AverageTime))
 @Warmup(iterations = 10, time = 1, timeUnit = TimeUnit.SECONDS)

diff --git a/benchmarks/src/main/scala/zio/internal/RingBufferMethodDispatchBenchmark.scala b/benchmarks/src/main/scala/zio/internal/RingBufferMethodDispatchBenchmark.scala
@@ -34,9 +34,9 @@ private[this] class RingBufferMethodDispatchBenchmark {
 
   @Setup(Level.Trial)
   def createQ(): Unit = {
-    q1 = impls.RingBufferPow2[QueueElement](qCapacity)
-    q2 = impls.RingBufferArb[QueueElement](qCapacity)
-    q3 = new impls.LinkedQueue[QueueElement]
+    q1 = RingBufferPow2[QueueElement](qCapacity)
+    q2 = RingBufferArb[QueueElement](qCapacity)
+    q3 = new LinkedQueue[QueueElement]
   }
 
   @Benchmark

diff --git a/core-tests/jvm/src/test/scala/zio/internal/OneElementConcurrentQueueConcurrencyTests.scala b/core-tests/jvm/src/test/scala/zio/internal/OneElementConcurrentQueueConcurrencyTests.scala
@@ -3,8 +3,6 @@ package zio.internal
 import org.openjdk.jcstress.annotations._
 import org.openjdk.jcstress.infra.results.{ IIII_Result, II_Result, I_Result }
 
-import zio.internal.impls.OneElementConcurrentQueue
-
 object OneElementConcurrentQueueConcurrencyTests {
   /*
    * Tests that offer writes are atomic (simple case, doesn't consider

diff --git a/core-tests/jvm/src/test/scala/zio/internal/RingBufferArbConcurrencyTests.scala b/core-tests/jvm/src/test/scala/zio/internal/RingBufferArbConcurrencyTests.scala
@@ -3,8 +3,6 @@ package zio.internal
 import org.openjdk.jcstress.annotations._
 import org.openjdk.jcstress.infra.results.{ IIIIII_Result, IIII_Result, II_Result }
 
-import zio.internal.impls.RingBufferArb
-
 object RingBufferArbConcurrencyTests {
   /*
    * Tests that [[RingBufferArb.offer]] is atomic.

diff --git a/core-tests/jvm/src/test/scala/zio/internal/RingBufferPow2ConcurrencyTests.scala b/core-tests/jvm/src/test/scala/zio/internal/RingBufferPow2ConcurrencyTests.scala
@@ -3,8 +3,6 @@ package zio.internal
 import org.openjdk.jcstress.annotations._
 import org.openjdk.jcstress.infra.results.{ IIIIII_Result, IIII_Result, II_Result }
 
-import zio.internal.impls.RingBufferPow2
-
 object RingBufferPow2ConcurrencyTests {
   /*
    * Tests that [[RingBufferPow2.offer]] is atomic.

diff --git a/...nal/impls/OneElementConcurrentQueue.scala → .../internal/OneElementConcurrentQueue.scala b/...nal/impls/OneElementConcurrentQueue.scala → .../internal/OneElementConcurrentQueue.scala
@@ -14,14 +14,11 @@
  * limitations under the License.
  */
 
-package zio.internal.impls
+package zio.internal
 
 import java.io.Serializable
-
 import java.util.concurrent.atomic.{ AtomicBoolean, AtomicLong, AtomicReference }
 
-import zio.internal.MutableConcurrentQueue
-
 final class OneElementConcurrentQueue[A] extends MutableConcurrentQueue[A] with Serializable {
   private[this] val ref = new AtomicReference[AnyRef]()
 

diff --git a/...scala/zio/internal/impls/RingBuffer.scala → .../main/scala/zio/internal/RingBuffer.scala b/...scala/zio/internal/impls/RingBuffer.scala → .../main/scala/zio/internal/RingBuffer.scala
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-package zio.internal.impls
-
-import zio.internal.MutableConcurrentQueue
+package zio.internal
 
 object RingBuffer {
 
@@ -31,7 +29,7 @@ object RingBuffer {
 }
 
 /**
- * See [[zio.internal.impls.RingBuffer]] for details
+ * See [[zio.internal.RingBuffer]] for details
  * on design, tradeoffs, etc.
  */
 final class RingBuffer[A](override final val capacity: Int) extends MutableConcurrentQueue[A] {

diff --git a/...ls/padding/MutableQueueFieldsPadding.java → ...o/internal/MutableQueueFieldsPadding.java b/...ls/padding/MutableQueueFieldsPadding.java → ...o/internal/MutableQueueFieldsPadding.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package zio.internal.impls.padding;
+package zio.internal;
 
 import java.io.Serializable;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;

diff --git a/core/jvm/src/main/scala/zio/internal/DefaultExecutors.scala b/core/jvm/src/main/scala/zio/internal/DefaultExecutors.scala
@@ -62,7 +62,5 @@ private[internal] abstract class DefaultExecutors {
         } catch {
           case _: RejectedExecutionException => false
         }
-
-      def here = false
     }
 }
diff --git a/...nal/impls/OneElementConcurrentQueue.scala → .../internal/OneElementConcurrentQueue.scala b/...nal/impls/OneElementConcurrentQueue.scala → .../internal/OneElementConcurrentQueue.scala
@@ -14,13 +14,11 @@
  * limitations under the License.
  */
 
-package zio.internal.impls
+package zio.internal
 
 import java.io.Serializable
 import java.util.concurrent.atomic.{ AtomicReference, LongAdder }
 
-import zio.internal.MutableConcurrentQueue
-
 /**
  * This is a specialized implementation of MutableConcurrentQueue of
  * capacity 1. Since capacity 1 queues are by default used under the
@@ -32,7 +30,7 @@ import zio.internal.MutableConcurrentQueue
  * Allocating an object takes only 24 bytes + 8+ bytes in long adder (so 32+ bytes total),
  * which is 15x less than the smallest RingBuffer.
  *
- * zio.internal.impls.OneElementConcurrentQueue object internals:
+ * zio.internal.OneElementConcurrentQueue object internals:
  *  OFFSET  SIZE                                          TYPE DESCRIPTION
  *       0     4                                               (object header)
  *       4     4                                               (object header)

diff --git a/...scala/zio/internal/impls/RingBuffer.scala → .../main/scala/zio/internal/RingBuffer.scala b/...scala/zio/internal/impls/RingBuffer.scala → .../main/scala/zio/internal/RingBuffer.scala
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package zio.internal.impls
+package zio.internal
 
 import java.util.concurrent.atomic.AtomicLongArray
 
-import zio.internal.impls.padding.MutableQueueFieldsPadding
-import zio.internal.impls.padding.MutableQueueFieldsPadding.{ headUpdater, tailUpdater }
+import zio.internal.MutableQueueFieldsPadding.{ headUpdater, tailUpdater }
 
 object RingBuffer {
 
@@ -125,7 +124,7 @@ object RingBuffer {
  * to do this except `Unsafe` is to use `AtomicLongFieldUpdater`,
  * which is exactly what we have here.
  *
- * @see [[zio.internal.impls.padding.MutableQueueFieldsPadding]] for more details on padding
+ * @see [[zio.internal.MutableQueueFieldsPadding]] for more details on padding
  * and object's memory layout.
  *
  * The design is heavily inspired by such libraries as

diff --git a/...la/zio/internal/impls/RingBufferArb.scala → ...in/scala/zio/internal/RingBufferArb.scala b/...la/zio/internal/impls/RingBufferArb.scala → ...in/scala/zio/internal/RingBufferArb.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package zio.internal.impls
+package zio.internal
 
 final class RingBufferArb[A] private (capacity: Int) extends RingBuffer[A](capacity) {
   protected def posToIdx(pos: Long, capacity: Int): Int = (pos % capacity.toLong).toInt

diff --git a/...a/zio/internal/impls/RingBufferPow2.scala → ...n/scala/zio/internal/RingBufferPow2.scala b/...a/zio/internal/impls/RingBufferPow2.scala → ...n/scala/zio/internal/RingBufferPow2.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package zio.internal.impls
+package zio.internal
 
 final class RingBufferPow2[A](val requestedCapacity: Int)
     extends RingBuffer[A](RingBuffer.nextPow2(requestedCapacity)) {

diff --git a/...nal/impls/OneElementConcurrentQueue.scala → .../internal/OneElementConcurrentQueue.scala b/...nal/impls/OneElementConcurrentQueue.scala → .../internal/OneElementConcurrentQueue.scala
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package zio.internal.impls
+package zio.internal
 
 import java.io.Serializable
-import java.util.concurrent.atomic.{ AtomicBoolean, AtomicLong, AtomicReference }
 
-import zio.internal.MutableConcurrentQueue
+import java.util.concurrent.atomic.{ AtomicBoolean, AtomicLong, AtomicReference }
 
 final class OneElementConcurrentQueue[A] extends MutableConcurrentQueue[A] with Serializable {
   private[this] val ref = new AtomicReference[AnyRef]()

diff --git a/...scala/zio/internal/impls/RingBuffer.scala → .../main/scala/zio/internal/RingBuffer.scala b/...scala/zio/internal/impls/RingBuffer.scala → .../main/scala/zio/internal/RingBuffer.scala
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-package zio.internal.impls
-
-import zio.internal.MutableConcurrentQueue
+package zio.internal
 
 object RingBuffer {
 
@@ -31,7 +29,7 @@ object RingBuffer {
 }
 
 /**
- * See [[zio.internal.impls.RingBuffer]] for details
+ * See [[zio.internal.RingBuffer]] for details
  * on design, tradeoffs, etc.
  */
 final class RingBuffer[A](override final val capacity: Int) extends MutableConcurrentQueue[A] {

diff --git a/core/shared/src/main/scala/zio/Fiber.scala b/core/shared/src/main/scala/zio/Fiber.scala
@@ -444,29 +444,52 @@ object Fiber extends FiberPlatformSpecific {
     abstract class Internal[+E, +A] extends Synthetic[E, A]
   }
 
-  /**
-   * A record containing information about a [[Fiber]].
-   *
-   * @param id            The fiber's unique identifier
-   * @param interrupters  The set of fibers attempting to interrupt the fiber or its ancestors.
-   * @param executor      The [[zio.internal.Executor]] executing this fiber
-   * @param children      The fiber's forked children.
-   */
-  final case class Descriptor(
-    id: Fiber.Id,
-    status: Status,
-    interrupters: Set[Fiber.Id],
-    interruptStatus: InterruptStatus,
-    executor: Executor,
-    scope: ZScope[Exit[Any, Any]]
-  )
-
-  final case class Dump(
-    fiberId: Fiber.Id,
-    fiberName: Option[String],
-    status: Status,
-    trace: Option[ZTrace]
-  ) extends Serializable {
+  sealed abstract class Descriptor {
+    def id: Fiber.Id
+    def status: Status
+    def interrupters: Set[Fiber.Id]
+    def interruptStatus: InterruptStatus
+    def executor: Executor
+    def scope: ZScope[Exit[Any, Any]]
+  }
+
+  object Descriptor {
+
+    /**
+     * A record containing information about a [[Fiber]].
+     *
+     * @param id            The fiber's unique identifier
+     * @param interrupters  The set of fibers attempting to interrupt the fiber or its ancestors.
+     * @param executor      The [[zio.internal.Executor]] executing this fiber
+     * @param children      The fiber's forked children.
+     */
+    def apply(
+      id0: Fiber.Id,
+      status0: Status,
+      interrupters0: Set[Fiber.Id],
+      interruptStatus0: InterruptStatus,
+      executor0: Executor,
+      scope0: ZScope[Exit[Any, Any]]
+    ): Descriptor =
+      new Descriptor {
+        def id: Fiber.Id                     = id0
+        def status: Status                   = status0
+        def interrupters: Set[Fiber.Id]      = interrupters0
+        def interruptStatus: InterruptStatus = interruptStatus0
+        def executor: Executor               = executor0
+        def scope: ZScope[Exit[Any, Any]]    = scope0
+      }
+  }
+
+  sealed abstract class Dump extends Serializable { self =>
+
+    def fiberId: Fiber.Id
+
+    def fiberName: Option[String]
+
+    def status: Status
+
+    def trace: Option[ZTrace]
 
     /**
      * {{{
@@ -478,7 +501,24 @@ object Fiber extends FiberPlatformSpecific {
      *     at ...
      * }}}
      */
-    def prettyPrintM: UIO[String] = FiberRenderer.prettyPrintM(this)
+    def prettyPrintM: UIO[String] =
+      FiberRenderer.prettyPrintM(self)
+  }
+
+  object Dump {
+    def apply(
+      fiberId0: Fiber.Id,
+      fiberName0: Option[String],
+      status0: Status,
+      trace0: Option[ZTrace]
+    ): Dump =
+      new Dump {
+        def fiberId: Fiber.Id         = fiberId0
+        def fiberName: Option[String] = fiberName0
+        def status: Status            = status0
+        def trace: Option[ZTrace]     = trace0
+      }
+
   }
 
   /**

diff --git a/core/shared/src/main/scala/zio/ZManaged.scala b/core/shared/src/main/scala/zio/ZManaged.scala
@@ -43,7 +43,7 @@ final case class Reservation[-R, +E, +A](acquire: ZIO[R, E, A], release: Exit[An
  * has been consumed, the resource will not be valid anymore and may fail with
  * some checked error, as per the type of the functions provided by the resource.
  */
-abstract class ZManaged[-R, +E, +A] extends Serializable { self =>
+sealed abstract class ZManaged[-R, +E, +A] extends Serializable { self =>
 
   /**
    * The ZIO value that underlies this ZManaged value. To evaluate it, a ReleaseMap is

diff --git a/core/shared/src/main/scala/zio/ZQueue.scala b/core/shared/src/main/scala/zio/ZQueue.scala
@@ -30,7 +30,7 @@ import zio.internal.MutableConcurrentQueue
  * type `EA`. The dequeueing operations may utilize an environment of type `RB` and may fail
  * with errors of type `EB`.
  */
-abstract class ZQueue[-RA, -RB, +EA, +EB, -A, +B] extends Serializable { self =>
+sealed abstract class ZQueue[-RA, -RB, +EA, +EB, -A, +B] extends Serializable { self =>
 
   /**
    * Waits until the queue is shutdown.
@@ -653,7 +653,7 @@ object ZQueue {
    *
    * @note when possible use only power of 2 capacities; this will
    * provide better performance by utilising an optimised version of
-   * the underlying [[zio.internal.impls.RingBuffer]].
+   * the underlying [[zio.internal.RingBuffer]].
    *
    * @param requestedCapacity capacity of the `Queue`
    * @tparam A type of the `Queue`
@@ -668,7 +668,7 @@ object ZQueue {
    *
    * @note when possible use only power of 2 capacities; this will
    * provide better performance by utilising an optimised version of
-   * the underlying [[zio.internal.impls.RingBuffer]].
+   * the underlying [[zio.internal.RingBuffer]].
    *
    * @param requestedCapacity capacity of the `Queue`
    * @tparam A type of the `Queue`
@@ -684,7 +684,7 @@ object ZQueue {
    *
    * @note when possible use only power of 2 capacities; this will
    * provide better performance by utilising an optimised version of
-   * the underlying [[zio.internal.impls.RingBuffer]].
+   * the underlying [[zio.internal.RingBuffer]].
    *
    * @param requestedCapacity capacity of the `Queue`
    * @tparam A type of the `Queue`