luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace Either[Unit, Unit] by a more explicit custom ADT

This commit is contained in:
Alexandre Archambault 2016-03-13 22:57:26 +01:00
parent 68dbe4d122
commit 5bd4184ac9
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cache/src/main/scala/coursier/TermDisplay.scala vendored
View File

@ -124,9 +124,8 @@ class TermDisplay(
Option(q.poll(100L, TimeUnit.MILLISECONDS)) match { Option(q.poll(100L, TimeUnit.MILLISECONDS)) match {
case None => helper(lineCount) case None => helper(lineCount)
case Some(Left(())) => // poison pill case Some(Message.Stop) => // poison pill
case Some(Right(())) => case Some(Message.Update) =>
// update display
val (done0, downloads0) = downloads.synchronized { val (done0, downloads0) = downloads.synchronized {
val q = doneQueue val q = doneQueue
@ -182,8 +181,8 @@ class TermDisplay(
@tailrec def fallbackHelper(previous: Set[String]): Unit = @tailrec def fallbackHelper(previous: Set[String]): Unit =
Option(q.poll(100L, TimeUnit.MILLISECONDS)) match { Option(q.poll(100L, TimeUnit.MILLISECONDS)) match {
case None => fallbackHelper(previous) case None => fallbackHelper(previous)
case Some(Left(())) => // poison pill case Some(Message.Stop) => // poison pill
case Some(Right(())) => case Some(Message.Update) =>
val downloads0 = downloads.synchronized { val downloads0 = downloads.synchronized {
downloads downloads
.toVector .toVector
@ -238,7 +237,7 @@ class TermDisplay(
for (_ <- 0 until currentHeight) { for (_ <- 0 until currentHeight) {
out.up(2) out.up(2)
} }
q.put(Left(())) q.put(Message.Stop)
lock.synchronized(()) lock.synchronized(())
} }
@ -332,10 +331,16 @@ class TermDisplay(
private val doneQueue = new ArrayBuffer[(String, Info)] private val doneQueue = new ArrayBuffer[(String, Info)]
private val infos = new ConcurrentHashMap[String, Info] private val infos = new ConcurrentHashMap[String, Info]
private val q = new LinkedBlockingDeque[Either[Unit, Unit]] private sealed abstract class Message extends Product with Serializable
private object Message {
case object Update extends Message
case object Stop extends Message
}
private val q = new LinkedBlockingDeque[Message]
def update(): Unit = { def update(): Unit = {
if (q.size() == 0) if (q.size() == 0)
q.put(Right(())) q.put(Message.Update)
} }
private def newEntry( private def newEntry(