From 89d71be6b08ef739601a6d3148179e978c9da07a Mon Sep 17 00:00:00 2001 From: Nikita Gazarov Date: Tue, 29 Dec 2020 17:34:55 -0800 Subject: [PATCH] Misc: Undo some changes that are not necessary anymore without value-discard compiler option, and some other minor fixes. --- build.sbt | 2 +- project/plugins.sbt | 2 +- src/main/scala-2.12/scala/annotation/unused.scala | 2 +- src/main/scala/com/raquo/airstream/core/Observer.scala | 4 +--- src/main/scala/com/raquo/airstream/core/ObserverList.scala | 4 +--- .../scala/com/raquo/airstream/eventbus/EventBusStream.scala | 2 +- .../com/raquo/airstream/eventstream/DelayEventStream.scala | 2 -- .../com/raquo/airstream/eventstream/PeriodicEventStream.scala | 3 --- src/main/scala/com/raquo/airstream/ownership/Owner.scala | 1 - .../airstream/fixtures/{Fixtures.scala => Calculation.scala} | 2 -- src/test/scala/com/raquo/airstream/fixtures/Effect.scala | 3 +++ 11 files changed, 9 insertions(+), 18 deletions(-) rename src/test/scala/com/raquo/airstream/fixtures/{Fixtures.scala => Calculation.scala} (88%) create mode 100644 src/test/scala/com/raquo/airstream/fixtures/Effect.scala diff --git a/build.sbt b/build.sbt index d25790f6..8b75e7e3 100644 --- a/build.sbt +++ b/build.sbt @@ -16,7 +16,7 @@ val filterScalacOptions = { options: Seq[String] => scalaVersion := "2.13.4" -crossScalaVersions := Seq("2.12.11", "2.13.4") +crossScalaVersions := Seq("2.12.12", "2.13.4") scalacOptions ~= filterScalacOptions diff --git a/project/plugins.sbt b/project/plugins.sbt index 278f2703..0e5dce8e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -10,4 +10,4 @@ addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.8") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8.1") -addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.16") \ No newline at end of file +addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.16") diff --git a/src/main/scala-2.12/scala/annotation/unused.scala b/src/main/scala-2.12/scala/annotation/unused.scala index a7c26e20..8fa03221 100644 --- a/src/main/scala-2.12/scala/annotation/unused.scala +++ b/src/main/scala-2.12/scala/annotation/unused.scala @@ -1,3 +1,3 @@ package scala.annotation -final class unused extends deprecated("unused", "unused") \ No newline at end of file +final class unused extends deprecated("unused", "unused") diff --git a/src/main/scala/com/raquo/airstream/core/Observer.scala b/src/main/scala/com/raquo/airstream/core/Observer.scala index fa881892..e9e9d198 100644 --- a/src/main/scala/com/raquo/airstream/core/Observer.scala +++ b/src/main/scala/com/raquo/airstream/core/Observer.scala @@ -34,9 +34,7 @@ trait Observer[-A] { /** Like `contramap` but with `collect` semantics: not calling the original observer when `pf` is not defined */ def contracollect[B](pf: PartialFunction[B, A]): Observer[B] = { Observer.withRecover( - nextValue => { - pf.runWith(onNext)(nextValue) - }, + nextValue => pf.runWith(onNext)(nextValue), { case nextError => onError(nextError) } ) } diff --git a/src/main/scala/com/raquo/airstream/core/ObserverList.scala b/src/main/scala/com/raquo/airstream/core/ObserverList.scala index d760f7b1..49741d14 100644 --- a/src/main/scala/com/raquo/airstream/core/ObserverList.scala +++ b/src/main/scala/com/raquo/airstream/core/ObserverList.scala @@ -8,9 +8,7 @@ class ObserverList[Obs](private val observers: js.Array[Obs]) extends AnyVal { @inline def apply(index: Int): Obs = observers(index) - @inline def push(observer: Obs): Unit = { - observers.push(observer) - } + @inline def push(observer: Obs): Unit = observers.push(observer) /** @return whether observer was removed (`false` if it wasn't in the list) */ def removeObserverNow(observer: Obs): Boolean = { diff --git a/src/main/scala/com/raquo/airstream/eventbus/EventBusStream.scala b/src/main/scala/com/raquo/airstream/eventbus/EventBusStream.scala index fef378f6..34237da7 100644 --- a/src/main/scala/com/raquo/airstream/eventbus/EventBusStream.scala +++ b/src/main/scala/com/raquo/airstream/eventbus/EventBusStream.scala @@ -68,4 +68,4 @@ class EventBusStream[A] private[eventbus] () extends EventStream[A] with Interna // dom.console.log("EventBusStream STOPPED!", this.toString) sourceStreams.foreach(sourceStream => Transaction.removeInternalObserver(sourceStream, observer = this)) } -} \ No newline at end of file +} diff --git a/src/main/scala/com/raquo/airstream/eventstream/DelayEventStream.scala b/src/main/scala/com/raquo/airstream/eventstream/DelayEventStream.scala index a7c30ada..034bc815 100644 --- a/src/main/scala/com/raquo/airstream/eventstream/DelayEventStream.scala +++ b/src/main/scala/com/raquo/airstream/eventstream/DelayEventStream.scala @@ -17,9 +17,7 @@ class DelayEventStream[A]( js.timers.setTimeout(delayMillis.toDouble) { //println(s"> init trx from DelayEventStream.onNext($nextValue)") new Transaction(fireValue(nextValue, _)) - () } - () } override def onError(nextError: Throwable, transaction: Transaction): Unit = { diff --git a/src/main/scala/com/raquo/airstream/eventstream/PeriodicEventStream.scala b/src/main/scala/com/raquo/airstream/eventstream/PeriodicEventStream.scala index 13a370b1..6aca1ab9 100644 --- a/src/main/scala/com/raquo/airstream/eventstream/PeriodicEventStream.scala +++ b/src/main/scala/com/raquo/airstream/eventstream/PeriodicEventStream.scala @@ -48,8 +48,6 @@ class PeriodicEventStream[A]( } setNext() }) - - () } private def setNext(): Unit = { @@ -63,7 +61,6 @@ class PeriodicEventStream[A]( resetTo(initial, tickNext = false) case Failure(err) => new Transaction(fireError(err, _)) - () } } diff --git a/src/main/scala/com/raquo/airstream/ownership/Owner.scala b/src/main/scala/com/raquo/airstream/ownership/Owner.scala index 3ebd6ece..24133c99 100644 --- a/src/main/scala/com/raquo/airstream/ownership/Owner.scala +++ b/src/main/scala/com/raquo/airstream/ownership/Owner.scala @@ -39,7 +39,6 @@ trait Owner { val index = subscriptions.indexOf(subscription) if (index != -1) { subscriptions.splice(index, deleteCount = 1) - () } else { throw new Exception("Can not remove Subscription from Owner: subscription not found.") } diff --git a/src/test/scala/com/raquo/airstream/fixtures/Fixtures.scala b/src/test/scala/com/raquo/airstream/fixtures/Calculation.scala similarity index 88% rename from src/test/scala/com/raquo/airstream/fixtures/Fixtures.scala rename to src/test/scala/com/raquo/airstream/fixtures/Calculation.scala index 83d4f0af..396aefaf 100644 --- a/src/test/scala/com/raquo/airstream/fixtures/Fixtures.scala +++ b/src/test/scala/com/raquo/airstream/fixtures/Calculation.scala @@ -13,5 +13,3 @@ object Calculation { value } } - -case class Effect[V](name: String, value: V) \ No newline at end of file diff --git a/src/test/scala/com/raquo/airstream/fixtures/Effect.scala b/src/test/scala/com/raquo/airstream/fixtures/Effect.scala new file mode 100644 index 00000000..554f2979 --- /dev/null +++ b/src/test/scala/com/raquo/airstream/fixtures/Effect.scala @@ -0,0 +1,3 @@ +package com.raquo.airstream.fixtures + +case class Effect[V](name: String, value: V)