Revert "Re-use directory discovery logic"

This reverts commit 338ff35.

Sources/NIOFileSystem/FileSystem.swift

@@ -438,37 +438,29 @@ public struct FileSystem: Sendable, FileSystemProtocol {
         }
     }
 
-    func _collectItemsInDirectory(at path: FilePath) async throws -> ([FilePath], [FilePath]) {
-        try await self.withDirectoryHandle(
+    @discardableResult
+    private func removeItemSequentially(
+        at path: FilePath
+    ) async throws -> Int {
+        var (subdirectories, filesRemoved) = try await self.withDirectoryHandle(
             atPath: path
         ) { directory in
             var subdirectories = [FilePath]()
-            var nonDirectoryItems = [FilePath]()
+            var filesRemoved = 0
 
             for try await batch in directory.listContents().batched() {
                 for entry in batch {
                     switch entry.type {
                     case .directory:
                         subdirectories.append(entry.path)
+
                     default:
-                        nonDirectoryItems.append(entry.path)
+                        filesRemoved += try await self.removeOneItem(at: entry.path)
                     }
                 }
             }
 
-            return (subdirectories, nonDirectoryItems)
-        }
-    }
-
-    @discardableResult
-    private func removeItemSequentially(
-        at path: FilePath
-    ) async throws -> Int {
-        var filesRemoved = 0
-        let (subdirectories, itemsToRemove) = try await self._collectItemsInDirectory(at: path)
-
-        for item in itemsToRemove {
-            filesRemoved += try await self.removeOneItem(at: item)
+            return (subdirectories, filesRemoved)
         }
 
         for subdirectory in subdirectories {

Sources/NIOFileSystem/Internal/ParallelRemoval.swift

@@ -26,7 +26,23 @@ extension FileSystem {
         // Discover current directory and find all files/directories. Free up
         // the handle as fast as possible.
         let (directoriesToRecurseInto, itemsToDelete) = try await bucket.withToken {
-            try await self._collectItemsInDirectory(at: path)
+            try await self.withDirectoryHandle(atPath: path) { directory in
+                var subdirectories: [FilePath] = []
+                var itemsInDirectory: [FilePath] = []
+
+                for try await batch in directory.listContents().batched() {
+                    for entry in batch {
+                        switch entry.type {
+                        case .directory:
+                            subdirectories.append(entry.path)
+                        default:
+                            itemsInDirectory.append(entry.path)
+                        }
+                    }
+                }
+
+                return (subdirectories, itemsInDirectory)
+            }
         }
 
         return try await withThrowingTaskGroup(of: Int.self) { group in