effect 2.4.19 → 3.0.0

package/src/internal/stream.ts

@@ -31,7 +31,7 @@ import * as HaltStrategy from "../StreamHaltStrategy.js"
 import type * as Take from "../Take.js"
 import type * as Tracer from "../Tracer.js"
 import * as Tuple from "../Tuple.js"
-import type { MergeRecord, NoInfer } from "../Types.js"
+import type { MergeRecord } from "../Types.js"
 import * as channel from "./channel.js"
 import * as channelExecutor from "./channel/channelExecutor.js"
 import * as MergeStrategy from "./channel/mergeStrategy.js"
@@ -103,7 +103,7 @@ export const accumulateChunks = <A, E, R>(self: Stream.Stream<A, E, R>): Stream.
         )
       },
       onFailure: core.fail,
-      onDone: () => core.unit
+      onDone: () => core.void
     })
   return new StreamImpl(core.pipeTo(toChannel(self), accumulator(Chunk.empty())))
 }
@@ -235,7 +235,7 @@ export const aggregateWithinEither = dual<
                       core.fromEffect(Ref.set(consumed, true)),
                       channel.zipRight(core.write(signal.elements)),
                       channel.zipRight(core.fromEffect(Ref.get(endAfterEmit))),
-                      core.flatMap((bool) => bool ? core.unit : handoffConsumer)
+                      core.flatMap((bool) => bool ? core.void : handoffConsumer)
                     )
                   }
                   case HandoffSignal.OP_HALT: {
@@ -341,7 +341,7 @@ export const aggregateWithinEither = dual<
                         Effect.map((wasConsumed) =>
                           wasConsumed ?
                             core.write(Chunk.of<Either.Either<B, C>>(Either.right(b))) :
-                            core.unit
+                            core.void
                         ),
                         channel.unwrap
                       )
@@ -478,7 +478,7 @@ export const _async = <A, E = never, R = never>(
             const canceler = register(emit.make<R, E, A, void>((resume) =>
               InternalTake.fromPull(resume).pipe(
                 Effect.flatMap((take) => Queue.offer(output, take)),
-                Effect.asUnit,
+                Effect.asVoid,
                 runPromiseExit
               ).then((exit) => {
                 if (Exit.isFailure(exit)) {
@@ -498,7 +498,7 @@ export const _async = <A, E = never, R = never>(
               onFailure: (maybeError) =>
                 core.fromEffect(Queue.shutdown(output)).pipe(
                   channel.zipRight(Option.match(maybeError, {
-                    onNone: () => core.unit,
+                    onNone: () => core.void,
                     onSome: (error) => core.fail(error)
                   }))
                 ),
@@ -506,7 +506,7 @@ export const _async = <A, E = never, R = never>(
             }),
             channel.unwrap
           )
-          return fromChannel(loop).pipe(ensuring(value ?? Effect.unit))
+          return fromChannel(loop).pipe(ensuring(value ?? Effect.void))
         })
       )
     ),
@@ -533,7 +533,7 @@ export const asyncEffect = <A, E = never, R = never>(
                 pipe(
                   InternalTake.fromPull(k),
                   Effect.flatMap((take) => Queue.offer(output, take)),
-                  Effect.asUnit,
+                  Effect.asVoid,
                   Runtime.runPromiseExit(runtime)
                 ).then((exit) => {
                   if (Exit.isFailure(exit)) {
@@ -552,7 +552,7 @@ export const asyncEffect = <A, E = never, R = never>(
                   onFailure: (maybeError) =>
                     pipe(
                       core.fromEffect(Queue.shutdown(output)),
-                      channel.zipRight(Option.match(maybeError, { onNone: () => core.unit, onSome: core.fail }))
+                      channel.zipRight(Option.match(maybeError, { onNone: () => core.void, onSome: core.fail }))
                     ),
                   onSuccess: (chunk) => pipe(core.write(chunk), core.flatMap(() => loop))
                 }),
@@ -588,7 +588,7 @@ export const asyncScoped = <A, E = never, R = never>(
                 pipe(
                   InternalTake.fromPull(k),
                   Effect.flatMap((take) => Queue.offer(output, take)),
-                  Effect.asUnit,
+                  Effect.asVoid,
                   Runtime.runPromiseExit(runtime)
                 ).then((exit) => {
                   if (Exit.isFailure(exit)) {
@@ -814,7 +814,7 @@ export const buffer = dual<
             onFailure: (cause) =>
               pipe(
                 Cause.flipCauseOption(cause),
-                Option.match({ onNone: () => core.unit, onSome: core.failCause })
+                Option.match({ onNone: () => core.void, onSome: core.failCause })
               ),
             onSuccess: (value) => core.flatMap(core.write(Chunk.of(value)), () => process)
           }))
@@ -851,7 +851,7 @@ export const bufferChunks = dual<
         const process: Channel.Channel<Chunk.Chunk<A>, unknown, E, unknown, void, unknown> = pipe(
           core.fromEffect(Queue.take(queue)),
           core.flatMap(InternalTake.match({
-            onEnd: () => core.unit,
+            onEnd: () => core.void,
             onFailure: core.failCause,
             onSuccess: (value) => pipe(core.write(value), core.flatMap(() => process))
           }))
@@ -914,7 +914,7 @@ const bufferUnbounded = <A, E, R>(self: Stream.Stream<A, E, R>): Stream.Stream<A
         const process: Channel.Channel<Chunk.Chunk<A>, unknown, E, unknown, void, unknown> = pipe(
           core.fromEffect(Queue.take(queue)),
           core.flatMap(InternalTake.match({
-            onEnd: () => core.unit,
+            onEnd: () => core.void,
             onFailure: core.failCause,
             onSuccess: (value) => core.flatMap(core.write(value), () => process)
           }))
@@ -945,7 +945,7 @@ const bufferSignal = <A, E, R>(
             Effect.zipRight(Deferred.await(deferred))
           )
         ),
-        Effect.asUnit,
+        Effect.asVoid,
         core.fromEffect
       )
     return core.readWithCause({
@@ -959,7 +959,7 @@ const bufferSignal = <A, E, R>(
                 Effect.flatMap((added) => pipe(Ref.set(ref, deferred), Effect.when(() => added)))
               )
           ),
-          Effect.asUnit,
+          Effect.asVoid,
           core.fromEffect,
           core.flatMap(() => producer(queue, ref))
         ),
@@ -976,7 +976,7 @@ const bufferSignal = <A, E, R>(
         channel.zipRight(
           core.fromEffect(Deferred.succeed(deferred, void 0)),
           InternalTake.match(take, {
-            onEnd: () => core.unit,
+            onEnd: () => core.void,
             onFailure: core.failCause,
             onSuccess: (value) => pipe(core.write(value), core.flatMap(() => process))
           })
@@ -1202,7 +1202,7 @@ export const changesWith = dual<
         )
       },
       onFailure: core.failCause,
-      onDone: () => core.unit
+      onDone: () => core.void
     })
   return new StreamImpl(pipe(toChannel(self), core.pipeTo(writer(Option.none()))))
 })
@@ -1256,7 +1256,7 @@ export const changesWithEffect = dual<
             )
           ),
         onFailure: core.failCause,
-        onDone: () => core.unit
+        onDone: () => core.void
       })
     return new StreamImpl(pipe(toChannel(self), core.pipeTo(writer(Option.none()))))
   }
@@ -1661,7 +1661,7 @@ export const debounce = dual<
                           return core.failCause(signal.cause)
                         }
                         case HandoffSignal.OP_END: {
-                          return core.unit
+                          return core.void
                         }
                       }
                     }),
@@ -1693,7 +1693,7 @@ export const debounce = dual<
                               case HandoffSignal.OP_END: {
                                 return pipe(
                                   Fiber.join(previous),
-                                  Effect.map((chunk) => pipe(core.write(chunk), channel.zipRight(core.unit)))
+                                  Effect.map((chunk) => pipe(core.write(chunk), channel.zipRight(core.void)))
                                 )
                               }
                             }
@@ -1714,7 +1714,7 @@ export const debounce = dual<
                           return core.failCause(signal.cause)
                         }
                         case HandoffSignal.OP_END: {
-                          return core.unit
+                          return core.void
                         }
                       }
                     }),
@@ -1882,7 +1882,7 @@ export const distributedWithDynamic = dual<
   Effect.Effect<[number, Queue.Dequeue<Exit.Exit<A, Option.Option<E>>>]>,
   never,
   Scope.Scope | R
-> => distributedWithDynamicCallback(self, options.maximumLag, options.decide, () => Effect.unit))
+> => distributedWithDynamicCallback(self, options.maximumLag, options.decide, () => Effect.void))
 
 /** @internal */
 export const distributedWithDynamicCallback = dual<
@@ -1961,13 +1961,13 @@ export const distributedWithDynamicCallback = dual<
                           })
                         )
                       }
-                      return Effect.unit
+                      return Effect.void
                     })
                   )
                 )
               )
             ),
-            Effect.asUnit
+            Effect.asVoid
           )
         const queuesLock = yield* $(Effect.makeSemaphore(1))
         const newQueue = yield* $(
@@ -2013,7 +2013,7 @@ export const distributedWithDynamicCallback = dual<
                         pipe(
                           Queue.offer(queue, endTake),
                           Effect.catchSomeCause((cause) =>
-                            Cause.isInterrupted(cause) ? Option.some(Effect.unit) : Option.none()
+                            Cause.isInterrupted(cause) ? Option.some(Effect.void) : Option.none()
                           )
                         )
                       )
@@ -2022,7 +2022,7 @@ export const distributedWithDynamicCallback = dual<
                 )
               ),
               Effect.zipRight(done(endTake)),
-              Effect.asUnit
+              Effect.asVoid
             )
           )
         yield* $(
@@ -2067,7 +2067,7 @@ export const drainFork = dual<
           scoped(
             pipe(
               that,
-              runForEachScoped(() => Effect.unit),
+              runForEachScoped(() => Effect.void),
               Effect.catchAllCause((cause) => Deferred.failCause(backgroundDied, cause)),
               Effect.forkScoped
             )
@@ -2098,7 +2098,7 @@ export const drop = dual<
         )
       },
       onFailure: core.fail,
-      onDone: () => core.unit
+      onDone: () => core.void
     })
   return new StreamImpl(pipe(toChannel(self), channel.pipeToOrFail(loop(n))))
 })
@@ -2126,7 +2126,7 @@ export const dropRight = dual<
         return pipe(core.write(outputs), core.flatMap(() => reader))
       },
       onFailure: core.fail,
-      onDone: () => core.unit
+      onDone: () => core.void
     })
     return new StreamImpl(pipe(toChannel(self), channel.pipeToOrFail(reader)))
   })
@@ -2175,7 +2175,7 @@ export const dropUntilEffect = dual<
           channel.unwrap
         ),
       onFailure: core.fail,
-      onDone: () => core.unit
+      onDone: () => core.void
     })
     return new StreamImpl(pipe(toChannel(self), channel.pipeToOrFail(loop)))
   }
@@ -2236,7 +2236,7 @@ export const dropWhileEffect = dual<
           channel.unwrap
         ),
       onFailure: core.fail,
-      onDone: () => core.unit
+      onDone: () => core.void
     })
     return new StreamImpl(channel.pipeToOrFail(
       toChannel(self),
@@ -2470,7 +2470,7 @@ export const filterMapWhileEffect = dual<
         } else {
           return channel.unwrap(
             Option.match(pf(next.value), {
-              onNone: () => Effect.succeed(core.unit),
+              onNone: () => Effect.succeed(core.void),
               onSome: Effect.map(
                 (a2) => core.flatMap(core.write(Chunk.of(a2)), () => loop(iterator))
               )
@@ -2484,7 +2484,7 @@ export const filterMapWhileEffect = dual<
 
 /** @internal */
 export const finalizer = <R, X>(finalizer: Effect.Effect<X, never, R>): Stream.Stream<void, never, R> =>
-  acquireRelease(Effect.unit, () => finalizer)
+  acquireRelease(Effect.void, () => finalizer)
 
 /** @internal */
 export const find: {
@@ -2502,7 +2502,7 @@ export const find: {
         onSome: (n) => core.write(Chunk.of(n))
       }),
     onFailure: core.fail,
-    onDone: () => core.unit
+    onDone: () => core.void
   })
   return new StreamImpl(pipe(toChannel(self), core.pipeTo(loop)))
 })
@@ -2533,7 +2533,7 @@ export const findEffect: {
           channel.unwrap
         ),
       onFailure: core.fail,
-      onDone: () => core.unit
+      onDone: () => core.void
     })
     return new StreamImpl(pipe(toChannel(self), core.pipeTo(loop)))
   }
@@ -2590,7 +2590,7 @@ export const flatMap = dual<
                 as,
                 Chunk.map((a) => toChannel(f(a))),
                 Chunk.reduce(
-                  core.unit as Channel.Channel<Chunk.Chunk<A2>, unknown, E2, unknown, unknown, unknown, R2>,
+                  core.void as Channel.Channel<Chunk.Chunk<A2>, unknown, E2, unknown, unknown, unknown, R2>,
                   (left, right) => pipe(left, channel.zipRight(right))
                 )
               )
@@ -2684,7 +2684,7 @@ export const flattenChunks = <A, E, R>(self: Stream.Stream<Chunk.Chunk<A>, E, R>
           () => flatten
         ),
       onFailure: core.failCause,
-      onDone: () => core.unit
+      onDone: () => core.void
     })
   return new StreamImpl(pipe(toChannel(self), core.pipeTo(flatten)))
 }
@@ -2742,10 +2742,10 @@ export const flattenExitOption = <A, E2, E, R>(
         onSome: Exit.match({
           onFailure: (cause) =>
             Option.match(Cause.flipCauseOption(cause), {
-              onNone: () => core.unit,
+              onNone: () => core.void,
               onSome: core.failCause
             }),
-          onSuccess: () => core.unit
+          onSuccess: () => core.void
         })
       })
     )
@@ -2772,7 +2772,7 @@ export const flattenExitOption = <A, E2, E, R>(
   > = core.readWithCause({
     onInput: (chunk: Chunk.Chunk<Exit.Exit<A, Option.Option<E2>>>) => processChunk(chunk, process),
     onFailure: (cause) => core.failCause<E | E2>(cause),
-    onDone: () => core.unit
+    onDone: () => core.void
   })
   return new StreamImpl(pipe(toChannel(self), core.pipeTo(process)))
 }
@@ -2797,7 +2797,7 @@ export const fromAsyncIterable = <A, E>(
   pipe(
     Effect.acquireRelease(
       Effect.sync(() => iterable[Symbol.asyncIterator]()),
-      (iterator) => iterator.return ? Effect.promise(async () => iterator.return!()) : Effect.unit
+      (iterator) => iterator.return ? Effect.promise(async () => iterator.return!()) : Effect.void
     ),
     Effect.map((iterator) =>
       repeatEffectOption(pipe(
@@ -2831,7 +2831,7 @@ export const toChannel = <A, E, R>(
 
 /** @internal */
 export const fromChunk = <A>(chunk: Chunk.Chunk<A>): Stream.Stream<A> =>
-  new StreamImpl(Chunk.isEmpty(chunk) ? core.unit : core.write(chunk))
+  new StreamImpl(Chunk.isEmpty(chunk) ? core.void : core.write(chunk))
 
 /** @internal */
 export const fromChunkPubSub: {
@@ -2887,7 +2887,7 @@ export const fromEffectOption = <A, E, R>(effect: Effect.Effect<A, Option.Option
     channel.unwrap(
       Effect.match(effect, {
         onFailure: Option.match({
-          onNone: () => core.unit,
+          onNone: () => core.void,
           onSome: core.fail
         }),
         onSuccess: (a) => core.write(Chunk.of(a))
@@ -2954,7 +2954,7 @@ export const fromIteratorSucceed = <A>(
             let next: IteratorResult<A, any> = iterator.next()
             if (maxChunkSize === 1) {
               if (next.done) {
-                return core.unit
+                return core.void
               }
               return pipe(
                 core.write(Chunk.of(next.value)),
@@ -2977,7 +2977,7 @@ export const fromIteratorSucceed = <A>(
                 core.flatMap(() => loop(iterator))
               )
             }
-            return core.unit
+            return core.void
           }),
           channel.unwrap
         )
@@ -3249,11 +3249,11 @@ export const haltWhen = dual<
             core.readWith({
               onInput: (input: Chunk.Chunk<A>) => core.flatMap(core.write(input), () => writer(fiber)),
               onFailure: core.fail,
-              onDone: () => core.unit
+              onDone: () => core.void
             }),
           onSome: Exit.match({
             onFailure: core.failCause,
-            onSuccess: () => core.unit
+            onSuccess: () => core.void
           })
         })),
         channel.unwrap
@@ -3292,12 +3292,12 @@ export const haltWhenDeferred = dual<
           core.readWith({
             onInput: (input: Chunk.Chunk<A>) => pipe(core.write(input), core.flatMap(() => writer)),
             onFailure: core.fail,
-            onDone: () => core.unit
+            onDone: () => core.void
           }),
         onSome: (effect) =>
           channel.unwrap(Effect.match(effect, {
             onFailure: core.fail,
-            onSuccess: () => core.unit
+            onSuccess: () => core.void
           }))
       })),
       channel.unwrap
@@ -3404,7 +3404,7 @@ export const interleaveWith = dual<
                     return pipe(
                       core.fromEffect(Handoff.take(left)),
                       core.flatMap(InternalTake.match({
-                        onEnd: () => rightDone ? core.unit : process(true, rightDone),
+                        onEnd: () => rightDone ? core.void : process(true, rightDone),
                         onFailure: core.failCause,
                         onSuccess: (chunk) => pipe(core.write(chunk), core.flatMap(() => process(leftDone, rightDone)))
                       }))
@@ -3414,7 +3414,7 @@ export const interleaveWith = dual<
                     return pipe(
                       core.fromEffect(Handoff.take(right)),
                       core.flatMap(InternalTake.match({
-                        onEnd: () => leftDone ? core.unit : process(leftDone, true),
+                        onEnd: () => leftDone ? core.void : process(leftDone, true),
                         onFailure: core.failCause,
                         onSuccess: (chunk) => pipe(core.write(chunk), core.flatMap(() => process(leftDone, rightDone)))
                       }))
@@ -3423,7 +3423,7 @@ export const interleaveWith = dual<
                   return process(leftDone, rightDone)
                 },
                 onFailure: core.failCause,
-                onDone: () => core.unit
+                onDone: () => core.void
               })
             return pipe(
               toChannel(decider),
@@ -3469,7 +3469,7 @@ export const intersperse = dual<
                 )
               },
               onFailure: core.failCause,
-              onDone: () => core.unit
+              onDone: () => core.void
             })
           return writer(true)
         })
@@ -3589,7 +3589,7 @@ export const mapAccum = dual<
           )
         },
         onFailure: core.fail,
-        onDone: () => core.unit
+        onDone: () => core.void
       })
     return new StreamImpl(pipe(toChannel(self), core.pipeTo(accumulator(s))))
   }
@@ -3647,7 +3647,7 @@ export const mapAccumEffect = dual<
               channel.unwrap
             ),
           onFailure: core.fail,
-          onDone: () => core.unit
+          onDone: () => core.void
         })
       return new StreamImpl(pipe(toChannel(self), channel.pipeToOrFail(accumulator(s))))
     })
@@ -4041,7 +4041,7 @@ export const onDone = dual<
     cleanup: () => Effect.Effect<X, never, R2>
   ): Stream.Stream<A, E, R | R2> =>
     new StreamImpl<A, E, R | R2>(
-      pipe(toChannel(self), core.ensuringWith((exit) => Exit.isSuccess(exit) ? cleanup() : Effect.unit))
+      pipe(toChannel(self), core.ensuringWith((exit) => Exit.isSuccess(exit) ? cleanup() : Effect.void))
     )
 )
 
@@ -4184,7 +4184,7 @@ export const paginateChunk = <S, A>(
   const loop = (s: S): Channel.Channel<Chunk.Chunk<A>, unknown, never, unknown, unknown, unknown> => {
     const page = f(s)
     return Option.match(page[1], {
-      onNone: () => channel.zipRight(core.write(page[0]), core.unit),
+      onNone: () => channel.zipRight(core.write(page[0]), core.void),
       onSome: (s) => core.flatMap(core.write(page[0]), () => loop(s))
     })
   }
@@ -4200,7 +4200,7 @@ export const paginateChunkEffect = <S, A, E, R>(
     channel.unwrap(
       Effect.map(f(s), ([chunk, option]) =>
         Option.match(option, {
-          onNone: () => channel.zipRight(core.write(chunk), core.unit),
+          onNone: () => channel.zipRight(core.write(chunk), core.void),
           onSome: (s) => core.flatMap(core.write(chunk), () => loop(s))
         }))
     )
@@ -4277,7 +4277,7 @@ export const peel = dual<
                   onDone: (_) =>
                     channel.zipRight(
                       core.fromEffect(Handoff.offer<Signal>(handoff, { _tag: OP_END })),
-                      core.unit
+                      core.void
                     )
                 })
               return _sink.fromChannel(
@@ -4306,7 +4306,7 @@ export const peel = dual<
                   return core.failCause(signal.cause)
                 }
                 case OP_END: {
-                  return core.unit
+                  return core.void
                 }
               }
             }),
@@ -4762,7 +4762,7 @@ class StreamRechunker<out A, in out E> {
     if (this.pos !== 0) {
       return core.write(Chunk.unsafeFromArray(this.builder))
     }
-    return core.unit
+    return core.void
   }
 }
 
@@ -4968,7 +4968,7 @@ export const repeatElementsWith = dual<
         const loop: Channel.Channel<Chunk.Chunk<C>, Chunk.Chunk<A>, E, E, void, unknown, R2> = core.readWith({
           onInput: feed,
           onFailure: core.fail,
-          onDone: () => core.unit
+          onDone: () => core.void
         })
         return loop
       }),
@@ -5018,7 +5018,7 @@ export const repeatWith = dual<
         const process = pipe(self, map(options.onElement), toChannel)
         const loop: Channel.Channel<Chunk.Chunk<C>, unknown, E, unknown, void, unknown, R | R2> = channel.unwrap(
           Effect.match(driver.next(void 0), {
-            onFailure: () => core.unit,
+            onFailure: () => core.void,
             onSuccess: () =>
               pipe(
                 process,
@@ -5396,7 +5396,7 @@ export const runIntoQueueElementsScoped = dual<
     core.pipeTo(toChannel(self), writer),
     channel.drain,
     channelExecutor.runScoped,
-    Effect.asUnit
+    Effect.asVoid
   )
 })
 
@@ -5424,7 +5424,7 @@ export const runIntoQueueScoped = dual<
     channel.mapOutEffect((take) => Queue.offer(queue, take)),
     channel.drain,
     channelExecutor.runScoped,
-    Effect.asUnit
+    Effect.asVoid
   )
 })
 
@@ -5640,7 +5640,7 @@ export const scanEffect = dual<
 export const scoped = <A, E, R>(
   effect: Effect.Effect<A, E, R>
 ): Stream.Stream<A, E, Exclude<R, Scope.Scope>> =>
-  new StreamImpl(channel.ensuring(channel.scoped(pipe(effect, Effect.map(Chunk.of))), Effect.unit))
+  new StreamImpl(channel.ensuring(channel.scoped(pipe(effect, Effect.map(Chunk.of))), Effect.void))
 
 /** @internal */
 export const some = <A, E, R>(self: Stream.Stream<Option.Option<A>, E, R>): Stream.Stream<A, Option.Option<E>, R> =>
@@ -5738,7 +5738,7 @@ export const slidingSize = dual<
               () => reader(queueSize + input.length)
             ),
           onFailure: (cause) => emitOnStreamEnd(queueSize, core.failCause(cause)),
-          onDone: () => emitOnStreamEnd(queueSize, core.unit)
+          onDone: () => emitOnStreamEnd(queueSize, core.void)
         })
       return pipe(toChannel(self), core.pipeTo(reader(0)))
     }))
@@ -5771,14 +5771,14 @@ export const split = dual<
       onFailure: core.fail,
       onDone: () => {
         if (Chunk.isEmpty(leftovers)) {
-          return core.unit
+          return core.void
         }
         if (Option.isNone(pipe(leftovers, Chunk.findFirst(predicate)))) {
-          return channel.zipRight(core.write(Chunk.of(leftovers)), core.unit)
+          return channel.zipRight(core.write(Chunk.of(leftovers)), core.void)
         }
         return channel.zipRight(
           split(Chunk.empty(), leftovers),
-          core.unit
+          core.void
         )
       }
     })
@@ -5883,7 +5883,7 @@ export const take = dual<
   return new StreamImpl(
     pipe(
       toChannel(self),
-      channel.pipeToOrFail(0 < n ? loop(n) : core.unit)
+      channel.pipeToOrFail(0 < n ? loop(n) : core.void)
     )
   )
 })
@@ -5908,7 +5908,7 @@ export const takeRight = dual<
             return reader
           },
           onFailure: core.fail,
-          onDone: () => pipe(core.write(queue.toChunk()), channel.zipRight(core.unit))
+          onDone: () => pipe(core.write(queue.toChunk()), channel.zipRight(core.void))
         })
         return pipe(toChannel(self), core.pipeTo(reader))
       }),
@@ -6132,8 +6132,8 @@ export const tapSink = dual<
               pipe(
                 core.fromEffect(Queue.offer(queue, InternalTake.end)),
                 core.foldCauseChannel({
-                  onFailure: () => core.unit,
-                  onSuccess: () => core.unit
+                  onFailure: () => core.void,
+                  onSuccess: () => core.void
                 })
               )
           })
@@ -6271,7 +6271,7 @@ const throttleEnforceEffect = <A, E, R, E2, R2>(
           channel.unwrap
         ),
       onFailure: core.failCause,
-      onDone: () => core.unit
+      onDone: () => core.void
     })
   const throttled = pipe(
     Clock.currentTimeMillis,
@@ -6321,7 +6321,7 @@ const throttleShapeEffect = <A, E, R, E2, R2>(
           channel.unwrap
         ),
       onFailure: core.failCause,
-      onDone: () => core.unit
+      onDone: () => core.void
     })
   const throttled = pipe(
     Clock.currentTimeMillis,
@@ -6557,7 +6557,7 @@ export const toReadableStream = <A, E>(source: Stream.Stream<A, E>) => {
             })
           })
         ),
-        Effect.tapErrorCause(() => Scope.close(scope, Exit.unit)),
+        Effect.tapErrorCause(() => Scope.close(scope, Exit.void)),
         Effect.catchTags({
           "None": () =>
             Effect.sync(() => {
@@ -6568,14 +6568,14 @@ export const toReadableStream = <A, E>(source: Stream.Stream<A, E>) => {
               controller.error(error.value)
             })
         }),
-        Effect.asUnit
+        Effect.asVoid
       )
     },
     pull() {
       return Effect.runPromise(pull)
     },
     cancel() {
-      return Effect.runPromise(Scope.close(scope, Exit.unit))
+      return Effect.runPromise(Scope.close(scope, Exit.void))
     }
   })
 }
@@ -6639,7 +6639,7 @@ export const transduce = dual<
             core.succeed([upstreamDone.ref, concatAndGet(leftover)] as const),
             core.flatMap(([done, newLeftovers]) => {
               const nextChannel = done && Chunk.isEmpty(newLeftovers) ?
-                core.unit :
+                core.void :
                 transducer
               return pipe(core.write(Chunk.of(z)), core.flatMap(() => nextChannel))
             })
@@ -6668,7 +6668,7 @@ export const unfoldChunk = <S, A>(
 ): Stream.Stream<A> => {
   const loop = (s: S): Channel.Channel<Chunk.Chunk<A>, unknown, never, unknown, unknown, unknown> =>
     Option.match(f(s), {
-      onNone: () => core.unit,
+      onNone: () => core.void,
       onSome: ([chunk, s]) => core.flatMap(core.write(chunk), () => loop(s))
     })
   return new StreamImpl(core.suspend(() => loop(s)))
@@ -6685,7 +6685,7 @@ export const unfoldChunkEffect = <S, A, E, R>(
         Effect.map(
           f(s),
           Option.match({
-            onNone: () => core.unit,
+            onNone: () => core.void,
             onSome: ([chunk, s]) => core.flatMap(core.write(chunk), () => loop(s))
           })
         )
@@ -6700,8 +6700,11 @@ export const unfoldEffect = <S, A, E, R>(
 ): Stream.Stream<A, E, R> =>
   unfoldChunkEffect(s, (s) => pipe(f(s), Effect.map(Option.map(([a, s]) => [Chunk.of(a), s]))))
 
-/** @internal */
-export const unit: Stream.Stream<void> = succeed(void 0)
+const void_: Stream.Stream<void> = succeed(void 0)
+export {
+  /** @internal */
+  void_ as void
+}
 
 /** @internal */
 export const unwrap = <A, E2, R2, E, R>(
@@ -6803,7 +6806,7 @@ export const withSpan = dual<
     options?: {
       readonly attributes?: Record<string, unknown> | undefined
       readonly links?: ReadonlyArray<Tracer.SpanLink> | undefined
-      readonly parent?: Tracer.ParentSpan | undefined
+      readonly parent?: Tracer.AnySpan | undefined
       readonly root?: boolean | undefined
       readonly context?: Context.Context<never> | undefined
     }
@@ -6814,7 +6817,7 @@ export const withSpan = dual<
     options?: {
       readonly attributes?: Record<string, unknown> | undefined
       readonly links?: ReadonlyArray<Tracer.SpanLink> | undefined
-      readonly parent?: Tracer.ParentSpan | undefined
+      readonly parent?: Tracer.AnySpan | undefined
       readonly root?: boolean | undefined
       readonly context?: Context.Context<never> | undefined
     }
@@ -7873,11 +7876,11 @@ export const zipWithNext = <A, E, R>(
       onFailure: core.failCause,
       onDone: () =>
         Option.match(last, {
-          onNone: () => core.unit,
+          onNone: () => core.void,
           onSome: (value) =>
             channel.zipRight(
               core.write(Chunk.of<readonly [A, Option.Option<A>]>([value, Option.none()])),
-              core.unit
+              core.void
             )
         })
     })