Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #2762 - eval after zip may cause interruption #2763

Merged
merged 1 commit into from
Dec 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/shared/src/main/scala/fs2/internal/Scope.scala
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ private[fs2] final class Scope[F[_]] private (
* that caused the interruption is returned so that it can be handled.
*/
private[fs2] def interruptibleEval[A](f: F[A]): F[Either[InterruptionOutcome, A]] =
interruptible match {
openScope.map(_.interruptible).flatMap {
case None =>
f.attempt.map(_.leftMap(t => Outcome.Errored(t)))
case Some(iCtx) =>
Expand Down
18 changes: 16 additions & 2 deletions core/shared/src/test/scala/fs2/StreamZipSuite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -420,11 +420,25 @@ class StreamZipSuite extends Fs2Suite {
test("#2717 - unexpected behavior of Pull") {
val stream = Stream(1).as(1).scope ++ Stream(2)
val zippedPull =
stream.pull.uncons1.flatMap { case Some((_, s)) =>
s.zipWith(Stream(3))((_, _)).pull.echo
stream.pull.uncons1.flatMap {
case Some((_, s)) =>
s.zipWith(Stream(3))((_, _)).pull.echo
case None => Pull.done
}
val actual = zippedPull.stream.map(identity).covary[IO].compile.toList
actual.assertEquals(List((2, 3)))
}

test("#2762 - unexpected behavior of Pull") {
val stream = Stream(1).as(1) ++ Stream(2)
val zippedPull =
stream.pull.uncons1.flatMap {
case Some((_, s)) =>
s.zipWith(Stream(3))((_, _)).pull.echo
case None => Pull.done
}
val actual = zippedPull.stream.evalTap(_ => IO.unit).map(identity).compile.toList
actual.assertEquals(List((2, 3)))
}
}
}