Skip to content

Fix Scala 3 compilation issue #2

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.

Sign up for GitHub

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

Merged
amir merged 1 commit into from
Feb 14, 2026
Merged

Fix Scala 3 compilation issue #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 9 additions & 8 deletions core/src/main/scala/com/codiff/fairstream/Fair.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,11 @@ object Fair {
case c: Choice[A @unchecked] => Choice(c.a, mplus(right, c.rest))
case inc: Incomplete[A @unchecked] =>
right match {
case Nil => inc
case One(b) => Choice(b, inc.step)
case Choice(b, r2) => Choice(b, mplus(inc.step, r2))
case Incomplete(j) => Incomplete(mplus(inc.step, j))
case Nil => inc
case One(b) => Choice(b, inc.step)
case c: Choice[A @unchecked] => Choice(c.a, mplus(inc.step, c.rest))
case inc2: Incomplete[A @unchecked] =>
Incomplete(mplus(inc.step, inc2.step))
}
}

Expand All @@ -77,11 +78,11 @@ object Fair {
stream match {
case Nil => acc.reverse
case One(a) => (a :: acc).reverse
case Choice(a, r) =>
runM(maxDepth, maxResults.map(_ - 1), r, a :: acc)
case Incomplete(i) =>
case c: Choice[A @unchecked] =>
runM(maxDepth, maxResults.map(_ - 1), c.rest, c.a :: acc)
case i: Incomplete[A @unchecked] =>
if (maxDepth.exists(_ <= 0)) acc.reverse
else runM(maxDepth.map(_ - 1), maxResults, i, acc)
else runM(maxDepth.map(_ - 1), maxResults, i.step, acc)
}
}

Expand Down