Misc: Undo some changes that are not necessary anymore without value-…

…discard compiler option, and some other minor fixes.

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
 

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")
+addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.16")

src/main/scala-2.12/scala/annotation/unused.scala

@@ -1,3 +1,3 @@
 package scala.annotation
 
-final class unused extends deprecated("unused", "unused")
+final class unused extends deprecated("unused", "unused")

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) }
     )
   }

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 = {

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))
   }
-}
+}

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 = {

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, _))
-        ()
     }
   }
 

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.")
     }

src/test/scala/com/raquo/airstream/fixtures/Fixtures.scala → src/test/scala/com/raquo/airstream/fixtures/Calculation.scala

@@ -13,5 +13,3 @@ object Calculation {
     value
   }
 }
-
-case class Effect[V](name: String, value: V)

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)