review comments

Author: rnro

Sources/NIOFileSystem/DirectoryEntries.swift

@@ -136,7 +136,7 @@ extension DirectoryEntries.Batched.AsyncIterator: Sendable {}
 // MARK: - Internal
 
 @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
-extension NIOThrowingAsyncSequenceProducer where Element == [DirectoryEntry], Failure == Error,
+extension NIOThrowingAsyncSequenceProducer where Element == [DirectoryEntry], Failure == (any Error),
         Strategy == NIOAsyncSequenceProducerBackPressureStrategies.HighLowWatermark, Delegate == DirectoryEntryProducer {
     fileprivate static func makeBatchedDirectoryEntryStream(
         handle: SystemFileHandle,
@@ -270,7 +270,6 @@ fileprivate final class DirectoryEntryProducer: NIOAsyncSequenceProducerDelegate
     }
 
     private func onNextBatch(_ entries: [DirectoryEntry]) {
-
         let source = self.state.withLockedValue { state in
             return state.sequenceProducerSource
         }
@@ -412,7 +411,6 @@ private struct DirectoryEnumerator: Sendable {
         case let .open(threadPool, _, _):
             return threadPool
         case .openPausedProducing(let threadPool, let source, let array):
-            self.state = .modifying
             self.state = .open(threadPool, source, array)
             return threadPool
         case .done:
@@ -424,9 +422,8 @@ private struct DirectoryEnumerator: Sendable {
 
     internal mutating func pauseProducing() {
         switch self.state {
-        case .open(let nIOThreadPool, let source, let array):
-            self.state = .modifying
-            self.state = .openPausedProducing(nIOThreadPool, source, array)
+        case .open(let threadPool, let source, let array):
+            self.state = .openPausedProducing(threadPool, source, array)
         case .idle:
             () // we won't apply back pressure until something has been read
         case .openPausedProducing, .done:

Sources/NIOFileSystem/FileChunks.swift

@@ -129,12 +129,12 @@ private final class FileChunkProducer: NIOAsyncSequenceProducerDelegate, Sendabl
     let length: Int64
 
     init(range: FileChunks.ChunkRange, handle: SystemFileHandle, length: Int64) {
-
-        let state: ProducerState = switch range {
+        let state: ProducerState
+        switch range {
         case .entireFile:
-                .init(handle: handle, range: nil)
+            state = .init(handle: handle, range: nil)
         case .partial(let partialRange):
-                .init(handle: handle, range: partialRange)
+            state = .init(handle: handle, range: partialRange)
         }
 
         self.state = NIOLockedValueBox(state)
@@ -357,13 +357,13 @@ private struct ProducerState: Sendable {
     mutating func didReadBytes(_ count: Int) {
         switch self.state {
         case var .producing(state):
-            if state.updateRange(count: count) {
+            if state.didReadBytes(count) {
                 self.state = .done(emptyRange: false)
             } else {
                 self.state = .producing(state)
             }
         case var .pausedProducing(state):
-            if state.updateRange(count: count) {
+            if state.didReadBytes(count) {
                 self.state = .done(emptyRange: false)
             } else {
                 self.state = .pausedProducing(state)
@@ -399,7 +399,10 @@ private struct ProducerState: Sendable {
 
 @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
 extension ProducerState.Producing {
-    mutating func updateRange(count: Int) -> Bool {
+    /// Updates the range (the offsets to read from and up to) to reflect the number of bytes which have been read.
+    /// - Parameter count: The number of bytes which have been read.
+    /// - Returns: Returns `True` if there are no remaining bytes to read, `False` otherwise.
+    mutating func didReadBytes(_ count: Int) -> Bool {
         guard let currentRange = self.range else {
             // if we read 0 bytes we are done
             return count == 0

Sources/NIOFileSystem/Internal/BufferedOrAnyStream.swift

@@ -47,7 +47,7 @@ internal enum BufferedOrAnyStream<Element, Delegate: NIOAsyncSequenceProducerDel
         internal mutating func next() async throws -> Element? {
             let element: Element?
             switch self {
-            case var .bufferedStream(iterator):
+            case let .bufferedStream(iterator):
                 defer { self = .bufferedStream(iterator) }
                 element = try await iterator.next()
             case var .anyAsyncSequence(iterator):