Remove checking for negative array size

Consolidate two subsequent `.flatMap`s into one.
laserdisc-io · Nov 13, 2024 · b7d78a3 · b7d78a3
1 parent 96f4b5a
commit b7d78a3
Showing 1 changed file with 3 additions and 12 deletions.
diff --git a/fs2-aws-s3/src/main/scala/fs2/aws/s3/S3.scala b/fs2-aws-s3/src/main/scala/fs2/aws/s3/S3.scala
@@ -324,20 +324,11 @@ object S3 {
             .last
             .flatMap {
               case Some(resp) =>
-                Pull.pure {
-                  val bs = resp.asByteArrayUnsafe
-                  Option.when(bs.length >= 0)(Chunk.array(bs))
-                }
+                val chunk = Chunk.array(resp.asByteArrayUnsafe)
+                Pull.output(chunk) >> (if (chunk.size < chunkSizeBytes) Pull.done else go(offset + chunk.size))
               case None =>
-                Pull.pure(none)
-            }
-            .flatMap {
-              case Some(o) =>
-                if (o.size < chunkSizeBytes) Pull.output(o)
-                else Pull.output(o) >> go(offset + o.size)
-              case None => Pull.done
+                Pull.done
             }
-
         go(0).stream
       }